dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ability to return (on login) to last visited page on logout.

This commit is contained in:
Nate Jones 2015-04-04 18:46:44 +00:00
parent dcb362de79
commit d18b4aacec
2 changed files with 83 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
logout.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012
Portions created by the Initial Developer are Copyright (C) 2008-2015
the Initial Developer. All Rights Reserved.
Contributor(s):
@ -25,6 +25,82 @@
*/
include "root.php";
require_once "resources/require.php";
//check for login return preference
if ($_SESSION['login']['destination_last']['boolean'] == 'true') {
if ($_SERVER['HTTP_REFERER'] != '') {
//convert to relative path
$referrer = substr($_SERVER['HTTP_REFERER'], strpos($_SERVER['HTTP_REFERER'], $_SERVER["HTTP_HOST"]) + strlen($_SERVER["HTTP_HOST"]));
//check if destination url already exists
$sql = "select count(*) as num_rows from v_user_settings ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and user_uuid = '".$_SESSION["user_uuid"]."' ";
$sql .= "and user_setting_category = 'login' ";
$sql .= "and user_setting_subcategory = 'destination' ";
$sql .= "and user_setting_name = 'url' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
$exists = ($row['num_rows'] > 0) ? true : false;
}
unset($sql, $prep_statement, $row);
//if exists, update
if ($exists) {
$sql = "update v_user_settings set ";
$sql .= "user_setting_value = '".$referrer."', ";
$sql .= "user_setting_enabled = 'true' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and user_uuid = '".$_SESSION["user_uuid"]."' ";
$sql .= "and user_setting_category = 'login' ";
$sql .= "and user_setting_subcategory = 'destination' ";
$sql .= "and user_setting_name = 'url' ";
$db->exec(check_sql($sql));
unset($sql);
}
//otherwise, insert
else {
$sql = "insert into v_user_settings ";
$sql .= "( ";
$sql .= "user_setting_uuid, ";
$sql .= "domain_uuid, ";
$sql .= "user_uuid, ";
$sql .= "user_setting_category, ";
$sql .= "user_setting_subcategory, ";
$sql .= "user_setting_name, ";
$sql .= "user_setting_value, ";
$sql .= "user_setting_enabled ";
$sql .= ") ";
$sql .= "values ";
$sql .= "( ";
$sql .= "'".uuid()."', ";
$sql .= "'".$_SESSION['domain_uuid']."', ";
$sql .= "'".$_SESSION["user_uuid"]."', ";
$sql .= "'login', ";
$sql .= "'destination', ";
$sql .= "'url', ";
$sql .= "'".$referrer."', ";
$sql .= "'true' ";
$sql .= ") ";
$db->exec(check_sql($sql));
unset($sql);
}
}
}
else {
//disable if not to remember last
$sql = "update v_user_settings set ";
$sql .= "user_setting_enabled = 'false' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and user_uuid = '".$_SESSION["user_uuid"]."' ";
$sql .= "and user_setting_category = 'login' ";
$sql .= "and user_setting_subcategory = 'destination' ";
$sql .= "and user_setting_name = 'url' ";
$db->exec(check_sql($sql));
unset($sql);
}
//redirect the user to the index page
header("Location: ".PROJECT_PATH."/login.php");

8
resources/check_auth.php
View File

@ -155,7 +155,7 @@ require_once "resources/require.php";
//prepare the uuids
$user_uuid = uuid();
$contact_uuid = uuid();
//set the user_id
$_SESSION["user_uuid"] = $user_uuid;
@ -379,10 +379,14 @@ require_once "resources/require.php";
//redirect the user
if (check_str($_REQUEST["rdr"]) !== 'n'){
$path = check_str($_POST["path"]);
if(isset($path) && !empty($path) && $path!="index2.php" && $path!="/install.php") {
if (isset($path) && !empty($path) && $path!="index2.php" && $path!="/install.php") {
header("Location: ".$path);
exit();
}
else if ($_SESSION['login']['destination']['url'] != '') {
header("Location: ".$_SESSION['login']['destination']['url']);
exit();
}
}
}