mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Changed URL format for password sent confirmation display, to avoid issues with new request handling trying to detect the email-TLD as a pseudo-file-extension (which resulted in truncated email-addresses in display). Old: /Security/passwordsent/myemailaddress. New: Security/passwordsent/?email=myemailaddress
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62701 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
b87bdee3ee
commit
28699c3550
@ -187,7 +187,7 @@ class MemberLoginForm extends LoginForm {
|
|||||||
$member->sendInfo('forgotPassword', array('PasswordResetLink' =>
|
$member->sendInfo('forgotPassword', array('PasswordResetLink' =>
|
||||||
Security::getPasswordResetLink($member->AutoLoginHash)));
|
Security::getPasswordResetLink($member->AutoLoginHash)));
|
||||||
|
|
||||||
Director::redirect('Security/passwordsent/' . urlencode($data['Email']));
|
Director::redirect('Security/passwordsent/?email=' . urlencode($data['Email']));
|
||||||
|
|
||||||
} else if($data['Email']) {
|
} else if($data['Email']) {
|
||||||
$this->sessionMessage(
|
$this->sessionMessage(
|
||||||
|
@ -410,7 +410,7 @@ class Security extends Controller {
|
|||||||
*
|
*
|
||||||
* @return string Returns the "password sent" page as HTML code.
|
* @return string Returns the "password sent" page as HTML code.
|
||||||
*/
|
*/
|
||||||
public function passwordsent() {
|
public function passwordsent($request) {
|
||||||
Requirements::javascript('jsparty/behaviour.js');
|
Requirements::javascript('jsparty/behaviour.js');
|
||||||
Requirements::javascript('jsparty/loader.js');
|
Requirements::javascript('jsparty/loader.js');
|
||||||
Requirements::javascript('jsparty/prototype.js');
|
Requirements::javascript('jsparty/prototype.js');
|
||||||
@ -423,7 +423,7 @@ class Security extends Controller {
|
|||||||
$controller = new Page_Controller($tmpPage);
|
$controller = new Page_Controller($tmpPage);
|
||||||
$controller->init();
|
$controller->init();
|
||||||
|
|
||||||
$email = Convert::raw2xml($this->urlParams['ID']);
|
$email = Convert::raw2xml($request->getVar('email'));
|
||||||
$customisedController = $controller->customise(array(
|
$customisedController = $controller->customise(array(
|
||||||
'Title' => sprintf(_t('Security.PASSWORDSENTHEADER', "Password reset link sent to '%s'"), $email),
|
'Title' => sprintf(_t('Security.PASSWORDSENTHEADER', "Password reset link sent to '%s'"), $email),
|
||||||
'Content' =>
|
'Content' =>
|
||||||
|
Loading…
Reference in New Issue
Block a user