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

Merge pull request #322 from WebsiteDeveloper/1585

Browse Source 
Correctly redirect when admin hits the timeout and is currently in a customer session, fixes #1585
This commit is contained in:
Michael Kaufmann
2016-02-23 17:05:29 +01:00
parent 802e12cf7b 6ddbb10b5a
commit 2e0cb5050f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@@ -226,7 +226,11 @@ if ($action == 'login') {
redirectTo('admin_updates.php', array('s' => $s)); redirectTo('admin_updates.php', array('s' => $s));
} else { } else {
if (isset($_POST['script']) && $_POST['script'] != "") { if (isset($_POST['script']) && $_POST['script'] != "") {
if (preg_match("/customer\_/", $_POST['script']) === 1) {
redirectTo('admin_customers.php', array("page" => "customers"));
} else {
redirectTo($_POST['script'], $qryparams); redirectTo($_POST['script'], $qryparams);
}
} else { } else {
redirectTo('admin_index.php', $qryparams); redirectTo('admin_index.php', $qryparams);
} }