67 Commits (9e96ff37de2e0e2c1f4d2af76360fffc42c65026)

Author	SHA1	Message	Date
Matthias Schoettle	308eb5eda5	Fixes broken blocking page and landing page when changing server port and/or hostname. ... See issues #2195 and #2720. Signed-off-by: Matthias Schoettle <git@mattsch.com>	4 years ago
DL6ER	276b191845	Remove dead code causing failure from the blocking page. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Mcat12	3ebd43ebf0	Remove outdated adlists.list check and fix empty adlists error message ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	2b5033e732	Add missing spaces found by linter ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	f1733f9c5d	Fetch adlists for the block page from gravity.db ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Nils Bergmann	cd9fadbc44	Remove protocol determination ... No protocol determination is neede, if you just use double slash. Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>	5 years ago
Patrik Cyvoct	85cf98888d	Merge remote-tracking branch 'origin/development' into ipv6_brackets ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	6 years ago
Patrik Cyvoct	048e5bb9a2	Remove external ipv6 brackets if any in servername ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	6 years ago
Alex Villarreal	e422f4154f	Clean error message on successful response ... Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>	6 years ago
Rob Gill	382c19024f	oh stickler bot... ... accidentally a space Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	9379487942	changes as requested ... changes as requested Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	5e99baf7b9	Update index.php ... thanks stickler-ci ....... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	31951dae4c	Update index.php ... Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Dan Schaper	34d84522dd	Merge pull request #2054 from theLMGN/patch-1 ... Link to the admin panel on the splash page.	6 years ago
Leo MG Nesfield (LMGN)	bfcbd72e4b	Link to the admin panel on the splash page.	6 years ago
Mcat12	8a42ef431b	Fix Javascript warning when no password is set ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	2cf1f0e8fc	Hide the password input when there is no password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1a5c86d32e	Revert "Hide password textbox if there is no password" ... This reverts commit 009fa2f1b7.	6 years ago
Mcat12	c7219fbdff	Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password	6 years ago
Keith Bentrup	45ab2a3d7a	send HTTP headers before HTML ... Signed-off-by: Keith Bentrup <keith@keithbentrup.com>	7 years ago
Mcat12	009fa2f1b7	Hide password textbox if there is no password	7 years ago
WaLLy3K	2c091f3a3c	Merge branch 'development' into cors_mixed_content_fix	7 years ago
Mcat12	e7589945a2	Disable password field if no password is set ... For someone to actually whitelist a domain without a password, more changes will be needed on the PHP side.	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
andofrjando	6323d5afed	Use PHP short echo tag to avoid Codacy expecting an escaping function	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	49aee8b931	Fixed development branch check	7 years ago
WaLLy3K	f2a3b557c8	Updated Block Page to work with queryFunc output	7 years ago
WaLLy3K	69fa9874dd	Use HTTP_HOST instead of SERVER_NAME ... * Fixes https://github.com/pi-hole/pi-hole/issues/1479	7 years ago
WaLLy3K	f9d41caeb6	Merge branch 'development' into blockpage2	7 years ago
0412465564	31d5a7ae9e	whitelist on website blocked doesnt work (#1452) ... Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.	7 years ago
WaLLy3K	1c2aa44d46	Provide notice message for whitelisted sites	7 years ago
WaLLy3K	173ad339bb	Update CSS location	7 years ago
WaLLy3K	4d731ca30b	Updated landing page location ... During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!	7 years ago
WaLLy3K	f2016f26d7	Updated splash page CSS href	7 years ago
WaLLy3K	551add5f44	Update index.php ... * An "About Pi-hole" link on the block page provides an ELI5 explanation to those not familiar with Pi-hole * An email contact link on the block page provides users of your Pi-hole with a means to easily get in touch with you * Browsing to your Pi-hole's address will show a simple "landing page", which can be replaced by adding "landing.php" within "/var/www/html" * Users manually browsing to file/image based content (i.e: non HTML based content) on blocked sites will be greeted with a small "Blocked by Pi-hole" image * Sites that are manually blacklisted will display a notice of this on the block page * Sites that aren't directly blocked, but have a CNAME record, will show a notification on the block page (e.g: If raw.githubusercontent.com is not blocked, but github.map.fastly.net is) * On the block page, "Back to Safety" now directs the user to "about:home" if Javascript is disabled * Whitelisting is disabled for installs without a password, or if a client does not have Javascript * Known issues: * Admin Console needs a text field under "Web User Interface" where the admin can enter a preferred contact email when a site needs to be whitelisted, to be saved to setupVars.conf with the key "ADMIN_EMAIL" * Admin Console needs a text field under "Networking" where the admin can enter their Pi-hole's externally contactable FQDN, allowing access to their landing page when browsing to mypi.duckdns.org, to be saved to setupVars.conf with the key "FQDN" * I am not aware of expected output of `$_SERVER["VIRTUAL_HOST"]`, so I have assumed it should be filtered as if it's a domain	7 years ago
Dan Schaper	bfc4775b34	Merge pull request #1297 from raincoats/development ... Redirect to admin panel when accessing 'http://pi.hole/'	7 years ago
DL6ER	f1f70133dc	Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396	7 years ago
Flo	7e0aa822b6	Match the Pi-hole brand (#1358) ... * Update README.md * Update index.php * Update basic-install.sh * Update piholeCheckout.sh * Update update.sh * Update CONTRIBUTING.md * Update the Pi-hole brand tip in CONTRIBUTING.md Use a better formulation. * Update README.md 2	7 years ago
DL6ER	ad9575ce18	Recognize more host names	7 years ago
DL6ER	f09c166350	Improve Error 404 page behavior	7 years ago
Flo	6eb9192cd1	Complete site ... The start <html>-tag was missing.	7 years ago
raincoats	1590a179fa	Change 302 redirect to 301 ... Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects. Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421	7 years ago
raincoats	eb763d2dc2	Redirect to admin panel when accessing 'http://pi.hole/' ... If someone tries to access 'http://pi.hole/', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/'. This just redirects them to the admin panel.	7 years ago
Mcat12	df7671d393	Add a few comments and remove debug output	7 years ago
DL6ER	11924d425b	Hide whitelist option if we detected that the domain as blocked due to wildcard blocking	7 years ago
DL6ER	6b3aea933d	Add info that whitelisting blocked pages does not work	7 years ago
Mcat12	7bcc15e416	Adjust blocking page paths from admin restructure	7 years ago
Mcat12	5e35fdbc52	Save blocking page CSS to pihole directory instead of admin	7 years ago