Commit Graph

3823 Commits

Author SHA1 Message Date
DL6ER
acf19c0eea Apply PSR-12 style to all new PHP files added in this pull request.
Used command: PHP_CodeSniffer/bin/phpcbf --standard=PSR12 [...].php

Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-14 20:04:26 +00:00
DL6ER
b791c29440 Use single quotes almost everywhere, use !== where appropriate, fix formatting and simplify the code in some places.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-14 12:16:01 +00:00
DL6ER
aa6c4c88f3 Ensure large table is only loaded when groups are known.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:54:01 +00:00
DL6ER
aa764ad22d Add CORS and CSRF checks to ensure unauthorized access to the backend is not possible.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:39:45 +00:00
DL6ER
3b7e50713f Remove assignment from if-statement to please CodeFactor.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:26:02 +00:00
DL6ER
9950ca50fe Correctly interpret toogle value.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:23:10 +00:00
DL6ER
a83c9c9828 Add tooltips for creation and modification times for domains and adlists.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 17:22:20 +00:00
DL6ER
cf96bed06a Address stickler complaints.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 16:58:50 +00:00
DL6ER
b62c550ad7 Use toggle for Enabled/Disabled switch
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 16:45:24 +00:00
DL6ER
50f05b9119 Add missing form-control classes for proper element styling.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 16:19:45 +00:00
DL6ER
b025ffd208 Make sure all fields are searchable on all pages (where this is meaningful) and remove ID column from clients group page.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 15:59:46 +00:00
DL6ER
70589fa844 Add Adlists group management
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 15:41:14 +00:00
DL6ER
912e2ddbd9 Add Domain Group Management
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 15:29:42 +00:00
DL6ER
600c16c269 Add Client group management
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 14:40:29 +00:00
DL6ER
3e23aa67a1 Add group management page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 11:55:22 +00:00
DL6ER
99462ec21d Update DataTables from 1.10.12 to 1.10.20
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 11:55:08 +00:00
XhmikosR
d91b605563 settings.js: fix object shorthand
This broke IE

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-11 00:30:08 +02:00
Philipp Kolmann
87ba9740f1 remove debug output
Signed-off-by: Philipp Kolmann <philipp@kolmann.at>
2019-12-10 21:14:09 +01:00
DL6ER
23ac374ff0 Merge pull request #1070 from XhmikosR/css-prefixes
pi-hole.css: add missing CSS prefixes
2019-12-10 17:38:21 +01:00
DL6ER
98c890f572 Merge pull request #1068 from XhmikosR/devel
help.php: replace `samp` with `code`
2019-12-10 17:37:01 +01:00
XhmikosR
7a2510ae28 pi-hole.css: add missing CSS prefixes
Since the original theme supports older browsers, better be consistent here

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-10 09:08:44 +02:00
XhmikosR
8c304c0f20 help.php: replace samp with code
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 22:32:19 +02:00
Adam Warner
5bce83f21f Merge pull request #1067 from XhmikosR/devel
Tweaks and CSS cleanup
2019-12-09 19:59:16 +00:00
XhmikosR
7031d19d25 Remove unneeded escape characters
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:50:42 +02:00
XhmikosR
81357eb5b0 Change the no JavaScript text as per the suggestions
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:36:58 +02:00
XhmikosR
0cac6dc0b4 Update scripts/pi-hole/php/header.php
Co-Authored-By: Adam Warner <me@adamwarner.co.uk>
2019-12-09 21:36:58 +02:00
XhmikosR
0dc918e2ef loginpage.php: use kbd since it makes more sense
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:36:58 +02:00
XhmikosR
0dc67fd516 loginpage.php: fix a few validation errors.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:36:58 +02:00
XhmikosR
d65b5be5e2 A few CSS tweaks.
Add utilities classes and fix a few CSS issues.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 21:36:58 +02:00
XhmikosR
5275faacb1 Lowercase hex colors.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:53:21 +02:00
XhmikosR
3c6ad4cb76 Fix a couple of HTML validation errors.
Also add width and height attributes in a few cases.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:53:13 +02:00
XhmikosR
f0469d1954 Move common tags together
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:53:05 +02:00
XhmikosR
b4a7d92d8c Remove type="text/css` from stylesheet
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:55 +02:00
XhmikosR
d94ea9e8fe Get rid of js/header.js.
Wrap the code in `noscript instead. Also move its CSS in `head`.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:49 +02:00
XhmikosR
cc9acd4018 Add lang="en"
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:41 +02:00
XhmikosR
0eeb71aa86 Fix meta viewport.
It's bad practice not allowing the user to zoom

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:34 +02:00
XhmikosR
32342cb567 Lowercase doctype and utf-8.
Same functionality, better compression.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:23 +02:00
XhmikosR
bc8fe9ba5b Use code instead of samp.
Now it's styled.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:15 +02:00
XhmikosR
d0fa5c0da4 Remove unneeded end tags.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:52:06 +02:00
XhmikosR
ee8cbe03fb Use .pull-left instead of the custom .float-left
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:51:40 +02:00
DL6ER
59cdd7e148 Remove debug output.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-08 23:01:02 +00:00
DL6ER
a42b5b38cf Reinstall lost database query instruction.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-08 23:00:38 +00:00
Adam Warner
258ea04432 Add a class for better readability of list type within the code
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-08 18:47:30 +00:00
DL6ER
3a0a596b11 Implement necessary changes due to switching from individual to a common domainlist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-08 17:42:01 +00:00
Adam Warner
a9852b8762 Merge pull request #1064 from XhmikosR/patch-4
Remove unused variables
2019-12-08 14:31:16 +00:00
Adam Warner
6a8eab92aa Merge pull request #1061 from XhmikosR/devel
Wrap API token in `code`
2019-12-08 14:18:31 +00:00
Adam Warner
1f9f0d24f8 Merge pull request #1059 from pi-hole/WaLLy3K-patch-1
Successor of  #973
2019-12-08 14:10:42 +00:00
XhmikosR
37c849ce2b Remove unused variables
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-07 11:49:49 +02:00
Philipp Kolmann
e3fd40dbf4 I have a different service running on FTL default port and so FTL service was not properly started. I searched quite a long time to discover why the Dashboard never loaded and finally found the reason.
This patch counts empty lines and dies properly with a JSON error. This fixed my issue.

Also I have pi-hole running with apache2 and so no /var/log/lighttpd/error.log exists.
Fix: Try apache2 logging location and if not found then write log to a /tmp file.

Signed-off-by: Philipp Kolmann <philipp@kolmann.at>
2019-12-07 10:44:12 +01:00
XhmikosR
dbed9e8d02 Wrap API token in code
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-07 09:56:50 +02:00