Improved where user is sent after login
parent
09f77d82ea
commit
5647b2de9b
14
login.php
14
login.php
|
@ -2,15 +2,21 @@
|
||||||
require 'webdata/init.php';
|
require 'webdata/init.php';
|
||||||
|
|
||||||
$returnToPage = "./";
|
$returnToPage = "./";
|
||||||
if(isset($_POST['referrerPage'])){
|
if(isset($_GET['return'])){
|
||||||
|
$returnToPage = $_GET['return'];
|
||||||
|
}
|
||||||
|
elseif(isset($_POST['referrerPage'])){
|
||||||
$returnToPage = $_POST['referrerPage'];
|
$returnToPage = $_POST['referrerPage'];
|
||||||
}
|
}
|
||||||
else if(isset($_SERVER['HTTP_REFERER'])){
|
elseif(isset($_SERVER['HTTP_REFERER'])){
|
||||||
$returnToPage = $_SERVER['HTTP_REFERER'];
|
$returnToPage = explode($_SERVER['HTTP_HOST'], $_SERVER['HTTP_REFERER'])[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(stristr($returnToPage, "login.php") || stristr($returnToPage, "register.php")){
|
if(stristr($returnToPage, "login.php") || stristr($returnToPage, "register.php")){
|
||||||
$returnToPage = "./";
|
$returnToPage = "./";
|
||||||
|
} else {
|
||||||
|
$returnToPage = str_ireplace('index.php', '', $returnToPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
if( checkLogin() ){
|
if( checkLogin() ){
|
||||||
|
@ -40,8 +46,6 @@ if(isset($_POST) && !empty($_POST)){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//echo PwdGen("Passord123", true);
|
|
||||||
|
|
||||||
|
|
||||||
?><!DOCTYPE html>
|
?><!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
|
@ -172,8 +172,9 @@ function requireLogin(): bool{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$_SERVER['HTTP_REFERER'] = $_SERVER['PHP_SELF'];
|
$_SESSION['loginRef'] = $_SERVER['PHP_SELF'];
|
||||||
header("Location: ".$config["general"]["projectRoot"]."/login.php");
|
|
||||||
|
header("Location: ".$config["general"]["projectRoot"]."/login.php?return=".str_ireplace('index.php', '', $_SERVER['PHP_SELF']));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -182,6 +183,7 @@ function checkLoginSimple(): bool {
|
||||||
|
|
||||||
if(!isset($_SESSION)){
|
if(!isset($_SESSION)){
|
||||||
session_start();
|
session_start();
|
||||||
|
$_SERVER['HTTP_REFERER'] = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_SESSION['user_id'])){
|
if(isset($_SESSION['user_id'])){
|
||||||
|
|
Loading…
Reference in New Issue