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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2014-07-23 19:05:16 +04:00
parent b68a56cf6b
commit 5a762f5066
8 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,7 +336,7 @@ class Actions
if (false !== \strpos($sFileName, '{user:uid}'))
{
$sFileName = \str_replace('{user:uid}',
\base_convert(\sprintf('%u', \crc32(md5(\RainLoop\Utils::GetConnectionToken()))), 10, 32),
\base_convert(\sprintf('%u', \crc32(\md5(\RainLoop\Utils::GetConnectionToken()))), 10, 32),
$sFileName
);
}
@ -345,19 +345,22 @@ class Actions
{
$sFileName = \str_replace('{user:ip}', $this->Http()->GetClientIp(), $sFileName);
}
$this->ParseQueryAuthString();
$oAccount = $this->getAccountFromToken(false);
if ($oAccount)
if (\preg_match('/\{user:(email|login|domain)\}/i', $sFileName))
{
$sEmail = $oAccount->Email();
$sFileName = \str_replace('{user:email}', $sEmail, $sFileName);
$sFileName = \str_replace('{user:login}', \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $sFileName);
$sFileName = \str_replace('{user:domain}', \MailSo\Base\Utils::GetDomainFromEmail($sEmail), $sFileName);
$this->ParseQueryAuthString();
$oAccount = $this->getAccountFromToken(false);
if ($oAccount)
{
$sEmail = $oAccount->Email();
$sFileName = \str_replace('{user:email}', $sEmail, $sFileName);
$sFileName = \str_replace('{user:login}', \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $sFileName);
$sFileName = \str_replace('{user:domain}', \MailSo\Base\Utils::GetDomainFromEmail($sEmail), $sFileName);
}
}
$sFileName = \preg_replace('/\{user:([^}]*)\}/', 'unknown', $sFileName);
$sFileName = \preg_replace('/\{user:([^}]*)\}/i', 'unknown', $sFileName);
}
if (false !== \strpos($sFileName, '{labs:'))
@ -369,7 +372,7 @@ class Actions
$sFileName = \preg_replace('/\{labs:([^}]*)\}/', 'labs', $sFileName);
}
if (0 === strlen($sFileName))
if (0 === \strlen($sFileName))
{
$sFileName = 'rainloop-log.txt';
}
@ -794,6 +797,8 @@ class Actions
if (!!$this->Config()->Get('logs', 'enable', true))
{
$this->oLogger->SetShowSecter(!$this->Config()->Get('logs', 'hide_passwords', true));
$sLogFileFullPath = \APP_PRIVATE_DATA.'logs/'.$this->compileLogFileName();
$sLogFileDir = \dirname($sLogFileFullPath);

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

@ -140,6 +140,9 @@ Values:
'write_on_error_only' => array(false, 'Logs entire request only if 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.
Disabling this option is not recommended.'),
'filename' => array('log-{date:Y-m-d}.txt',
'Log filename.
@ -151,9 +154,9 @@ Patterns:
Detailed info: http://www.php.net/manual/en/function.date.php
{user:email} - Replaced by user\'s email address
If user is not logged in, value is set to "unknown"
{user:login} - Replaced by user\'s login
{user:login} - Replaced by user\'s login (the user part of an email)
If user is not logged in, value is set to "unknown"
{user:domain} - Replaced by user\'s domain name
{user:domain} - Replaced by user\'s domain name (the domain part of an email)
If user is not logged in, value is set to "unknown"
{user:uid} - Replaced by user\'s UID regardless of account currently used
{user:ip} - Replaced by user\'s IP address