Commit Graph

830 Commits

Author SHA1 Message Date
Mark Drobnak
1850f7e108 Merge branch 'release/v4.1' into fix/privacy_maximum_no_regex 2018-12-05 23:12:48 -05:00
DL6ER
bd84160d4f Show different warning in the case that at least one of the domains to be added were already present
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-29 19:47:57 +01:00
DL6ER
99b0535f8e Remove empty line at beginning of output of add.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-29 18:41:30 +01:00
DL6ER
21ab29dedc Use shell_exec() instead of exec() to obtain the full script output (and not only the last line!)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-29 18:39:23 +01:00
DL6ER
1709631949 Don't use --quiet flag for adding hosts to white- and blacklist
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-29 18:02:44 +01:00
DL6ER
18f9ed4532 Update savesettings.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-26 19:12:08 +01:00
Mark Drobnak
9d4e545593 Use simpler check for dash in is_valid_domain_name
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-11-24 11:21:54 -05:00
Mcat12
e7f4ef8a09 Prevent domains sent to queryAds acting as command line options
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-23 14:43:08 -05:00
Mcat12
13c29336b2 Prevent possible attacks via admin email setting
The admin email is now treated as a single string (surrounded by single
quotes), and it is not allowed to contain its own single quotes.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-23 14:35:43 -05:00
Mcat12
79c7c893ac Move footer script back to footer
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-10 13:55:37 -05:00
Mcat12
500b3b774c Move dependency scripts to header
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-10 13:54:33 -05:00
DL6ER
ba11c7b394 Disply that the privacy level wasn't changed when this is the case.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-10 08:40:05 +01:00
DL6ER
8c08ec2a10 Automatically restart DNS resolver when privacy level is lowered
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-10 08:38:55 +01:00
Mark Drobnak
f612e51f15 Merge pull request #852 from bitcynth/patch-1
Error handling in savesettings.php
2018-11-07 18:03:38 -05:00
Cynthia
34bbb9a70e Error handling in savesettings.php
This is to address https://github.com/pi-hole/pi-hole/issues/2444

Signed-off-by: Cynthia Revstrom <me@cynthia.re>
2018-10-03 02:28:27 +02:00
DL6ER
56251d1808 Forward destinations -> Upstreams
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-09-24 12:55:55 +02:00
Mark Drobnak
02cc5fad15 Write newline after wildcard
This makes the web interface add wildcards in the same way as the CLI.

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-01 19:34:25 -04:00
Mark Drobnak
4a63500d10 Merge pull request #834 from MikeSouza/new/list-api
Add API support for list actions
2018-09-01 19:29:01 -04:00
DL6ER
6441a675c5 Add Quad9 secondary IPv6 IP addresses. This was a feature request on Discourse.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-31 12:48:25 +02:00
Mark Drobnak
e062b3c68f Merge pull request #831 from pi-hole/new/longterm/select_query_type
Add query type selection for Long-term Query Log
2018-08-30 16:34:26 -04:00
Mark Drobnak
51cc3661ff Merge pull request #830 from pi-hole/new/cacheinfo
Add DNS cache information to Settings page
2018-08-30 16:07:21 -04:00
DL6ER
9a950147c4 Add explanation what ECS is as we shouldn't use acronyms without explaining them. Further, this information may be useful for less tech-savvy users.
Add that (at least) Google, OpenDNS, and Cloudflare use ECS (according to http://www.afasterinternet.com/participants.htm). I found no reference for the other providers in the table.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 17:56:11 +02:00
DL6ER
a2ade60cea Add more detailed selections for the services offered by Quad9 and improve responsive design
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 17:35:47 +02:00
DL6ER
26ab341669 Remove debug statement
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 15:37:04 +02:00
DL6ER
d2ecf1c70a Use comma-separated list of type integers instead of byte-coded integer.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 15:02:33 +02:00
DL6ER
2d1aae3078 Merge branch 'devel' into new/longterm/select_query_type 2018-08-29 20:35:47 +02:00
Mcat12
b1549f1da8 Fix whitelisting from the query log (and DB query log)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-26 12:38:50 -04:00
Mike Souza
203d41103a Add API support for list actions
Signed-off-by: Mike Souza <contact@michael-souza.com>
2018-08-26 11:56:44 -04:00
DL6ER
d67f8c66ee Wrong token is either when users try to do it via an old session or through a script. Hence, the message should tell the user to re-login
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-24 19:09:24 +02:00
DL6ER
7a9fcc1676 The "Wrong Token." message is shown whenever the token is wrong or not available. This commit adds more details into this message to help user's in their own troubleshooting.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-24 19:00:42 +02:00
DL6ER
7ee1874672 Optimize HTML and JS
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-24 14:25:02 +02:00
DL6ER
318179d82d Merge branch 'devel' into new/longterm/select_query_type 2018-08-24 14:09:46 +02:00
DL6ER
3169b5ba88 Add selection for query types on long term DB query log page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-24 14:09:08 +02:00
DL6ER
a692bdea27 Add missing semicolon
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-21 18:39:50 +02:00
Mark Drobnak
81561f5da5 Merge pull request #826 from pi-hole/fix/client-colors
Use random colors in client graph if presets run out
2018-08-21 10:16:37 -04:00
DL6ER
77efbac43d Show cache info on Settings page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-21 15:42:15 +02:00
Mcat12
78ae865d62 Add support for privacy level 4 (no stats)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 17:33:29 -04:00
Mcat12
9367e8115e Add support for new query statuses in long term query log
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 16:28:02 -04:00
Mark Drobnak
ec96282fd8 Merge pull request #824 from pi-hole/tweak/blocked_instead_of_Piholed
Change "Pi-holed" to "Blocked" on the Query Log
2018-08-17 12:49:33 -04:00
DL6ER
511b42352a Do not show whitelist button for externally blocked domains as whitelisting these domains has not yet been implemented
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-17 18:26:21 +02:00
Mark Drobnak
d7b328e103 Use doublequote strings and add comment
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-08-16 17:47:05 -04:00
Mark Drobnak
6af8c76c3f Use random colors in client graph if presets run out
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-08-16 17:38:02 -04:00
DL6ER
9646468022 +Show whitelisting button for regex blocked queries as pihole-FTL can actually whitelist regex filtered domains
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-16 14:24:32 +02:00
DL6ER
c6b6edae05 Change "Pi-holed" to "Blocked" on the Query Log. Also add a new "Blocked (external)" status that will be used by a future version of FTL. I also removed the addition of the dnssec status to the "Blocked (gravity)" status as requests answered from the blocking lists do not have a DNSSEC status.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-16 14:16:30 +02:00
DL6ER
55969fab4b A = 1, AAAA = 2, ...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 15:20:27 +02:00
DL6ER
a72dbd8f91 :codacy: changes
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 15:17:37 +02:00
DL6ER
6fb2dab5bc Extend query log and API to be able to handle requests limited to specific forward destinations and query types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:36:37 +02:00
DL6ER
6f7e1b5b59 Open Query Log with filtering option on Query Type when left-clicking on an element in the pie-chart. The current behavior is moved to middle mouse click.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-15 14:33:02 +02:00
Mark Drobnak
da2a6fec69 Merge pull request #817 from pi-hole/codeformatting
Changes to code formatting
2018-08-13 16:11:28 -04:00
Rob Gill
5dfe0eedef Standalone open curly brackets for if and for statements
For code consistency all opening curly brackets for if and for statements now stand alone on their own lines

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-08-11 09:26:58 +10:00