Commit Graph

522 Commits

Author SHA1 Message Date
Walter
983966da04 Changed indentation from spaces and tabs to only tabs 2018-05-02 11:01:38 +02:00
Florian Ströger
2c7b6c07c6 Added "Raw API Token:"
As requested
2018-04-29 10:17:10 +02:00
Florian Ströger
45fbdae34b Add API Token in Text 2018-04-26 20:04:54 +02:00
Walter
2c2a091b03 Changes concerning the date the gravity list was last changed. Used in the webinterface dashboard as a tooltip, and now also available in the API (both PHP and FTL). Function was moved to new file /scripts/pi-hole/php/gravity.php to keep things neat and to avoid duplicate code. 2018-04-23 20:32:38 +02:00
DL6ER
4c91d65547 Make sure backend does always interpret list of DNS servers even if it is empty
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-19 07:38:34 +02:00
DL6ER
847d6aae53 Improve code as suggested
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 21:49:35 +02:00
DL6ER
7fa6cd85d3 Be less specific, as this feature can be used for any time of local resolver running on a custom port
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:31:16 +02:00
DL6ER
f2cefe6ce1 Add frontend changes for supporting a local recursive DNS server
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:11:36 +02:00
DL6ER
ef948cfef3 Have to provide all optional arguments in PHP...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 11:23:55 +02:00
DL6ER
a1824a45d4 Improve way PHP connects to FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-15 10:56:52 +02:00
DL6ER
65addb0114 Add cache-control meta tag to reduce problems with stalled browser caches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-08 13:17:06 +02:00
DL6ER
1055ccf4a3 Add privacy level tab to Settings page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 14:20:19 +02:00
DL6ER
ad8228ea34 Merge branch 'devel' into FTLDNS 2018-04-04 12:35:53 +02:00
DL6ER
71a7c84cba Make second argument of resolveHostname() optional
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 12:32:55 +02:00
Everett Southwick
5e9c1aec9a Add support for public Cloudflare DNS servers.
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
2018-04-01 18:02:26 -05:00
DL6ER
5e8f4b2584 Merge branch 'devel' into FTLDNS 2018-04-01 16:46:35 +02:00
Frode Aannevik
9be0887dac move flip-status-x span element into menu
fix the issue where the span element
is obscuring the Disable/Enable element

fixes: https://github.com/pi-hole/AdminLTE/issues/698

Signed-off-by: Frode Aannevik <frode.aa@gmail.com>
2018-03-18 14:47:46 +01:00
DL6ER
c1ffcdd997 Fix resolveHostname() subroutine
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:43:28 +01:00
DL6ER
1ec38e3a79 Don't want IPs in Query Log output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-05 16:35:42 +01:00
DL6ER
9e5eba4036 Return both client IP and hostname in clientname string
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-04 21:06:28 +01:00
Mark Drobnak
f32de004cb Merge pull request #695 from mrdnomaid/patch-3
Change the whitelist icon in the sidebar
2018-03-02 14:41:21 -05:00
Tom
80a7f91449 Change the whitelist icon in the sidebar 2018-03-02 16:44:22 +00:00
DL6ER
ee4e106d83 :codacy:
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:52:40 +01:00
DL6ER
02f14ceb05 Add name resolution capabilites (with caching) for web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:44:01 +01:00
Mark Drobnak
0f76158129 Merge pull request #653 from ryanknapper/devel
Conditional forwarding options
2018-02-18 12:51:57 -05:00
ail1020
78f031869f Display the name of the blocklist URL
added -adlist arg to the query command
2018-01-28 20:17:48 -06:00
Mark Drobnak
041b0550d9 Merge pull request #674 from pi-hole/fix/php-security
Clean up some security issues
2018-01-24 15:12:31 -05:00
Mcat12
289b62abf3 Fix header.php importing func.php twice
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-20 10:59:05 -05:00
Mcat12
862db2ba9e Use hash_equals in password.php (and move it to funcs.php)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 17:52:06 -05:00
Mcat12
a2b30e9fe9 Sanitize debug text before sending
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 17:08:05 -05:00
Mcat12
ad614a2b93 Fix list_verify XSS
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 16:57:47 -05:00
DL6ER
78f6cb3751 Add option to disable logging without flushing logs (for temporary disabling without wanting to nuke the logs).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-18 17:09:20 +01:00
Mark Drobnak
690d0a6899 Merge pull request #667 from pi-hole/fix/top-clients-filter
Fix Top Clients filter
2018-01-11 17:30:04 -05:00
Mark Drobnak
34b6c37516 Fix IP check and allow host names in Top Clients filter
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-11 15:33:31 -05:00
Mark Drobnak
323b3a7a8b Fix Top Clients filter
It expected IP addresses, but only let in domains

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-10 15:56:41 -05:00
Mcat12
a2d9e7c1ac Add auditlog.list to the Teleporter
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-08 22:03:27 -05:00
DL6ER
746df3b63f Decide whether FTL is on any custom branch by looking for "vDev" in the beginning of the version string
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-05 23:19:02 +01:00
Mark Drobnak
f2a0b622f1 Fix preg_split warning
Warning was:
`preg_split(): Delimiter must not be alphanumeric or backslash`

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-01-02 12:11:22 -05:00
DL6ER
bc1f6f9be6 Add quad9 secondary IPv4 server
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-30 18:26:49 +01:00
ryanknapper
9b3cf91cee Update savesettings.php
Added section to save conditional forwarding settings.
2017-12-26 13:47:40 -05:00
Mark Drobnak
3b5cac13de Finish fixing whitespace caused by license headers
Addresses https://github.com/pi-hole/AdminLTE/pull/409#issuecomment-350504602

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-12-10 14:18:35 -05:00
DL6ER
f5f4e57454 Also hide the long details if only the FTL branch is set
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-04 21:51:44 +01:00
DL6ER
6e6151c9cd Adding branch/version display for FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-04 21:50:14 +01:00
Mcat12
c2d9506bec Merge pull request #619 from mcattle/patch-1
Add Quad9 DNS Servers to DNS Servers List
2017-11-18 14:06:51 -05:00
mcattle
edb93db3ce Add Quad9 DNS Servers to DNS Servers List
I've added the Quad9 DNS servers (IPv4 and IPv6) to the DNS Servers list.  (https://www.quad9.net/)  I've opted not to also add their non-secure alternate servers, as those mainly exist for diagnostics of false positives, and are not the primary focus of the Quad9 service.  They do not offer secondary servers, as their primary servers are already geographically distributed and redundant.
2017-11-16 23:08:35 -07:00
TheME
b844c20ad5 Merge branch 'devel' into clean_up_style-rules 2017-11-07 21:36:53 +01:00
DL6ER
0a7e216f97 Fix indices
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-03 17:00:23 +01:00
DL6ER
3783f63af8 Remove goto statement
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-31 21:17:37 +01:00
DL6ER
d3cbf1314e Skip updatechecker if at least one of the three files is not present
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:27:05 +02:00
DL6ER
86bcda8418 Use versions/branches from external file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 13:35:21 +02:00