Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #552

Browse source
This commit is contained in:
the-djmaze 2022-10-14 19:46:24 +02:00
parent 258afdd26e
commit 187dfcd126
4 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -164,6 +164,18 @@ class Actions
$this->oLogger->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME); $this->oLogger->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME);
} }
$level = \max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING)) - 3;
$mailso = [
\MailSo\Log\Enumerations\Type::ERROR,
\MailSo\Log\Enumerations\Type::WARNING,
\MailSo\Log\Enumerations\Type::NOTICE,
\MailSo\Log\Enumerations\Type::INFO,
\MailSo\Log\Enumerations\Type::DEBUG
];
while (4 > $level++) {
$this->oLogger->AddForbiddenType($mailso[$level]);
}
$this->oLogger->WriteEmptyLine(); $this->oLogger->WriteEmptyLine();
$oHttp = $this->Http(); $oHttp = $this->Http();

10
snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -30,13 +30,17 @@ abstract class Api
public static function Config() : Config\Application public static function Config() : Config\Application
{ {
static $oConfig = null; static $oConfig = null;
if (!$oConfig) if (!$oConfig) {
{
$oConfig = new Config\Application(); $oConfig = new Config\Application();
if (!$oConfig->Load()) { if (!$oConfig->Load()) {
usleep(10000); \usleep(10000);
$oConfig->Load(); $oConfig->Load();
} }
if ($oConfig->Get('debug', 'enable', false)) {
\error_reporting(E_ALL);
\ini_set('display_errors', 1);
\ini_set('log_errors', 1);
}
} }
return $oConfig; return $oConfig;
} }

7
snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -22,13 +22,6 @@ abstract class Service
{ {
$oConfig = Api::Config(); $oConfig = Api::Config();
if ($oConfig->Get('debug', 'enable', false))
{
\error_reporting(E_ALL);
\ini_set('display_errors', 1);
\ini_set('log_errors', 1);
}
$sServer = \trim($oConfig->Get('security', 'custom_server_signature', '')); $sServer = \trim($oConfig->Get('security', 'custom_server_signature', ''));
if (\strlen($sServer)) if (\strlen($sServer))
{ {

8
snappymail/v/0.0.0/app/libraries/snappymail/log.php
View file

@ -66,11 +66,13 @@ abstract class Log
\closelog(); \closelog();
} }
*/ */
} if (\filter_var(\ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN)
if (($level < \LOG_WARNING && \error_reporting() & \E_ERROR) && (($level < \LOG_WARNING && \error_reporting() & \E_ERROR)
|| ($level == \LOG_WARNING && \error_reporting() & \E_WARNING) || ($level == \LOG_WARNING && \error_reporting() & \E_WARNING)
|| ($level > \LOG_WARNING && \error_reporting() & \E_NOTICE)) { || ($level > \LOG_WARNING && \error_reporting() & \E_NOTICE)
)) {
\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg); \error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg);
} }
} }
} }
}