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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2015-02-22 22:25:34 +04:00
parent 8be7e720f3
commit 13d4c769e2
5 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,6 +1013,9 @@ class Actions
$sRand = \MailSo\Base\Utils::Md5Rand();
if (!$this->Cacher()->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time()))
{
$this->oLogger->Write('Cannot store an admin token',
\MailSo\Log\Enumerations\Type::WARNING);
$sRand = '';
}
@ -1037,12 +1040,9 @@ class Actions
{
$bResult = true;
}
else if ($bThrowExceptionOnFalse)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
}
else if ($bThrowExceptionOnFalse)
if (!$bResult && $bThrowExceptionOnFalse)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
@ -3264,9 +3264,10 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
$this->setAdminAuthToken($this->getAdminToken());
$sToken = $this->getAdminToken();
$this->setAdminAuthToken($sToken);
return $this->TrueResponse(__FUNCTION__);
return $this->DefaultResponse(__FUNCTION__, $sToken ? true : false);
}
/**
@ -3322,7 +3323,7 @@ class Actions
{
$sDomain = \strtolower(\trim($sDomain));
$sTempDomain = \preg_replace('/^(webmail|email|mail|www|ssl)\./', '', $sDomain);
$sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
if (false === \strpos($sTempDomain, '.'))
{
$sTempDomain = $sDomain;