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

Updated: ckeditor 4.5.3, jquery 1.11.3, openpgpjs 1.2.0

Browse source 
OpenPGP decrypt fix
+ Small fixes
This commit is contained in:
RainLoop Team 2015-09-17 22:48:52 +03:00
parent 4deb083d7d
commit 87887373c1
370 changed files with 10805 additions and 5637 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1131,6 +1131,18 @@ class Actions
return $this->oLoggerAuth;
}
/**
* @param \RainLoop\Model\Account $oAccount
*/
public function LoggerAuthHelper($oAccount = null)
{
$sLine = $this->Config()->Get('logs', 'auth_logging_format', '');
if (!empty($sLine))
{
$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount));
}
}
/**
* @return string
*/
@ -1978,12 +1990,7 @@ class Actions
{
if ($bAuthLog)
{
$sLine = $this->Config()->Get('logs', 'auth_logging_format', '');
if (!empty($sLine))
{
$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount),
\MailSo\Log\Enumerations\Type::WARNING, 'IMAP');
}
$this->LoggerAuthHelper($oAccount);
}
if ($this->Config()->Get('labs', 'imap_show_login_alert', true))
@ -2109,6 +2116,8 @@ class Actions
$this->Plugins()->RunHook('event.login-pre-login-provide', array());
$oAccount = null;
try
{
$oAccount = $this->LoginProvide($sEmail, $sLogin, $sPassword, $sSignMeToken, true);
@ -2129,6 +2138,8 @@ class Actions
{
$this->loginErrorDelay();
$this->LoggerAuthHelper($oAccount);
throw $oException;
}
@ -2148,6 +2159,8 @@ class Actions
{
$this->Logger()->Write('TFA: Required Code for '.$oAccount->ParentEmailHelper().' account.');
$this->LoggerAuthHelper($oAccount);
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthRequired);
}
else
@ -2176,6 +2189,8 @@ class Actions
{
$this->loginErrorDelay();
$this->LoggerAuthHelper($oAccount);
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountTwoFactorAuthError);
}
}
@ -9577,8 +9592,9 @@ class Actions
};
}
// $this->Logger()->Write('---');
// $this->Logger()->Write($sHtml);
$sHtml = \preg_replace_callback('/<pre[^>]*>([\s\S\r\n\t]*)<\/pre>/mi', function ($aMatches) {
return \preg_replace('/[\r\n]+/', '<br />', $aMatches[0]);
}, $sHtml);
$mResult['Html'] = 0 === \strlen($sHtml) ? '' : \MailSo\Base\HtmlUtils::ClearHtml(
$sHtml, $bHasExternals, $mFoundedCIDs, $aContentLocationUrls, $mFoundedContentLocationUrls, false, false,