From 509113296cf05380fb70515a3735f0ab3717ce46 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Fri, 12 Aug 2022 17:32:26 -0300 Subject: [PATCH] Move login form to a new page Signed-off-by: RD WebDesign --- api.php | 2 +- api_db.php | 3 +- auditlog.php | 2 +- cname_records.php | 2 +- db_graph.php | 2 +- db_lists.php | 2 +- db_queries.php | 2 +- debug.php | 2 +- dns_records.php | 2 +- gravity.php | 2 +- groups-adlists.php | 5 +- groups-clients.php | 2 +- groups-domains.php | 2 +- groups.php | 2 +- index.php | 2 +- login.php | 98 +++++++ logout.php | 9 + messages.php | 2 +- network.php | 2 +- queries.php | 2 +- queryads.php | 2 +- scripts/pi-hole/js/footer.js | 49 ++-- scripts/pi-hole/php/header.php | 292 ++----------------- scripts/pi-hole/php/header_authenticated.php | 242 +++++++++++++++ scripts/pi-hole/php/password.php | 136 ++++----- scripts/pi-hole/php/sidebar.php | 2 +- settings.php | 2 +- style/pi-hole.css | 56 ++-- style/themes/default-dark.css | 4 + style/themes/default-darker.css | 1 - style/themes/default-light.css | 4 + style/themes/lcars.css | 70 ++--- taillog-FTL.php | 2 +- taillog.php | 2 +- 34 files changed, 561 insertions(+), 450 deletions(-) create mode 100644 login.php create mode 100644 logout.php create mode 100644 scripts/pi-hole/php/header_authenticated.php diff --git a/api.php b/api.php index 7176e243..3801561f 100644 --- a/api.php +++ b/api.php @@ -8,8 +8,8 @@ */ $api = true; -require_once 'scripts/pi-hole/php/FTL.php'; require_once 'scripts/pi-hole/php/password.php'; +require_once 'scripts/pi-hole/php/FTL.php'; require_once 'scripts/pi-hole/php/database.php'; require_once 'scripts/pi-hole/php/auth.php'; check_cors(); diff --git a/api_db.php b/api_db.php index 905b82d7..5612de26 100644 --- a/api_db.php +++ b/api_db.php @@ -8,9 +8,10 @@ */ $api = true; +require 'scripts/pi-hole/php/password.php'; + header('Content-type: application/json'); require 'scripts/pi-hole/php/database.php'; -require 'scripts/pi-hole/php/password.php'; require 'scripts/pi-hole/php/auth.php'; require_once 'scripts/pi-hole/php/func.php'; check_cors(); diff --git a/auditlog.php b/auditlog.php index b1e7cfb3..1358b14e 100644 --- a/auditlog.php +++ b/auditlog.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/cname_records.php b/cname_records.php index a4bb97e9..4804eb68 100644 --- a/cname_records.php +++ b/cname_records.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/db_graph.php b/db_graph.php index 9f9be574..6ea41e8d 100644 --- a/db_graph.php +++ b/db_graph.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/db_lists.php b/db_lists.php index 511f58a8..25e2677a 100644 --- a/db_lists.php +++ b/db_lists.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/db_queries.php b/db_queries.php index 73e43c88..d08edf29 100644 --- a/db_queries.php +++ b/db_queries.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/debug.php b/debug.php index f3472026..b426ee67 100644 --- a/debug.php +++ b/debug.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>
diff --git a/dns_records.php b/dns_records.php index a32e9891..b0d3f52c 100644 --- a/dns_records.php +++ b/dns_records.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/gravity.php b/gravity.php index 20937937..49bd0070 100644 --- a/gravity.php +++ b/gravity.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>
diff --git a/groups-adlists.php b/groups-adlists.php index 2899a9c6..dd9d1c7d 100644 --- a/groups-adlists.php +++ b/groups-adlists.php @@ -1,4 +1,5 @@ - diff --git a/groups-clients.php b/groups-clients.php index 2fa3cd79..f85987fa 100644 --- a/groups-clients.php +++ b/groups-clients.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/groups-domains.php b/groups-domains.php index f8c854a4..f511f9f7 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/groups.php b/groups.php index 640033c6..b48d8dae 100644 --- a/groups.php +++ b/groups.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?> diff --git a/index.php b/index.php index 8db55d00..b1d66c3b 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ */ $indexpage = true; -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; require_once 'scripts/pi-hole/php/gravity.php'; ?> diff --git a/login.php b/login.php new file mode 100644 index 00000000..fc6ba548 --- /dev/null +++ b/login.php @@ -0,0 +1,98 @@ + + + + + + + + diff --git a/logout.php b/logout.php new file mode 100644 index 00000000..baac04c1 --- /dev/null +++ b/logout.php @@ -0,0 +1,9 @@ + diff --git a/network.php b/network.php index 7d58db6e..a9c4e8d3 100644 --- a/network.php +++ b/network.php @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>
diff --git a/queries.php b/queries.php index 2dbea379..3ba894f7 100644 --- a/queries.php +++ b/queries.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; $showing = ''; diff --git a/queryads.php b/queryads.php index 7e2ab4aa..a6e128fd 100644 --- a/queryads.php +++ b/queryads.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 49083dd1..00ece726 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -256,36 +256,41 @@ $("#pihole-disable-custom").on("click", function (e) { }); // Session timer -var sessionTimerCounter = document.getElementById("sessiontimercounter"); -var sessionvalidity = parseInt(sessionTimerCounter.textContent, 10); -var start = new Date(); - function updateSessionTimer() { start = new Date(); start.setSeconds(start.getSeconds() + sessionvalidity); } -if (sessionvalidity > 0) { - // setSeconds will correctly handle wrap-around cases - updateSessionTimer(); +var sessionTimerCounter, sessionvalidity, start; - setInterval(function () { - var current = new Date(); - var totalseconds = (start - current) / 1000; - var minutes = Math.floor(totalseconds / 60); - if (minutes < 10) { - minutes = "0" + minutes; - } +var sessiontimer = document.getElementById("sessiontimer"); +if (sessiontimer) { + sessionTimerCounter = document.getElementById("sessiontimercounter"); + sessionvalidity = parseInt(sessionTimerCounter.textContent, 10); + start = new Date(); - var seconds = Math.floor(totalseconds % 60); - if (seconds < 10) { - seconds = "0" + seconds; - } + if (sessionvalidity > 0) { + // setSeconds will correctly handle wrap-around cases + updateSessionTimer(); - sessionTimerCounter.textContent = totalseconds > 0 ? minutes + ":" + seconds : "-- : --"; - }, 1000); -} else { - document.getElementById("sessiontimer").style.display = "none"; + setInterval(function () { + var current = new Date(); + var totalseconds = (start - current) / 1000; + var minutes = Math.floor(totalseconds / 60); + if (minutes < 10) { + minutes = "0" + minutes; + } + + var seconds = Math.floor(totalseconds % 60); + if (seconds < 10) { + seconds = "0" + seconds; + } + + sessionTimerCounter.textContent = totalseconds > 0 ? minutes + ":" + seconds : "-- : --"; + }, 1000); + } else { + sessiontimer.style.display = "none"; + } } // Handle Ctrl + Enter button on Login page diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 91aee931..a185879c 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -1,153 +1,19 @@ + + +--> @@ -156,8 +22,8 @@ $piholeFTLConf = piholeFTLConfig(); - + Pi-hole<?php echo $hostname ? ' - '.$hostname : ''; ?> @@ -168,12 +34,17 @@ $piholeFTLConf = piholeFTLConfig(); + + + + + @@ -185,152 +56,43 @@ $piholeFTLConf = piholeFTLConfig(); html { background-color: #000; } - + + + + + + + + + + + - - -{$token}
"; -} -?> - - - -
-
- - - - -
- - -
- -
- diff --git a/scripts/pi-hole/php/header_authenticated.php b/scripts/pi-hole/php/header_authenticated.php new file mode 100644 index 00000000..9d03aca4 --- /dev/null +++ b/scripts/pi-hole/php/header_authenticated.php @@ -0,0 +1,242 @@ + 0) { + foreach ($data as $line) { + $expl = explode(':', $line); + if (count($expl) == 2) { + // remove " kB" from the end of the string and make it an integer + $meminfo[$expl[0]] = intval(trim(substr($expl[1], 0, -3))); + } + } + $memused = $meminfo['MemTotal'] - $meminfo['MemFree'] - $meminfo['Buffers'] - $meminfo['Cached']; + $memusage = $memused / $meminfo['MemTotal']; + } else { + $memusage = -1; + } + + return $memusage; +} + +// Try to get temperature value from different places (OS dependent) +// - return an array, containing the temperature and limit. +function getTemperature() +{ + global $setupVars; + + if (file_exists('/sys/class/thermal/thermal_zone0/temp')) { + $output = rtrim(file_get_contents('/sys/class/thermal/thermal_zone0/temp')); + } elseif (file_exists('/sys/class/hwmon/hwmon0/temp1_input')) { + $output = rtrim(file_get_contents('/sys/class/hwmon/hwmon0/temp1_input')); + } else { + $output = ''; + } + + // Test if we succeeded in getting the temperature + if (is_numeric($output)) { + // $output could be either 4-5 digits or 2-3, and we only divide by 1000 if it's 4-5 + // ex. 39007 vs 39 + $celsius = intval($output); + + // If celsius is greater than 1 degree and is in the 4-5 digit format + if ($celsius > 1000) { + // Use multiplication to get around the division-by-zero error + $celsius *= 1e-3; + } + + // Get user-defined temperature limit if set + if (isset($setupVars['TEMPERATURE_LIMIT'])) { + $limit = intval($setupVars['TEMPERATURE_LIMIT']); + } else { + $limit = 60; + } + } else { + // Nothing can be colder than -273.15 degree Celsius (= 0 Kelvin) + // This is the minimum temperature possible (AKA absolute zero) + $celsius = -273.16; + // Set templimit to null if no tempsensor was found + $limit = null; + } + + return array($celsius, $limit); +} + +check_cors(); + +// Generate CSRF token +if (empty($_SESSION['token'])) { + $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32)); +} +$token = $_SESSION['token']; + +// For session timer +$maxlifetime = ini_get('session.gc_maxlifetime'); + +// Get temperature +list($celsius, $temperaturelimit) = getTemperature(); + +// Get CPU load +$loaddata = sys_getloadavg(); +foreach ($loaddata as $key => $value) { + $loaddata[$key] = round($value, 2); +} + +// Get number of processing units available to PHP +// (may be less than the number of online processors) +$nproc = shell_exec('nproc'); +if (!is_numeric($nproc)) { + $cpuinfo = file_get_contents('/proc/cpuinfo'); + preg_match_all('/^processor/m', $cpuinfo, $matches); + $nproc = count($matches[0]); +} + +// Get memory usage +$memory_usage = getMemUsage(); + +$piholeFTLConf = piholeFTLConfig(); + +require 'header.php'; +?> + + +{$token}
"; +} +?> + + + +
+
+ + + + +
+ + +
+ +
diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php index 923ced7b..646f3296 100644 --- a/scripts/pi-hole/php/password.php +++ b/scripts/pi-hole/php/password.php @@ -9,11 +9,12 @@ require_once 'func.php'; -// Start a new PHP session (or continue an existing one) // Prevents javascript XSS attacks aimed to steal the session ID ini_set('session.cookie_httponly', 1); // Prevent Session ID from being passed through URLs ini_set('session.use_only_cookies', 1); + +// Start a new PHP session (or continue an existing one) session_start(); // Read setupVars.conf file @@ -25,81 +26,82 @@ if (isset($setupVars['WEBPASSWORD'])) { $pwhash = ''; } -// If the user wants to log out, we free all session variables currently registered -// and delete any persistent cookie. -if (isset($_GET['logout'])) { - session_unset(); - setcookie('persistentlogin', '', 1); - header('Location: index.php'); +function verifyPassword($pwhash) +{ + $validpassword = true; - exit; -} - -$wrongpassword = false; -$auth = false; - -// Test if password is set -if (strlen($pwhash) > 0) { - // Check for and authorize from persistent cookie - if (isset($_COOKIE['persistentlogin'])) { - if (hash_equals($pwhash, $_COOKIE['persistentlogin'])) { - $auth = true; - // Refresh cookie with new expiry - // setcookie( $name, $value, $expire, $path, $domain, $secure, $httponly ) - setcookie('persistentlogin', $pwhash, time() + 60 * 60 * 24 * 7, null, null, null, true); - } else { - // Invalid cookie - $auth = false; - setcookie('persistentlogin', '', 1); - } - } - // Compare doubly hashes password input with saved hash - elseif (isset($_POST['pw'])) { - $postinput = hash('sha256', hash('sha256', $_POST['pw'])); - if (hash_equals($pwhash, $postinput)) { - // Regenerate session ID to prevent session fixation - session_regenerate_id(); - - // Clear the old session - $_SESSION = array(); - - // Set hash in new session - $_SESSION['hash'] = $pwhash; - - // Set persistent cookie if selected - if (isset($_POST['persistentlogin'])) { + // Test if password is set + if (strlen($pwhash) > 0) { + // Check for and authorize from persistent cookie + if (isset($_COOKIE['persistentlogin'])) { + if (hash_equals($pwhash, $_COOKIE['persistentlogin'])) { + $_SESSION['auth'] = true; + // Refresh cookie with new expiry // setcookie( $name, $value, $expire, $path, $domain, $secure, $httponly ) setcookie('persistentlogin', $pwhash, time() + 60 * 60 * 24 * 7, null, null, null, true); + } else { + // Invalid cookie + $_SESSION['auth'] = false; + setcookie('persistentlogin', '', 1); } + } elseif (isset($_POST['pw'])) { + // Compare doubly hashes password input with saved hash + $postinput = hash('sha256', hash('sha256', $_POST['pw'])); - // Login successful, redirect the user to the homepage to discard the POST request - if ($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['QUERY_STRING'] === 'login') { - header('Location: index.php'); + if (hash_equals($pwhash, $postinput)) { + // Save previously accessed page, before clear the session + $redirect_url = 'index.php'; + if (isset($_SESSION['prev_url'])) { + $redirect_url = $_SESSION['prev_url']; + } - exit; + // Regenerate session ID to prevent session fixation + session_regenerate_id(); + + // Clear the old session + $_SESSION = array(); + + // Set hash in new session + $_SESSION['hash'] = $pwhash; + + // Set persistent cookie if selected + if (isset($_POST['persistentlogin'])) { + // setcookie( $name, $value, $expire, $path, $domain, $secure, $httponly ) + setcookie('persistentlogin', $pwhash, time() + 60 * 60 * 24 * 7, null, null, null, true); + } + + $_SESSION['auth'] = true; + + // Login successful, redirect the user to the original requested page + if ($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER['SCRIPT_NAME'] === '/admin/login.php') { + header('Location: '.$redirect_url); + exit; + } + } else { + $_SESSION['auth'] = false; + $validpassword = false; + } + } elseif (isset($_SESSION['hash'])) { + // Compare auth hash with saved hash + if (hash_equals($pwhash, $_SESSION['hash'])) { + $_SESSION['auth'] = true; + } + } elseif (isset($api) && isset($_GET['auth'])) { + // API can use the hash to get data without logging in via plain-text password + if (hash_equals($pwhash, $_GET['auth'])) { + $_SESSION['auth'] = true; } - - $auth = true; } else { - $wrongpassword = true; - } - } - // Compare auth hash with saved hash - elseif (isset($_SESSION['hash'])) { - if (hash_equals($pwhash, $_SESSION['hash'])) { - $auth = true; - } - } - // API can use the hash to get data without logging in via plain-text password - elseif (isset($api, $_GET['auth'])) { - if (hash_equals($pwhash, $_GET['auth'])) { - $auth = true; + // Password or hash wrong + $_SESSION['auth'] = false; } } else { - // Password or hash wrong - $auth = false; + // No password set + $_SESSION['auth'] = true; } -} else { - // No password set - $auth = true; + + return $validpassword; } + +$wrongpassword = !verifyPassword($pwhash); +$auth = $_SESSION['auth']; diff --git a/scripts/pi-hole/php/sidebar.php b/scripts/pi-hole/php/sidebar.php index 28acf736..a34cdfea 100644 --- a/scripts/pi-hole/php/sidebar.php +++ b/scripts/pi-hole/php/sidebar.php @@ -82,7 +82,7 @@ if (strlen($pwhash) > 0 && $auth) { ?>
  • - + Logout
    • diff --git a/settings.php b/settings.php index dbabe25c..eb921955 100644 --- a/settings.php +++ b/settings.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; require 'scripts/pi-hole/php/savesettings.php'; require_once 'scripts/pi-hole/php/FTL.php'; diff --git a/style/pi-hole.css b/style/pi-hole.css index 9bf55bab..3eca6adc 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -496,16 +496,34 @@ td.details-control { } } -/*** Login form ***/ +/*** Login page ***/ +.login-page { + padding: 15px; + min-height: 100vh !important; + height: auto !important; + display: flex; + justify-content: center; + flex-direction: column; +} + +.login-box { + position: relative; + margin: 0 auto; + padding: 5px; + width: 480px; + max-width: 100%; + flex: 0 1 auto; + align-self: center; + border: none; +} + .form-control-feedback { right: 12px; } .loginpage-logo { - width: 30%; -} -.layout-boxed .loginpage-logo { - width: 50%; + width: 140px; + margin: 0 0 10px; } .login-options { @@ -530,27 +548,19 @@ td.details-control { flex: 1 0 auto; } -.login-help { - padding: 6px; - background: rgba(127, 127, 127, 0.05); +.login-footer a { text-align: center; + min-width: 28%; +} +@media screen and (max-width: 420px) { + .login-footer a { + min-width: auto; + padding: 5px; + } } -.login-help p { - margin: 0; - font-size: clamp(11px, (100vw - 400px) / 45, 15px); - line-height: 1.6; -} - -@media screen and (min-width: 768px) { - .layout-boxed:not(.sidebar-collapse) .login-help p { - font-size: clamp(11px, (min(100vw, 1250px) - 380px) / 47, 15px); - } - - /* hide warning icon only when logged in and menu is not collapsed */ - .logged-in:not(.sidebar-collapse) #top-warning-count { - display: none; - } +.login-donate { + padding: 15px; } /*** Warning icon and count ***/ diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index 8a12ce94..56363758 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -596,6 +596,10 @@ input[type="password"]::-webkit-caps-lock-indicator { color: #383838; } +.login-page { + background-image: linear-gradient(#0006, #0006), url("../../img/boxed-bg-dark.png"); +} + /*** Fix login input visual misalignment ***/ #loginform, #loginform input { diff --git a/style/themes/default-darker.css b/style/themes/default-darker.css index 72d86d77..8243ccfe 100644 --- a/style/themes/default-darker.css +++ b/style/themes/default-darker.css @@ -3634,7 +3634,6 @@ a:focus { .login-page, .register-page { background-color: rgb(46, 50, 52); - background-image: none; } .login-box-body, .register-box-body { diff --git a/style/themes/default-light.css b/style/themes/default-light.css index d954d288..c808eee1 100644 --- a/style/themes/default-light.css +++ b/style/themes/default-light.css @@ -158,6 +158,10 @@ background-color: #3b8ab8; } +.login-box { + background: #f0f2f4; +} + .not-used { background-color: #eee; } diff --git a/style/themes/lcars.css b/style/themes/lcars.css index b44691fd..efd79c23 100644 --- a/style/themes/lcars.css +++ b/style/themes/lcars.css @@ -337,39 +337,35 @@ p.login-box-msg, height: 32px; } -.form-group.has-error.login-box-msg::before { +.has-error.login-box-msg::before, +.has-error.login-box-msg::after { content: "ACCESS DENIED"; margin: -20px -20px 20px; - padding: calc(45px + 0.7em) 0 0; + padding: calc(176px - 0.5em) 0 0; position: absolute; inset: 0 0 0 0; - color: #630030; - font-size: 3.825em; - font-size: calc((100vw - var(--sidebar-width) - 60px) / 12); + font-size: clamp(40px, calc((100vw - 60px) / 6), 90px); line-height: 1; - background: rgba(0, 0, 0, 0.88); + height: calc(176px + 2em); +} + +.form-group.has-error.login-box-msg::before { + color: #600; + background-image: linear-gradient( + rgba(0, 0, 0, 0), + rgba(0, 0, 0, 0.7) 10%, + rgba(0, 0, 0, 0.7) 70%, + rgba(0, 0, 0, 0) + ); + text-shadow: 0 0 0.25em #000; } .form-group.has-error.login-box-msg::after { - content: "ACCESS DENIED"; - margin: -20px -20px 20px; - padding: calc(45px + 0.7em) 0 0; - position: absolute; - inset: 0 0 0 0; - color: #e33100; - font-size: 3.825em; - font-size: calc((100vw - var(--sidebar-width) - 60px) / 12); - line-height: 1; - text-shadow: 0 0 5px #e33100; + color: #e30; animation: 3s infinite Pulse steps(30); z-index: 1; } -.layout-boxed .form-group.has-error.login-box-msg::before, -.layout-boxed .form-group.has-error.login-box-msg::after { - padding: calc(50% - 0.5em) 0 0; -} - #loginform .has-error + .row .btn { background: #d43; } @@ -383,10 +379,6 @@ p.login-box-msg, background: #f00; } -.login-help p { - font-size: 13px; -} - .input-group .input-group-addon { border-radius: 8px 0 0 8px; border-right: none; @@ -1100,6 +1092,11 @@ table.table-bordered.dataTable td { background-color: transparent; } +.login-box { + margin-bottom: 0; + background: #181818; +} + .page-header { border: none; } @@ -1552,13 +1549,6 @@ table.dataTable { /*** MEDIA QUERIES ***/ /*--- Media - max-width ---*/ -@media (max-width: 991px) { - .form-group.has-error.login-box-msg::before, - .form-group.has-error.login-box-msg::after { - font-size: calc((100vw - var(--sidebar-width) - 60px) / 9); - } -} - @media (max-width: 767px) { .sidebar-collapse { --sidebar-width: 230px; @@ -1645,10 +1635,6 @@ table.dataTable { .main-footer { margin-left: 0; } - .form-group.has-error.login-box-msg::before, - .form-group.has-error.login-box-msg::after { - font-size: calc((100vw - 60px) / 6); - } } /*--- Media - min-width ---*/ @@ -1716,19 +1702,7 @@ table.dataTable { } } -@media (min-width: 1320px) { - .layout-boxed .form-group.has-error.login-box-msg::before, - .layout-boxed .form-group.has-error.login-box-msg::after { - font-size: calc((1320px - var(--sidebar-width) - 60px) / 12); - } -} - @media (min-width: 1960px) { - .layout-boxed .form-group.has-error.login-box-msg::before, - .layout-boxed .form-group.has-error.login-box-msg::after { - font-size: calc((1920px - var(--sidebar-width) - 60px) / 12); - } - .layout-boxed .wrapper { box-shadow: none; max-width: 1920px; diff --git a/taillog-FTL.php b/taillog-FTL.php index 359fdc80..cc9de3fd 100644 --- a/taillog-FTL.php +++ b/taillog-FTL.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>
    diff --git a/taillog.php b/taillog.php index a73b0917..69b25d1e 100644 --- a/taillog.php +++ b/taillog.php @@ -8,7 +8,7 @@ * Please see LICENSE file for your rights under this license. */ -require 'scripts/pi-hole/php/header.php'; +require 'scripts/pi-hole/php/header_authenticated.php'; ?>