Skip to content

Commit

Permalink
Fixed issue #10488: Missing translation
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Feb 16, 2016
1 parent a892532 commit a70ffe1
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions application/controllers/admin/authentication.php
Expand Up @@ -27,14 +27,6 @@
class Authentication extends Survey_Common_Action
{

/**
* Reused email message
*
* @var string
* @access private
*/
private $sent_email_message = 'If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you';

/**
* Show login screen and parse login data
*/
Expand Down Expand Up @@ -134,7 +126,7 @@ public function logout()
App()->getPluginManager()->dispatchEvent($beforeLogout);
// Expire the CSRF cookie
$cookie = new CHttpCookie('YII_CSRF_TOKEN', '');
$cookie->expire = time()-3600;
$cookie->expire = time()-3600;
Yii::app()->request->cookies['YII_CSRF_TOKEN'] = $cookie;
App()->user->logout();
App()->user->setFlash('loginmessage', gT('Logout successful.'));
Expand Down Expand Up @@ -170,7 +162,7 @@ public function forgotpassword()
if (count($aFields) < 1 || ($aFields[0]['uid'] != 1 && !Permission::model()->hasGlobalPermission('auth_db','read',$aFields[0]['uid'])))
{
// Wrong or unknown username and/or email. For security reasons, we don't show a fail message
$aData['message'] = '<br>'.gT($this->sent_email_message).'<br>';
$aData['message'] = '<br>'.gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you').'<br>';
}
else
{
Expand Down Expand Up @@ -209,7 +201,7 @@ private function _sendPasswordEmail($sEmailAddr, $aFields)
{
User::model()->updatePassword($aFields[0]['uid'], $sNewPass);
// For security reasons, we don't show a successful message
$sMessage = gT($this->sent_email_message);
$sMessage = gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you');
}
else
{
Expand Down

0 comments on commit a70ffe1

Please sign in to comment.