Commit Graph

30 Commits

Author SHA1 Message Date
DL6ER 57e139bcba Merge branch 'release/v5.0' into new/space-separated-item-injection 2020-03-31 21:31:41 +00:00
DL6ER f0034b305d Check adlist URL for valid characters before adding record to the database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-03-31 20:41:50 +00:00
Dan Schaper aa51f014ab Fix domain and group disassociation when toggling from Black/Whitelis… (#1172)
* Fix domain and group disassociation when toggling from Black/Whitelist page

* Properly set the groups variable

Signed-off-by: trillaxe <trillax@tutanota.com>

* Trim whitespace

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-05 12:59:42 -08:00
DL6ER 59085c237e Merge branch 'release/v5.0' into new/clients_comment_fields
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-18 16:44:12 +01:00
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 3c3e22bd98 Add support for client comment and timestamp fields.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-16 15:55:29 +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 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 13b7b3d1a9 Remove redundant adlist management on settings page. This is still using CLI callbacks instead of working directly on the database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-11 20:07:43 +01:00
DL6ER ae470b2d3d Add ability to mass-inject space-separated domains.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-11 20:00:54 +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 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 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 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 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
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 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 cf96bed06a Address stickler complaints.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-13 16:58:50 +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