Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2015-05-05 20:41:15 +04:00
parent 3246b2c81f
commit 66c3307291
14 changed files with 105 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -4811,12 +4811,14 @@ class Actions
*/
public function DoChangePassword()
{
$mResult = false;
$oAccount = $this->getAccountFromToken();
if ($oAccount)
{
try
{
$this->ChangePasswordProvider()->ChangePassword(
$mResult = $this->ChangePasswordProvider()->ChangePassword(
$oAccount,
$this->GetActionParam('PrevPassword', ''),
$this->GetActionParam('NewPassword', '')
@ -4831,7 +4833,7 @@ class Actions
}
}
return $this->TrueResponse(__FUNCTION__);
return $this->DefaultResponse(__FUNCTION__, $mResult);
}
/**

6
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/ChangePassword.php
View file

@ -53,6 +53,8 @@ class ChangePassword extends \RainLoop\Providers\AbstractProvider
*/
public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
{
$mResult = false;
if ($this->oDriver instanceof \RainLoop\Providers\ChangePassword\ChangePasswordInterface &&
$this->PasswordChangePossibility($oAccount))
{
@ -79,11 +81,15 @@ class ChangePassword extends \RainLoop\Providers\AbstractProvider
$oAccount->SetPassword($sNewPassword);
$this->oActions->SetAuthToken($oAccount);
$mResult = $this->oActions->GetSpecAuthToken();
}
else
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CouldNotSaveNewPassword);
}
return $mResult;
}
/**

2
rainloop/v/0.0.0/langs/admin/de.ini
View file

@ -130,7 +130,7 @@ LABEL_ENABLE_TWITTER = "Twitter-Integration aktivieren (Autorisierung)"
LABEL_TWITTER_CONSUMER_KEY = "Consumer-Schlüssel"
LABEL_TWITTER_CONSUMER_SECRET = "Consumer-Geheimnis"
LEGEND_DROPBOX = "Dropbox"
LABEL_ENABLE_DROPBOX = "Dropbox-Integration aktivieren (Erstellen-Ansicht)"
LABEL_ENABLE_DROPBOX = "Dropbox-Integration aktivieren"
LABEL_DROPBOX_API_KEY = "API-Schlüssel"
TOP_ALERT = "Detaillierte Informationen zur Integration von Social-Diensten finden Sie unter"

2
rainloop/v/0.0.0/langs/admin/en.ini
View file

@ -131,7 +131,7 @@ LABEL_ENABLE_TWITTER = "Enable Twitter Integration (Authorization)"
LABEL_TWITTER_CONSUMER_KEY = "Consumer Key"
LABEL_TWITTER_CONSUMER_SECRET = "Consumer Secret"
LEGEND_DROPBOX = "Dropbox"
LABEL_ENABLE_DROPBOX = "Enable Dropbox Integration (Compose view)"
LABEL_ENABLE_DROPBOX = "Enable Dropbox Integration"
LABEL_DROPBOX_API_KEY = "Api Key"
TOP_ALERT = "Detailed information on social integration is found at"

2
rainloop/v/0.0.0/langs/admin/pt-br.ini
View file

@ -131,7 +131,7 @@ LABEL_ENABLE_TWITTER = "Habilitar integração com o Twitter (Autenticação)"
LABEL_TWITTER_CONSUMER_KEY = "Consumer Key"
LABEL_TWITTER_CONSUMER_SECRET = "Consumer Secret"
LEGEND_DROPBOX = "Dropbox"
LABEL_ENABLE_DROPBOX = "Habilitar integração com o Dropbox (Anexos)"
LABEL_ENABLE_DROPBOX = "Habilitar integração com o Dropbox"
LABEL_DROPBOX_API_KEY = "Api Key"
TOP_ALERT = "Informações detalhadas sobre as integrações em"

2
rainloop/v/0.0.0/langs/admin/ru.ini
View file

@ -130,7 +130,7 @@ LABEL_ENABLE_TWITTER = "Включить Twitter интеграцию (Авто
LABEL_TWITTER_CONSUMER_KEY = "Consumer Key"
LABEL_TWITTER_CONSUMER_SECRET = "Consumer Secret"
LEGEND_DROPBOX = "Dropbox"
LABEL_ENABLE_DROPBOX = "Включить Dropbox интеграцию (Экран нового сообщения)"
LABEL_ENABLE_DROPBOX = "Включить Dropbox интеграцию"
LABEL_DROPBOX_API_KEY = "Api Key"
TOP_ALERT = "Подробная информация о социальной интеграции находится на"