Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 23:17:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "write_on_php_error_only" setting

Browse source
This commit is contained in:
RainLoop Team 2014-09-03 23:53:24 +04:00
parent 9bf5847983
commit 9bde3fe5dd
7 changed files with 125 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,8 @@ class Actions
$oConfig = $this->Config();
$this->Plugins()->RunHook('filter.application-config', array(&$oConfig));
$this->Logger()->Ping();
}
/**
@ -726,8 +728,9 @@ class Actions
$this->oLogger->Add(
\MailSo\Log\Drivers\File::NewInstance($sLogFileFullPath)
->WriteOnErrorOnly($this->Config()->Get('logs', 'write_on_error_only', true))
->WriteOnTimeoutOnly($this->Config()->Get('logs', 'write_on_timeout_only', 30))
->WriteOnErrorOnly($this->Config()->Get('logs', 'write_on_error_only', false))
->WriteOnPhpErrorOnly($this->Config()->Get('logs', 'write_on_php_error_only', false))
->WriteOnTimeoutOnly($this->Config()->Get('logs', 'write_on_timeout_only', 0))
);
if (!$this->Config()->Get('debug', 'enable', false))
@ -1555,7 +1558,7 @@ class Actions
include_once 'Crypt/RSA.php';
}
\RainLoop\Service::$__HIDE_ERROR_NOTICES = true;
$oLogger->HideErrorNotices(true);
$oRsa = new \Crypt_RSA();
$oRsa->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
@ -1575,7 +1578,7 @@ class Actions
$oLogger->Write('Invalid decrypted data', \MailSo\Log\Enumerations\Type::WARNING, 'RSA');
}
\RainLoop\Service::$__HIDE_ERROR_NOTICES = false;
$oLogger->HideErrorNotices(false);
}
else
{
@ -1591,9 +1594,11 @@ class Actions
*/
public function DoGetPublicKey()
{
$oLogger = $this->Logger();
if ($this->Config()->Get('security', 'use_rsa_encryption', false))
{
\RainLoop\Service::$__HIDE_ERROR_NOTICES = true;
$oLogger->HideErrorNotices(true);
if (!\class_exists('Crypt_RSA'))
{
@ -1613,14 +1618,14 @@ class Actions
$sHash = \md5($e->toHex().$n->toHex());
\RainLoop\Service::$__HIDE_ERROR_NOTICES = false;
$oLogger->HideErrorNotices(false);
return $this->DefaultResponse(__FUNCTION__,
$this->Cacher()->Set(\RainLoop\KeyPathHelper::RsaCacherKey($sHash), $aKeys['privatekey']) ?
array($sHash, $e->toHex(), $n->toHex()) : false);
}
}
\RainLoop\Service::$__HIDE_ERROR_NOTICES = false;
$oLogger->HideErrorNotices(false);
return $this->FalseResponse(__FUNCTION__);
}
@ -6476,7 +6481,7 @@ class Actions
{
return $this->rawSmart(false);
}
/**
* @return bool
*/
@ -6495,7 +6500,7 @@ class Actions
$iCode = 0;
$sContentType = '';
$sData = $this->Http()->GetUrlAsString('http://gravatar.com/avatar/'.\md5($sEmail).'.jpg?s=80&d=404',
null, $sContentType, $iCode, $this->Logger(), 5,
$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''));
@ -6524,7 +6529,7 @@ class Actions
$sContentType = 'image/png';
$sData = \file_get_contents(APP_VERSION_ROOT_PATH.'app/resources/images/empty-contact.png');
}
$this->cacheByKey($sRawKey);
\header('Content-Type: '.$sContentType);
echo $sData;

3
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -140,7 +140,8 @@ Values:
'enable' => array(false, 'Enable logging'),
'write_on_error_only' => array(false, 'Logs entire request only if error occured'),
'write_on_error_only' => array(false, 'Logs entire request only if error occured (php requred)'),
'write_on_php_error_only' => array(false, 'Logs entire request only if php error occured'),
'write_on_timeout_only' => array(0, 'Logs entire request only if request timeout (in seconds) occured.'),
'hide_passwords' => array(true, 'Required for development purposes only.

34
rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -4,11 +4,6 @@ namespace RainLoop;
class Service
{
/**
* @var bool
*/
static $__HIDE_ERROR_NOTICES = false;
/**
* @var \MailSo\Base\Http
*/
@ -32,8 +27,6 @@ class Service
$this->oHttp = \MailSo\Base\Http::SingletonInstance();
$this->oActions = \RainLoop\Api::Actions();
\set_error_handler(array(&$this, 'LogPhpErrorHandler'));
$this->oServiceActions = new \RainLoop\ServiceActions($this->oHttp, $this->oActions);
if ($this->oActions->Config()->Get('debug', 'enable', false))
@ -65,33 +58,6 @@ class Service
return new self();
}
/**
* @param int $iErrNo
* @param string $sErrStr
* @param string $sErrFile
* @param int $iErrLine
*
* @return bool
*/
public function LogPhpErrorHandler($iErrNo, $sErrStr, $sErrFile, $iErrLine)
{
$iType = \MailSo\Log\Enumerations\Type::NOTICE;
switch ($iErrNo)
{
case E_USER_ERROR:
$iType = \MailSo\Log\Enumerations\Type::ERROR;
break;
case E_USER_WARNING:
$iType = \MailSo\Log\Enumerations\Type::WARNING;
break;
}
$this->oActions->Logger()->Write($sErrFile.' [line:'.$iErrLine.', code:'.$iErrNo.']', $iType, 'PHP');
$this->oActions->Logger()->Write('Error: '.$sErrStr, $iType, 'PHP');
return !!(\MailSo\Log\Enumerations\Type::NOTICE === $iType && \RainLoop\Service::$__HIDE_ERROR_NOTICES);
}
/**
* @return \RainLoop\Service
*/