Merge pull request #67 from 0x5f3/rebase-fix

fix rebase issues with reverse proxy
This commit is contained in:
jokob-sk
2022-08-05 23:00:52 +10:00
committed by GitHub
8 changed files with 15 additions and 15 deletions

View File

@@ -12,7 +12,7 @@ session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }

View File

@@ -12,7 +12,7 @@ session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }

View File

@@ -1,6 +1,6 @@
<!-- --------------------------------------------------------------------------- <!-- ---------------------------------------------------------------------------
# Pi.Alert # Pi.Alert
# Open Source Network Guard / WIFI & LAN intrusion detector # Open Source Network Guard / WIFI & LAN intrusion detector
# #
# events.php - Front module. Events page # events.php - Front module. Events page
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }

View File

@@ -3,7 +3,7 @@ session_start();
if ($_REQUEST['action'] == 'logout') { if ($_REQUEST['action'] == 'logout') {
session_destroy(); session_destroy();
header('Location: /index.php'); header('Location: index.php');
} }
// ################################### // ###################################
// ## Login settings locale start // ## Login settings locale start
@@ -40,7 +40,7 @@ $Pia_WebProtection = strtolower(trim($protection_line[1]));
if ($Pia_WebProtection == 'false') if ($Pia_WebProtection == 'false')
{ {
header('Location: /devices.php'); header('Location: devices.php');
$_SESSION["login"] = 1; $_SESSION["login"] = 1;
exit; exit;
} }
@@ -55,13 +55,13 @@ $Pia_Password = $password_line[1];
if ($Pia_Password == hash('sha256',$_POST["loginpassword"])) if ($Pia_Password == hash('sha256',$_POST["loginpassword"]))
{ {
header('Location: /devices.php'); header('Location: devices.php');
$_SESSION["login"] = 1; $_SESSION["login"] = 1;
} }
if ($_SESSION["login"] == 1) if ($_SESSION["login"] == 1)
{ {
header('Location: /devices.php'); header('Location: devices.php');
} }
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
@@ -123,7 +123,7 @@ if ($ENABLED_DARKMODE === True) {
<!-- /.login-logo --> <!-- /.login-logo -->
<div class="login-box-body"> <div class="login-box-body">
<p class="login-box-msg"><?php echo $pia_lang['Login_Box'];?></p> <p class="login-box-msg"><?php echo $pia_lang['Login_Box'];?></p>
<form action="/index.php" method="post"> <form action="index.php" method="post">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="password" class="form-control" placeholder="<?php echo $pia_lang['Login_Psw-box'];?>" name="loginpassword"> <input type="password" class="form-control" placeholder="<?php echo $pia_lang['Login_Psw-box'];?>" name="loginpassword">
<span class="glyphicon glyphicon-lock form-control-feedback"></span> <span class="glyphicon glyphicon-lock form-control-feedback"></span>

View File

@@ -3,7 +3,7 @@ session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }

View File

@@ -2,7 +2,7 @@
session_start(); session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }
@@ -226,7 +226,7 @@
</h4> </h4>
<div> <div>
This network device (node) doesn't have any assigned devices (leaf nodes). This network device (node) doesn't have any assigned devices (leaf nodes).
Go to <a href='./devices.php'><b>".$pia_lang['Device_Title']."</b></a>, select a device you want to attach to this node and assign it in the <b>Details</b> tab by selecting it in the <b>".$pia_lang['DevDetail_MainInfo_Network'] ."</b> dropdown. Go to <a href='devices.php'><b>".$pia_lang['Device_Title']."</b></a>, select a device you want to attach to this node and assign it in the <b>Details</b> tab by selecting it in the <b>".$pia_lang['DevDetail_MainInfo_Network'] ."</b> dropdown.
</div> </div>
</div>"; </div>";
$str_table_close = ""; $str_table_close = "";

View File

@@ -133,7 +133,7 @@ function show_pia_servertime() {
<!-- ----------------------------------------------------------------------- --> <!-- ----------------------------------------------------------------------- -->
<!-- Logo --> <!-- Logo -->
<a href="." class="logo"> <a href="devices.php" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini">P<b>a</b></span> <span class="logo-mini">P<b>a</b></span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
@@ -177,7 +177,7 @@ function show_pia_servertime() {
<li class="user-footer"> <li class="user-footer">
<div class="pull-right"> <div class="pull-right">
<a href="/index.php?action=logout" class="btn btn-danger">Sign out</a> <a href="index.php?action=logout" class="btn btn-danger">Sign out</a>
</div> </div>
</li> </li>
</ul> </ul>

View File

@@ -12,7 +12,7 @@ session_start();
if ($_SESSION["login"] != 1) if ($_SESSION["login"] != 1)
{ {
header('Location: /index.php'); header('Location: index.php');
exit; exit;
} }