Project

General

Profile

Bug #23134 » 15051_v2.patch

Administrator Admin, 2011-03-27 22:40

View differences:

typo3/sysext/felogin/pi1/locallang.xml (revision )
<label index="ll_forgot_validate_reset_password">Your new password
Dear %s,
This email was sent in response to your request to reset your password. Please click on the link below.
This email was sent in response to your request to reset your password. Please click on the link below.
%s
For security reasons, this link is only active until %s. If you do not visit the link before then, you will need to repeat the password reset steps.
</label>
<label index="ll_forgot_message">Please enter the email address by which you registered your user account. Then press &quot;Send password&quot; and your password will immediately be emailed to you. Make sure to spell your email address correctly.</label>
<label index="ll_forgot_message_emailSent">Your password has now been sent to the email address %s</label>
<label index="ll_forgot_reset_message">Please enter your username or email address. Instructions for resetting the password will be immediately emailed to you.</label>
<label index="ll_forgot_message">Please enter your username or email address. Instructions for resetting the password will be immediately emailed to you.</label>
<label index="ll_forgot_reset_message_emailSent">An email has been sent to the address stored in your account and contains a link to reset your password. If you do not receive an email, your account or email address was not found.</label>
<label index="ll_forgot_header_backToLogin">Return to login form</label>
<label index="ll_enter_your_data">Username or email address:</label>
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (revision )
if ($error) {
$markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap($error, $this->conf['forgotMessage_stdWrap.']);
} else {
$markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap($this->pi_getLL('ll_forgot_reset_message_emailSent', '', 1), $this->conf['forgotMessage_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap($this->pi_getLL('ll_forgot_message_emailSent', '', 1), $this->conf['forgotMessage_stdWrap.']);
}
$subpartArray['###FORGOT_FORM###'] = '';
} else {
//wrong email
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('forgot_reset_message', $this->conf['forgotMessage_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('forgot_message', $this->conf['forgotMessage_stdWrap.']);
$markerArray['###BACKLINK_LOGIN###'] = '';
}
} else {
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('forgot_reset_message', $this->conf['forgotMessage_stdWrap.']);
$markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('forgot_message', $this->conf['forgotMessage_stdWrap.']);
$markerArray['###BACKLINK_LOGIN###'] = '';
}
(2-2/3)