Commit Graph

744 Commits

Author SHA1 Message Date
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
Mcat12
11ac1d642b Merge pull request #608 from JamieMagee/remote-tt-tags
Remove <tt> tags
2017-10-25 16:11:19 -04:00
Jamie Magee
6fd0c5eff8 Replace <tt> tags with <samp> tags 2017-10-25 12:56:18 +00:00
DL6ER
fd766dfdbb Merge pull request #593 from pi-hole/fix/non-local-FTL
Explicitly allow non-local FTL installations
2017-10-23 08:47:02 +02:00
JamieMagee
a12e1bf304 Replace deprecated tt tag with kbd tag 2017-10-22 23:57:16 +02:00
Mcat12
d70084b60c Merge pull request #597 from pi-hole/fix/whitelist-no-password
Fix whitelisting when no password is set
2017-10-19 10:38:37 -04:00
Mcat12
37e9b692cb Merge pull request #599 from andreskrey/prg-method-during-login
Redirect the user to home after successful login
2017-10-19 09:04:20 -04:00
WaLLy3K
60b5e36c32 Check for updates every two days
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-12 20:54:04 +11:00
Andres Rey
a3aecbf15a Remove unused sprintf function 2017-10-10 18:42:32 +01:00
Andres Rey
33db4f2842 Redirect the user in a POST-Redirect-GET fashion after a successful login 2017-10-10 10:40:18 +01:00
Mcat12
c60b703680 Appease codacy 2017-10-07 17:09:49 -04:00
Mcat12
cea17a4766 Allow whitelisting/blacklist even if there is no password set 2017-10-07 16:51:22 -04:00
DL6ER
688e3f8665 Merge branch 'devel' into tweak/Teleporter_v2.0 2017-10-07 17:49:05 +02:00
DL6ER
b6caf5878f Ensure we restart dnsmasq only once (at the end of importing stuff)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:34:10 +02:00
DL6ER
bfad6d8fcb Add nuke option before importing new list to be sure the content is being replaced instead of appended
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:25:43 +02:00
WaLLy3K
c6b98655b1 Link to pi-hole.net/donate instead of PayPal
* Give users the option to choose their preferred donation method
* Use the heart symbol as the icon

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-08 00:54:56 +11:00
WaLLy3K
619f115660 Remove GitHub link in footer 2017-10-07 23:42:14 +11:00
DL6ER
02807730ee We don't have to test for the php-zip extension anymore. Instead, we test for "Phar" (which seems to be there by default on most systems)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 14:36:16 +02:00
DL6ER
5b47e9caa5 Fix a typo
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:49:04 +02:00
DL6ER
d1d9d7faff Use htmlentities() to mitigate XSS (this function is identical to htmlspecialchars() in all ways, except with htmlentities(), all characters which have HTML character entity equivalents are translated into these entities)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:47:06 +02:00
DL6ER
a50525d72b Clean up after import
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:43:19 +02:00
DL6ER
67855df5c5 Minor corrections
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:42:49 +02:00
DL6ER
6bb6c6d29f Finished Teleporter 2.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 21:13:07 +02:00
DL6ER
80b37a7c81 Merge branch 'devel' into tweak/Teleporter_v2.0 2017-10-06 20:26:21 +02:00
DL6ER
2f3dc0befe Oh :codacy: ...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:27:42 +02:00
DL6ER
fcf2eb663f Specify one common place for defining the IP of a non-local FTL instance. Fixes #589
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:19:24 +02:00
WaLLy3K
0bafeabe49 Allow full stop in top list wildcard exclusions
* Fix #580
2017-09-22 18:19:04 +10:00
DL6ER
a18a45e6b8 Detect ${OVER} and mirror its effect properly on the web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-21 20:23:38 +02:00
DL6ER
6eb450a3a6 Show detected number of cores not only when hovering the icon, but also when hovering the Load text
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-16 16:18:51 +02:00