maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Redirect to last URL after relogin when session timed out, fixes #443

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-01-05 22:35:26 +01:00
parent fdc29ee8c2
commit 7fc3ac587a
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_settings.php
View File

@@ -57,7 +57,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
// check if the session timeout is too low #815 // check if the session timeout is too low #815
if (isset($_POST['session_sessiontimeout']) if (isset($_POST['session_sessiontimeout'])
&& $_POST['session_sessiontimeout'] <= 60 && $_POST['session_sessiontimeout'] < 60
) { ) {
standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']); standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
} }

30
index.php
View File

@@ -206,15 +206,29 @@ if ($action == 'login') {
); );
} }
Database::pexecute($stmt, $params); Database::pexecute($stmt, $params);
$qryparams = array();
if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
parse_str(urldecode($_POST['qrystr']), $qryparams);
}
$qryparams['s'] = $s;
if ($userinfo['adminsession'] == '1') { if ($userinfo['adminsession'] == '1') {
if (hasUpdates($version)) { if (hasUpdates($version)) {
redirectTo('admin_updates.php', array('s' => $s), true); redirectTo('admin_updates.php', array('s' => $s), true);
} else { } else {
redirectTo('admin_index.php', array('s' => $s), true); if (isset($_POST['script']) && $_POST['script'] != "") {
redirectTo($_POST['script'], $qryparams, true);
} else {
redirectTo('admin_index.php', $qryparams, true);
}
} }
} else { } else {
redirectTo('customer_index.php', array('s' => $s), true); if (isset($_POST['script']) && $_POST['script'] != "") {
redirectTo($_POST['script'], $qryparams, true);
} else {
redirectTo('customer_index.php', $qryparams, true);
}
} }
} else { } else {
redirectTo('index.php', array('showmessage' => '2'), true); redirectTo('index.php', array('showmessage' => '2'), true);
@@ -261,6 +275,16 @@ if ($action == 'login') {
if (hasUpdates($version)) { if (hasUpdates($version)) {
$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin']; $update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
} }
// Pass the last used page if needed
$lastscript = "";
if (isset($_REQUEST['script']) && $_REQUEST['script'] != "") {
$lastscript = $_REQUEST['script'];
}
$lastqrystr = "";
if (isset($_REQUEST['qrystr']) && $_REQUEST['qrystr'] != "") {
$lastqrystr = $_REQUEST['qrystr'];
}
eval("echo \"" . getTemplate('login') . "\";"); eval("echo \"" . getTemplate('login') . "\";");
} }

6
lib/init.php
View File

@@ -367,7 +367,11 @@ if (file_exists($hl_path.'/logo_custom.png')) {
*/ */
if ($nosession == 1 && AREA != 'login') { if ($nosession == 1 && AREA != 'login') {
unset($userinfo); unset($userinfo);
redirectTo('index.php'); $params = array(
"script" => basename($_SERVER["SCRIPT_NAME"]),
"qrystr" => $_SERVER["QUERY_STRING"]
);
redirectTo('index.php', $params);
exit; exit;
} }

2
templates/Sparkle/login/login.tpl vendored
View File

@@ -26,6 +26,8 @@ $header
<section class="loginsec"> <section class="loginsec">
<form method="post" action="$filename" enctype="application/x-www-form-urlencoded"> <form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="script" value="{$lastscript}" />
<input type="hidden" name="qrystr" value="{$lastqrystr}" />
<fieldset> <fieldset>
<legend>Froxlor&nbsp;-&nbsp;Login</legend> <legend>Froxlor&nbsp;-&nbsp;Login</legend>
<p> <p>