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

Small improvements

Browse source
This commit is contained in:
RainLoop Team 2014-02-09 21:09:10 +04:00
parent 012bea8938
commit 17f6204d2a
14 changed files with 137 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,11 +71,6 @@ class Actions
*/
private $oSettingsProvider;
/**
* @var \RainLoop\Providers\Login
*/
private $oLoginProvider;
/**
* @var \RainLoop\Providers\PersonalAddressBook
*/
@ -120,7 +115,6 @@ class Actions
$this->oFilesProvider = null;
$this->oSettingsProvider = null;
$this->oDomainProvider = null;
$this->oLoginProvider = null;
$this->oPersonalAddressBookProvider = null;
$this->oSuggestionsProvider = null;
$this->oChangePasswordProvider = null;
@ -224,7 +218,8 @@ class Actions
case 'domain':
// \RainLoop\Providers\Domain\DomainSimpleInterface
// \RainLoop\Providers\Domain\DomainAdminInterface
$oResult = new \RainLoop\Providers\Domain\DefaultDomain(APP_PRIVATE_DATA.'domains');
$oResult = new \RainLoop\Providers\Domain\DefaultDomain(APP_PRIVATE_DATA.'domains',
$this->Cacher());
break;
case 'personal-address-book':
// \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface
@ -577,20 +572,6 @@ class Actions
return $this->oPersonalAddressBookProvider;
}
/**
* @return \RainLoop\Providers\Login
*/
public function LoginProvider()
{
if (null === $this->oLoginProvider)
{
$this->oLoginProvider = new \RainLoop\Providers\Login(
$this->fabrica('login'), $this->DomainProvider());
}
return $this->oLoginProvider;
}
/**
* @return \OAuth2\Client|null
*/
@ -805,6 +786,29 @@ class Actions
return $bResult;
}
/**
* @param string $sEmail
* @param string $sLogin
* @param string $sPassword
* @param bool $sSignMeToken = ''
*
* @return \RainLoop\Account|null
*/
public function LoginProvide($sEmail, $sLogin, $sPassword, $sSignMeToken = '')
{
$oResult = null;
if (0 < \strlen($sEmail) && 0 < \strlen($sLogin) && 0 < \strlen($sPassword))
{
$oDomain = $this->DomainProvider()->Load(\MailSo\Base\Utils::GetDomainFromEmail($sEmail), true);
if ($oDomain instanceof \RainLoop\Domain && !$oDomain->Disabled() && $oDomain->ValidateWhiteList($sEmail, $sLogin))
{
$oResult = \RainLoop\Account::NewInstance($sEmail, $sLogin, $sPassword, $oDomain, $sSignMeToken);
}
}
return $oResult;
}
/**
* @param string $sToken
@ -823,8 +827,8 @@ class Actions
if (!empty($aAccountHash[0]) && 'token' === $aAccountHash[0] && 8 === \count($aAccountHash) && !empty($aAccountHash[7]) &&
(!$bValidateShortToken || \RainLoop\Utils::GetShortToken() === $aAccountHash[7]))
{
$oAccount = $this->LoginProvider()->Provide(
$aAccountHash[1], $aAccountHash[2], $aAccountHash[3], empty($aAccountHash[5]) ? '' : $aAccountHash[5]);
$oAccount = $this->LoginProvide($aAccountHash[1], $aAccountHash[2], $aAccountHash[3],
empty($aAccountHash[5]) ? '' : $aAccountHash[5]);
if ($oAccount instanceof \RainLoop\Account)
{
@ -1301,7 +1305,7 @@ class Actions
$this->Plugins()->RunHook('filter.login-credentials', array(&$sEmail, &$sLogin, &$sPassword));
$oAccount = $this->LoginProvider()->Provide($sEmail, $sLogin, $sPassword, $sSignMeToken);
$oAccount = $this->LoginProvide($sEmail, $sLogin, $sPassword, $sSignMeToken);
if (!($oAccount instanceof \RainLoop\Account))
{
$this->loginErrorDelay();