Commit Graph

588 Commits

Author SHA1 Message Date
DL6ER
7274b9bca7 Only use IDN subroutines when the module is available. We have seen reports that at least DietPi is having issues with not matching PHP base and extension versions.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-16 21:16:06 +01:00
DL6ER
32815cb7f0 Merge branch 'release/v5.0' into new/unify_domain_pages
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-16 09:13:45 +01:00
DL6ER
d584c2e2c2 Re-add add.php as it is used by the Query Log as well as the blocking page.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-15 18:18:46 +01:00
DL6ER
268a6d9144 Extract domain in addition request for all domain types, not just the exact ones.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-15 07:35:37 +01:00
DL6ER
2d975b8bac Simplify domain management by using the same page for both locations where domains can be edited. This removes a large amount of duplicated code, each prone to its own bugs.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-14 20:31:54 +01:00
DL6ER
b2cc349abf Only try to convert exact domains using the IDN library.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-14 17:27:45 +01:00
DL6ER
2860ce3fc8 Merge pull request #1130 from pi-hole/new/intl_domains
Add support for international domain names
2020-02-04 21:07:28 +01:00
DL6ER
2c12b0d2d2 Merge pull request #1143 from pi-hole/fix/teleporter_legacy_import
Fix teleporter's ability to import v4.x archives
2020-02-04 20:23:25 +01:00
Adam Warner
174c063ffb Merge branch 'release/v5.0' into fix/FTL_group_update 2020-02-03 22:03:20 +00:00
DL6ER
917fd5949f Merge pull request #1129 from pi-hole/fix/underscore_TLDs
Allow underscores in the middle of TLDs
2020-02-03 22:44:09 +01:00
DL6ER
6ad2430f95 Import legacy adlist.list and fix/remove debugging output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-02 19:10:26 +01:00
DL6ER
870ab035fc Fix teleporter's ability to import v4.x archives.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-28 22:26:19 +01:00
DL6ER
abe0b760bd Ensure we reach the end of groups.php to send SIGRTMIN to FTL.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-27 12:40:45 +00:00
Dan Schaper
89cf4b279b Merge branch 'release/v5.0' into new/intl_domains 2020-01-25 17:49:02 -08:00
DL6ER
f92812d4cd Substitute null client names by empty strings.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-19 22:32:28 +01:00
DL6ER
65be9d89ef Add support for international domain names. Note that this relies on php-intl to be installed
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-12 13:53:12 +01:00
DL6ER
1c4e8056c2 Allow underscores in the middle of TLDs. Fixes #1036
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-12 13:16:55 +01:00
XhmikosR
0ed702197a Change logo link to point to the dashboard.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-08 18:36:11 +02:00
Adam Warner
b447d526d9 Merge pull request #1104 from pi-hole/fonts
Move fonts to the header.php
2020-01-04 16:09:43 +00:00
DL6ER
250457abc3 Merge branch 'devel' into tweak/customDNS_page 2019-12-28 16:47:42 +01:00
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
XhmikosR
cee3d536bc Move fonts to the header.php
`@import` is discouraged because it's blocking.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-26 18:00:21 +02: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
6ad0960a77 Add a nicer domain/IP adding block.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 16:12:10 +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