diff options
Diffstat (limited to 'advanced/index.php')
| -rw-r--r-- | advanced/index.php | 77 |
1 files changed, 50 insertions, 27 deletions
diff --git a/advanced/index.php b/advanced/index.php index 4f2a17f7..4356f0b0 100644 --- a/advanced/index.php +++ b/advanced/index.php @@ -41,7 +41,7 @@ $validExtTypes = array("asp", "htm", "html", "php", "rss", "xml", ""); $currentUrlExt = pathinfo($_SERVER["REQUEST_URI"], PATHINFO_EXTENSION); // Set mobile friendly viewport -$viewPort = '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>'; +$viewPort = '<meta name="viewport" content="width=device-width, initial-scale=1">'; // Set response header function setHeader($type = "x") { @@ -57,16 +57,21 @@ if ($serverName === "pi.hole" } elseif (filter_var($serverName, FILTER_VALIDATE_IP) || in_array($serverName, $authorizedHosts)) { // Set Splash Page output $splashPage = " - <html> - <head> - $viewPort - <link rel='stylesheet' href='pihole/blockingpage.css' type='text/css'/> - </head> - <body id='splashpage'> - <img src='admin/img/logo.svg'/><br/> - Pi-<b>hole</b>: Your black hole for Internet advertisements<br/> - <a href='/admin'>Did you mean to go to the admin panel?</a> - </body> + <!doctype html> + <html lang='en'> + <head> + <meta charset='utf-8'> + $viewPort + <title>● $serverName</title> + <link rel='stylesheet' href='pihole/blockingpage.css'> + <link rel='shortcut icon' href='admin/img/favicons/favicon.ico' type='image/x-icon'> + </head> + <body id='splashpage'> + <img src='admin/img/logo.svg' alt='Pi-hole logo' width='256' height='377'> + <br> + <p>Pi-<strong>hole</strong>: Your black hole for Internet advertisements</p> + <a href='/admin'>Did you mean to go to the admin panel?</a> + </body> </html> "; @@ -79,22 +84,39 @@ if ($serverName === "pi.hole" // Render splash/landing page when directly browsing via IP or authorized hostname exit($renderPage); } elseif ($currentUrlExt === "js") { - // Serve Pi-hole Javascript for blocked domains requesting JS + // Serve Pi-hole JavaScript for blocked domains requesting JS exit(setHeader("js").'var x = "Pi-hole: A black hole for Internet advertisements."'); } elseif (strpos($_SERVER["REQUEST_URI"], "?") !== FALSE && isset($_SERVER["HTTP_REFERER"])) { // Serve blank image upon receiving REQUEST_URI w/ query string & HTTP_REFERRER // e.g: An iframe of a blocked domain - exit(setHeader().'<html> - <head><script>window.close();</script></head> - <body><img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs="></body> + exit(setHeader().'<!doctype html> + <html lang="en"> + <head> + <meta charset="utf-8"><script>window.close();</script> + </head> + <body> + <img src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs="> + </body> </html>'); } elseif (!in_array($currentUrlExt, $validExtTypes) || substr_count($_SERVER["REQUEST_URI"], "?")) { // Serve SVG upon receiving non $validExtTypes URL extension or query string // e.g: Not an iframe of a blocked domain, such as when browsing to a file/query directly // QoL addition: Allow the SVG to be clicked on in order to quickly show the full Block Page - $blockImg = '<a href="/"><svg xmlns="http://www.w3.org/2000/svg" width="110" height="16"><defs><style>a {text-decoration: none;} circle {stroke: rgba(152,2,2,0.5); fill: none; stroke-width: 2;} rect {fill: rgba(152,2,2,0.5);} text {opacity: 0.3; font: 11px Arial;}</style></defs><circle cx="8" cy="8" r="7"/><rect x="10.3" y="-6" width="2" height="12" transform="rotate(45)"/><text x="19.3" y="12">Blocked by Pi-hole</text></svg></a>'; - exit(setHeader()."<html> - <head>$viewPort</head> + $blockImg = '<a href="/"> + <svg xmlns="http://www.w3.org/2000/svg" width="110" height="16"> + <circle cx="8" cy="8" r="7" fill="none" stroke="rgba(152,2,2,.5)" stroke-width="2"/> + <path fill="rgba(152,2,2,.5)" d="M11.526 3.04l1.414 1.415-8.485 8.485-1.414-1.414z"/> + <text x="19.3" y="12" opacity=".3" style="font:11px Arial"> + Blocked by Pi-hole + </text> + </svg> + </a>'; + exit(setHeader()."<!doctype html> + <html lang='en'> + <head> + <meta charset='utf-8'> + $viewPort + </head> <body>$blockImg</body> </html>"); } @@ -227,7 +249,7 @@ if (explode("-", $phVersion)[1] != "0") setHeader(); ?> -<!DOCTYPE html> +<!doctype html> <!-- Pi-hole: A black hole for Internet advertisements * (c) 2017 Pi-hole, LLC (https://pi-hole.net) * Network-wide ad blocking via your own hardware. @@ -235,12 +257,12 @@ setHeader(); * This file is copyright under the latest version of the EUPL. --> <html> <head> - <meta charset="UTF-8"> + <meta charset="utf-8"> <?=$viewPort ?> - <meta name="robots" content="noindex,nofollow"/> + <meta name="robots" content="noindex,nofollow"> <meta http-equiv="x-dns-prefetch-control" content="off"> - <link rel="shortcut icon" href="admin/img/favicon.png" type="image/x-icon"/> - <link rel="stylesheet" href="pihole/blockingpage.css" type="text/css"/> + <link rel="stylesheet" href="pihole/blockingpage.css"> + <link rel="shortcut icon" href="admin/img/favicons/favicon.ico" type="image/x-icon"> <title>● <?=$serverName ?></title> <script src="admin/scripts/vendor/jquery.min.js"></script> <script> @@ -274,10 +296,10 @@ setHeader(); </h1> <div class="spc"></div> - <input id="bpAboutToggle" type="checkbox"/> + <input id="bpAboutToggle" type="checkbox"> <div id="bpAbout"> <div class="aboutPH"> - <div class="aboutImg"/></div> + <div class="aboutImg"></div> <p>Open Source Ad Blocker <small>Designed for Raspberry Pi</small> </p> @@ -314,8 +336,9 @@ setHeader(); <pre id='bpQueryOutput'><?php if ($featuredTotal > 0) foreach ($queryResults as $num => $value) { echo "<span>[$num]:</span>$adlistsUrls[$num]\n"; } ?></pre> <form id="bpWLButtons" class="buttons"> - <input id="bpWLDomain" type="text" value="<?=$serverName ?>" disabled/> - <input id="bpWLPassword" type="password" placeholder="Javascript disabled" disabled/><button id="bpWhitelist" type="button" disabled></button> + <input id="bpWLDomain" type="text" value="<?=$serverName ?>" disabled> + <input id="bpWLPassword" type="password" placeholder="JavaScript disabled" disabled> + <button id="bpWhitelist" type="button" disabled></button> </form> </div> </main> |