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

v2.35.4

Browse source
This commit is contained in:
the-djmaze 2024-03-16 01:00:09 +01:00
parent 5657af7238
commit 9427b36633
9 changed files with 71 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,7 @@ trait Contacts
if (!isset($aData['Mode'])) {
$aData['Mode'] = empty($aData['Enable']) ? 0 : 1;
}
// $oAccount = $this->getAccountFromToken();
$oMainAccount = $this->getMainAccountFromToken();
if ($aData['Password']) {
$aData['Password'] = \SnappyMail\Crypt::EncryptToJSON($aData['Password'], $oMainAccount->CryptKey());
@ -218,6 +219,7 @@ trait Contacts
protected function getContactsSyncData(\RainLoop\Model\Account $oAccount) : ?array
{
// $oAccount = $this->getAccountFromToken();
$sData = $this->StorageProvider()->Get($oAccount,
\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
'contacts_sync'

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

@ -37,28 +37,36 @@ abstract class Log
protected static function log(int $level, string $prefix, string $msg)
{
\RainLoop\Api::Logger()->Write($msg, $level, $prefix);
if (\RainLoop\Api::Logger()->IsEnabled()) {
\RainLoop\Api::Logger()->Write($msg, $level, $prefix);
} else {
/*
static $log_level;
// Default to level 4, 0 = LOG_EMERG, 7 = LOG_DEBUG
if (!$log_level) {
$log_level = \max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING));
}
if ($level <= $log_level) {
if (\RainLoop\Api::Config()->Get('logs', 'syslog') && \openlog('snappymail', \LOG_ODELAY, \LOG_USER)) {
\syslog($level, "{$prefix} {$msg}");
\closelog();
static $log_level;
// Default to level 4, 0 = LOG_EMERG, 7 = LOG_DEBUG
if (!$log_level) {
$log_level = \max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING));
}
if ($level <= $log_level) {
if (\RainLoop\Api::Config()->Get('logs', 'syslog') && \openlog('snappymail', \LOG_ODELAY, \LOG_USER)) {
\syslog($level, "{$prefix} {$msg}");
\closelog();
}
if (\filter_var(\ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN)
&& (($level < \LOG_WARNING && \error_reporting() & \E_ERROR)
|| ($level == \LOG_WARNING && \error_reporting() & \E_WARNING)
|| ($level > \LOG_WARNING && \error_reporting() & \E_NOTICE)
)) {
\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg);
// \error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg, 3, 'filename');
}
}
if (\filter_var(\ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN)
&& (($level < \LOG_WARNING && \error_reporting() & \E_ERROR)
|| ($level == \LOG_WARNING && \error_reporting() & \E_WARNING)
|| ($level > \LOG_WARNING && \error_reporting() & \E_NOTICE)
)) {
\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg);
// \error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg, 3, 'filename');
if (\class_exists('OC')) {
// \OCP\Log\logger('snappymail')->log(\intval($level), $msg);
\OCP\Log\logger('snappymail')->{static::$levels[$level]}($msg);
}
}
*/
}
}
}