From e6d75b411a26d5390167fca686c7ab7ad4daf1a9 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Fri, 5 Aug 2022 10:57:16 +1000 Subject: [PATCH] Manual merge of pr/64 by @0x5f3 --- Dockerfile | 3 ++- front/deviceDetails.php | 2 +- front/devices.php | 2 +- front/events.php | 2 +- front/index.php | 12 ++++++------ front/maintenance.php | 2 +- front/network.php | 2 +- front/php/templates/header.php | 2 +- front/presence.php | 2 +- install/pialert_front.conf | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index d594ce6d..122e67e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/apt/lists/* \ - && ln -s /home/pi/pialert/install/index.html /var/www/html/index.html \ + && rm -rf /var/www/html \ + && ln -s /home/pi/pialert/front /var/www/html \ && ln -s /home/pi/pialert/front /var/www/html/pialert \ && lighttpd-enable-mod fastcgi-php diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 03ea31a5..aec5aa3c 100644 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/devices.php b/front/devices.php index 071f0c02..79d5effe 100644 --- a/front/devices.php +++ b/front/devices.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/events.php b/front/events.php index 597cca30..e7acb376 100644 --- a/front/events.php +++ b/front/events.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/index.php b/front/index.php index 2dd44c3a..22d437f6 100644 --- a/front/index.php +++ b/front/index.php @@ -3,7 +3,7 @@ session_start(); if ($_REQUEST['action'] == 'logout') { session_destroy(); - header('Location: /pialert/index.php'); + header('Location: /index.php'); } // ################################### // ## Login settings locale start @@ -40,7 +40,7 @@ $Pia_WebProtection = strtolower(trim($protection_line[1])); if ($Pia_WebProtection == 'false') { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); $_SESSION["login"] = 1; exit; } @@ -55,13 +55,13 @@ $Pia_Password = $password_line[1]; if ($Pia_Password == hash('sha256',$_POST["loginpassword"])) { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); $_SESSION["login"] = 1; } if ($_SESSION["login"] == 1) { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); } if ($_SESSION["login"] != 1) @@ -118,12 +118,12 @@ if ($ENABLED_DARKMODE === True) {