2d41191ac3
Lift prefix limitaion for --rev-server
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-21 09:25:31 +02:00
1cefaf98ab
Merge pull request #1884 from yubiuser/target_blank2
...
Add forgotten target_blank
2021-09-12 15:39:35 +02:00
3889c0733f
Add forgotton target _blank
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-12 12:30:45 +02:00
f9506c5484
Autofix issues
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2021-09-12 10:26:14 +03:00
2e9bb78472
Merge pull request #1882 from pi-hole/master
...
Sync Master back to Dev
2021-09-11 22:39:57 +01:00
438c5be2f3
Merge pull request #1854 from pi-hole/XhmikosR-patch-1
...
footer.php: move FTL before Web Interface
2021-09-11 22:01:02 +02:00
42c4ed8e66
Merge pull request #1871 from pi-hole/tweak/non_cached_replies
...
Add BLOB reply type
2021-09-11 21:00:46 +01:00
293bc97b49
Merge pull request #1872 from pi-hole/tweak/color
...
Less color for the Query Log
2021-09-11 20:59:49 +01:00
25df783378
Apply htmlentities in a couple of places to prevent xss
...
Co-authored-by: wtwver <wtwver@users.noreply.github.com >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-09-11 20:03:05 +01:00
cf8602eedd
set httponly to true when calling setcookie. the ini_set option above doesn't actually seem to do anything... (but not removing it just in case
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-09-11 19:36:18 +01:00
5db2fc2786
Remove coloring of the domain names
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-09 20:51:16 +02:00
b174bad770
Less color for the Query Log
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-09 20:34:05 +02:00
b9645ff6c5
Add new BLOB reply type
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-27 15:14:33 +02:00
487ac38435
Show response time only when reply is not N/A
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-27 15:13:55 +02:00
224f906069
Merge pull request #1869 from pi-hole/tweak/blocking_while_busy
...
Add new blocked by database status and NONE reply type
2021-08-23 20:19:19 +02:00
a2ff50851c
Merge pull request #1867 from pi-hole/devel
...
Import two fixes
2021-08-19 06:58:18 +02:00
b4a26d3d59
Add new blocked by database status and NONE reply types
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-18 11:24:59 +02:00
bea1d91be3
Fix TypeError if no extended DNS error is available
...
If no extended DNS errors are available, the "ede" variable is assigned an undefined array value, hence "ede" is undefined. Since the length method is not available on undefined variables, a TypeError is thrown later in the script, which breaks the DNS queries view in the admin panel.
This commit solves the issue by assigning an empty string, if no EDE is available (data[11] is undefined).
Signed-off-by: MichaIng <micha@dietpi.com >
2021-08-16 23:23:44 +02:00
196e226e2c
Add padding between if statements
...
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de >
2021-08-10 21:21:12 +02:00
48ee7abbe8
Stop timer when user reenabled blocking early
...
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de >
2021-08-10 21:02:05 +02:00
c77f104072
Add interpretation for Pi-hole message type RATE_LIMIT
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-06 21:35:51 +02:00
a7ec9510b5
re-implement fix introduced in 1664090a01
...
Release v5.5.1 (based on `master`) has fixed this in `savesettings.php`, but the functionality has since been moved to `func.php` in `devel`, and so the fix needs applying here, too.
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-08-04 20:44:20 +01:00
647eba40d3
Merge branch 'release/v5.6' into devel
2021-08-04 20:32:59 +01:00
dacdb3d72c
Merge pull request #1857 from pi-hole/master
...
Sync Master -> Dev
2021-08-04 20:21:44 +01:00
7aa8057df7
Merge pull request from GHSA-5cm9-6p3m-v259
...
Fix (Authenticated) Remote Code Execution Possible in Web Interface 5.5
2021-08-04 18:13:35 +01:00
8066069a1f
Prevent arbritary js code from beign returned from the database
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-08-04 17:29:57 +01:00
26ec74a75a
footer.php: move FTL before Web Interface
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2021-07-31 21:13:01 +03:00
559150bb1f
Fix inverse logic when adding domains on the group management pages.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-07-25 19:03:34 +02:00
03920e3595
Move validation functions into func.php and use the same validation in all cases.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-07-25 16:59:16 +02:00
4e1f7c23a1
Merge branch 'devel' into update/dnsmasq-v2.86
2021-07-04 12:58:23 +02:00
68034029b7
Merge pull request #1822 from adyanth/devel
...
Adding CORS support via environment variable
2021-07-04 11:49:01 +01:00
f5b59d141b
Hide blackbutton for internally generated DNSSEC queries (they cannot be blocked)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-07-04 11:37:10 +02:00
0e25554cab
Merge pull request #1844 from pi-hole/tweak/chartjs294
...
Update Charts.js from 2.9.3 to 2.9.4
2021-07-04 10:17:26 +02:00
f229e4fcc9
Merge pull request #1832 from kthchew/safari-15
...
Improve `theme-color` and `background-color` for different themes
2021-07-04 01:51:32 +01:00
5438430d6e
Update to latest (and last) 2.x.x version of Chart.js to fix some bugs found in 2.9.3
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-07-03 22:24:34 +01:00
762aba21ec
Add note when a BOGUS result was sent down from upstream (we cannot say why it failed in this case)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-07-03 09:37:25 +02:00
a120e72524
Add EDE if available
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-06-28 20:35:51 +02:00
122146fcc6
Update styling of scripts/pi-hole/js/settings.js
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-06-26 15:28:11 +00:00
df9bf15e75
Query Log: Show if a query was already answered or was only sent to an upstream (and we're still awaiting the reply)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-06-26 11:00:49 +02:00
1664090a01
Escape . in regex for validDomainWildcard to ensure malicious commands cannot be passed to the function
...
bonus, removed some trailing whitespace on line 30
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-06-23 17:34:43 +01:00
fb2b87e833
Add new DNSSEC reply type
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-06-23 11:43:14 +02:00
ca030bc0c9
Merge pull request #1838 from pi-hole/tweak/trailing-commas-js
...
Prettier improvements for easier reviews
2021-06-23 11:41:56 +02:00
0d0a8dba67
Change prettier option trailingComma from "none" to the new default "es5" (see https://prettier.io/docs/en/options.html#trailing-commas )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-06-23 11:26:43 +02:00
a2c64d6d19
Merge pull request #1836 from AlexLamond/auto-darkmode
...
Added the option for an automatic dark mode based on the device status
2021-06-22 16:15:51 +02:00
57a5518c23
Update scripts/pi-hole/php/theme.php
...
Corrected naming conventions for files and theme name
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com >
2021-06-22 12:52:24 +02:00
5538af20b8
Added the option for an automatic dark mode based on the device status
...
Signed-off-by: = <9060360+AlexLamond@users.noreply.github.com >
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com >
2021-06-22 12:52:24 +02:00
2f3f4e6056
Adapt theme-color and background-color for different themes
...
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com >
2021-06-19 01:02:53 -04:00
5331620b71
Change tabs to spaces
...
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com >
2021-06-16 10:42:13 +05:30
23364cfc55
Adding CORS support via environment variable
...
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com >
2021-06-07 16:19:04 +05:30
1488af490b
Merge pull request #1809 from pi-hole/master
...
resync Dev with Master
2021-05-19 21:06:14 +01:00
yubiuser
DL6ER
XhmikosR
Adam Warner
DL6ER
MichaIng
Fabian Preuß
Adam Warner
Alex L
Kenneth Chew
Adyanth H