Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 10:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo

Browse source
This commit is contained in:
RainLoop Team 2016-12-31 20:03:41 +03:00
parent 086cf7cadc
commit be26cd248c
35 changed files with 825 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2137,12 +2137,13 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
* @param string $sSignMeToken = ''
* @param string $sAdditionalCode = ''
* @param string $bAdditionalCodeSignMe = false
* @param string $bSkipTwoFactorAuth = false
*
* @return \RainLoop\Model\Account
* @throws \RainLoop\Exceptions\ClientException
*/
public function LoginProcess(&$sEmail, &$sPassword, $sSignMeToken = '',
$sAdditionalCode = '', $bAdditionalCodeSignMe = false)
$sAdditionalCode = '', $bAdditionalCodeSignMe = false, $bSkipTwoFactorAuth = false)
{
$sInputEmail = $sEmail;
@ -2265,8 +2266,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
throw $oException;
}
// Two factor auth
if ($this->TwoFactorAuthProvider()->IsActive())
// 2FA
if (!$bSkipTwoFactorAuth && $this->TwoFactorAuthProvider()->IsActive())
{
$aData = $this->getTwoFactorInfo($oAccount);
if ($aData && isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable'])
@ -2852,7 +2853,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountDoesNotExist);
}
$oNewAccount = $this->LoginProcess($sEmail, $sPassword);
$oNewAccount = $this->LoginProcess($sEmail, $sPassword, '', '', false, true);
$oNewAccount->SetParentEmail($sParentEmail);
$aAccounts[$oNewAccount->Email()] = $oNewAccount->GetAuthToken();

1612
rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
View file

File diff suppressed because it is too large Load diff