mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Preserve BackURL get-variable on failed log-ins
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65473 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
304dea39d9
commit
5f0f9c4801
@ -109,17 +109,19 @@ class MemberLoginForm extends LoginForm {
|
|||||||
} else {
|
} else {
|
||||||
Session::set('SessionForms.MemberLoginForm.Email', $data['Email']);
|
Session::set('SessionForms.MemberLoginForm.Email', $data['Email']);
|
||||||
Session::set('SessionForms.MemberLoginForm.Remember', isset($data['Remember']));
|
Session::set('SessionForms.MemberLoginForm.Remember', isset($data['Remember']));
|
||||||
|
|
||||||
if(isset($_REQUEST['BackURL']) && $backURL = $_REQUEST['BackURL']) {
|
if(isset($_REQUEST['BackURL'])) $backURL = $_REQUEST['BackURL'];
|
||||||
Session::set('BackURL', $backURL);
|
else $backURL = null;
|
||||||
}
|
|
||||||
|
if($backURL) Session::set('BackURL', $backURL);
|
||||||
|
|
||||||
if($badLoginURL = Session::get("BadLoginURL")) {
|
if($badLoginURL = Session::get("BadLoginURL")) {
|
||||||
Director::redirect($badLoginURL);
|
Director::redirect($badLoginURL);
|
||||||
} else {
|
} else {
|
||||||
// Show the right tab on failed login
|
// Show the right tab on failed login
|
||||||
Director::redirect(Director::absoluteURL(Security::Link("login")) .
|
$loginLink = Director::absoluteURL(Security::Link("login"));
|
||||||
'#' . $this->FormName() .'_tab');
|
if($backURL) $loginLink .= '?BackURL=' . urlencode($backURL);
|
||||||
|
Director::redirect($loginLink . '#' . $this->FormName() .'_tab');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user