WaLLy3K
3e727c5e5d
Merge pull request #1721 from pi-hole/fix/lightyconf
...
Add comment for include_shell feature
7 years ago
DL6ER
e0edac32c7
Merge pull request #1728 from pi-hole/new/nuke_lists
...
Add nuclear option to list.sh
7 years ago
WaLLy3K
e4b3bc4209
Minor spacing corrections
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
51b09efceb
Fix minor typo
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
2dabacd024
Fix minor typo
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
0613dcc87b
Merge pull request #1692 from andofrjando/cors_mixed_content_fix
...
Fix for bug on block page (#1416 ) caused by CORS mixed content when behind reverse proxy using SSL
7 years ago
WaLLy3K
d59a2a4cfc
Merge pull request #1729 from pi-hole/fix/email-help-argument
...
Allow emails which include `-h` in them (Fix for #1691 )
7 years ago
WaLLy3K
2c091f3a3c
Merge branch 'development' into cors_mixed_content_fix
7 years ago
WaLLy3K
cfcdc53185
Merge pull request #1722 from pi-hole/fix/bpfqdn
...
Improve FQDN Authorized Hosts functionality (Fix for #1416 )
7 years ago
WaLLy3K
bd33018660
Shellcheck OR validation
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
Mcat12
67a5594909
Allow emails which include `-h` in them
...
For example, mcat12@pi-hole.net would previously spit out the help message
7 years ago
DL6ER
70ad656af0
Save backup as ".bck~" to prevent reading of the file by dnsmasq
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
f22b83d379
Create a backup before emptying the list
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
114f84c948
Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
WaLLy3K
43e1121618
Match current style of Web Interface
...
* Remove border from about menu
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
97dd1b4cf3
Improve FQDN Authorized Hosts functionality
...
* Use inverse if statement, instead of IF/ELSE when checking setupVars.conf
* Remove $svFQDN
* Add or elaborate on more comments
* Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf
* e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }`
* Move "No exact results" check to top of exception handling
* Remove unnecessary IF/ELSE when handling $queryAds error
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
288635abc9
Add comment for include_shell feature
...
* Capitalise first letter for Lighttpd
* Fix spacing
* Add comment for include_shell feature
7 years ago
Celly
3f20981aab
Update access rules to block all root '.' files
7 years ago
Celly
f54a812ad5
Update access rules to block all root '.' files
7 years ago
andofrjando
6323d5afed
Use PHP short echo tag to avoid Codacy expecting an escaping function
7 years ago
Celly
e3e3b4da58
Add in some exclusions form some leaky files in the admin
7 years ago
Adam Warner
ef1ce7d4d6
Merge pull request #1631 from pi-hole/tweak/gravity
...
Clean up and optimise Gravity
7 years ago
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity
7 years ago
WaLLy3K
11282aaca3
Decrease `local-ttl` to 2
...
* Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576 ).
7 years ago
WaLLy3K
f3cc8c71c4
Merge pull request #1691 from pi-hole/new/adminemail
...
Add `pihole -a email` functionality for Block Page contact email
7 years ago
WaLLy3K
500a755250
Delete superseded file
...
* Functionality is reproduced from within the Block Page
7 years ago
andofrjando
5e48b3f7f7
Fix one mistake where `$proto` would not be created if `$_SERVER['HTTPS']` exists but is not set to `on`
7 years ago
andofrjando
00d62b3423
This fixes the following bug:
...
If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL.
The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.
7 years ago
WaLLy3K
28063aa7f7
Add administrative contact address functionality
...
* Disable shellcheck for SC1090
7 years ago
WaLLy3K
c458e4a93b
Merge pull request #1420 from WaLLy3K/new/https
...
Disable Let's Encrypt HTTPS & shift functions to block page
7 years ago
WaLLy3K
e7ae62ba76
Merge pull request #1416 from WaLLy3K/blockpage2
...
Block Page 2.0
7 years ago
WaLLy3K
34ae4844fa
Merge branch 'development' into tweak/gravity
7 years ago
DL6ER
b8fedf76cd
Merge pull request #1572 from pi-hole/gedetil-development
...
Add web frontend shutdown command
7 years ago
DL6ER
c9d4995900
Update to comply with current development code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
279e809aaf
Use `poweroff` instead of `halt`
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
Conflicts:
advanced/Scripts/webpage.sh
7 years ago
WaLLy3K
bea99abd8d
Ensure colour consistency between terminal themes
...
* Comment file for review-ability
* Add BOLD and UNDERLINE options
* Select most readable colours out of LIGHT/DARK options
* Provide empty variables for `set -u`
* Deprecate unnecessary variables
* Correct colours for TICK/CROSS/DONE
* Escape r twice and add ESC to OVER
7 years ago
WaLLy3K
bab44c52ae
Merge branch 'development' into blockpage2
7 years ago
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
7 years ago
Adam Warner
199de9ebc0
Merge branch 'development' into new/https
7 years ago
Adam Warner
504ae0193f
Merge branch 'development' into blockpage2
7 years ago
WaLLy3K
1ae403b742
Merge pull request #1667 from pi-hole/install-space
...
Remove erroneous space
7 years ago
Adam Warner
18b41adbf6
Merge branch 'development' into tweak/gravity
7 years ago
Mcat12
898fdf7a60
Merge pull request #1602 from molikuner/development
...
Fix URL extension parsing
7 years ago
Adam Warner
78143c2ff4
Merge branch 'development' into blockpage2
7 years ago
Adam Warner
7b1524ad01
Merge branch 'development' into new/https
7 years ago
Adam Warner
5799485b0f
Merge branch 'development' into development
7 years ago
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically.
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
4fb66e632f
The other h
7 years ago
Adam Warner
5787895794
stop an extra `h` being added to leasetime of DHCP server. We already storethe `h` in `setupVars.conf`
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago