Commit Graph

566 Commits

Author SHA1 Message Date
DL6ER
f96bbcb37f Merge pull request #1102 from pi-hole/fix/domains_lower_case
Ensure added domains are lower-case.
2019-12-28 16:46:09 +01:00
DL6ER
de8ead6a91 Merge pull request #1106 from pi-hole/tweak/teleporter-etc-hosts
Add /etc/hosts to teleporter export.
2019-12-28 16:45:25 +01:00
DL6ER
c81d690be4 Add /etc/hosts to teleporter export.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-28 13:30:57 +00:00
DL6ER
da1276363d Ensure added domains are lower-case.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-23 09:33:30 +00:00
DL6ER
563aaa14df Convert domains to lower-case and validate them before adding them.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-23 09:07:13 +00:00
DL6ER
ee91b3bc87 Update nav icons.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 12:12:14 +00:00
DL6ER
7dc5c5cb94 Fix navigation submenu.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 08:40:45 +00:00
DL6ER
050021827f Show host names (if known) on the Clients management page.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-19 16:56:44 +00:00
DL6ER
ae08443fa5 Merge branch 'devel' into new/group-management 2019-12-17 15:06:45 +00:00
DL6ER
d0d1174010 Use bootstrap notify for notifications.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-17 12:48:25 +00:00
DL6ER
18682eb61d Also delete assignments form domains, adlists and clients to a group when it is deleted.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-17 09:56:55 +00:00
XhmikosR
4b06680ba8 header: hide hostname on small devices
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-16 21:15:49 +02:00
DL6ER
3391580416 Merge pull request #1065 from pkolmann/devel
I have a different service running on FTL default port and so FTL ser…
2019-12-16 12:57:14 +01:00
DL6ER
95c893ded5 Merge branch 'devel' into new/group-management 2019-12-16 10:28:36 +00:00
DL6ER
52f5be0c8f Merge pull request #992 from trimalcione/devel
Add DHCP leases export/import from teleporter
2019-12-16 11:22:28 +01:00
DL6ER
49be667760 Say explicitly why a "Not allowed" error comes from.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-16 10:08:35 +00:00
DL6ER
5388927f52 Merge pull request #1078 from pi-hole/tweak/domainlist_table
Change web interface to use domainlist table
2019-12-16 01:19:41 +01:00
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
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
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
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
Philipp Kolmann
87ba9740f1 remove debug output
Signed-off-by: Philipp Kolmann <philipp@kolmann.at>
2019-12-10 21:14:09 +01: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
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
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