Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 17:07: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

2
rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -1594,7 +1594,7 @@ class ImapClient extends \MailSo\Net\NetClient
$aResult = $aParams;
if (\is_array($aResult) && 2 === count($aResult))
{
$aResult[1] = '"*******"';
$aResult[1] = '"********"';
}
break;
}

31
rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
View file

@ -23,6 +23,11 @@ class Logger extends \MailSo\Base\Collection
*/
private $aSecretWords;
/**
* @var bool
*/
private $bShowSecter;
/**
* @access protected
*/
@ -33,6 +38,7 @@ class Logger extends \MailSo\Base\Collection
$this->bUsed = false;
$this->aForbiddenTypes = array();
$this->aSecretWords = array();
$this->bShowSecter = false;
\register_shutdown_function(array(&$this, '__loggerShutDown'));
}
@ -87,6 +93,7 @@ class Logger extends \MailSo\Base\Collection
/**
* @param string $sWord
*
* @return bool
*/
public function AddSecret($sWord)
@ -94,10 +101,30 @@ class Logger extends \MailSo\Base\Collection
if (0 < \strlen(\trim($sWord)))
{
$this->aSecretWords[] = $sWord;
$this->aSecretWords = array_unique($this->aSecretWords);
$this->aSecretWords = \array_unique($this->aSecretWords);
}
}
/**
* @param bool $bShow
*
* @return \MailSo\Log\Logger
*/
public function SetShowSecter($bShow)
{
$this->bShowSecter = !!$bShow;
return $this;
}
/**
* @return bool
*/
public function IsShowSecter()
{
return $this->bShowSecter;
}
/**
* @param int $iType
*
@ -176,7 +203,7 @@ class Logger extends \MailSo\Base\Collection
$aLoggers = array();
$iResult = 1;
if ($bSearchWords && 0 < \count($this->aSecretWords))
if ($bSearchWords && !$this->bShowSecter && 0 < \count($this->aSecretWords))
{
$sDesc = \str_replace($this->aSecretWords, '*******', $sDesc);
}

6
rainloop/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
View file

@ -334,6 +334,12 @@ abstract class NetClient
$bFake = 0 < \strlen($sFakeRaw);
$sRaw .= "\r\n";
if ($this->oLogger && $this->oLogger->IsShowSecter())
{
$bFake = false;
}
if ($bFake)
{
$sFakeRaw .= "\r\n";

2
rainloop/v/0.0.0/app/libraries/MailSo/Pop3/Pop3Client.php
View file

@ -256,7 +256,7 @@ class Pop3Client extends \MailSo\Net\NetClient
switch ($sCommand)
{
case 'PASS':
$sResult = '*******';
$sResult = '********';
break;
}
}

2
rainloop/v/0.0.0/app/libraries/MailSo/Poppassd/PoppassdClient.php
View file

@ -155,7 +155,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
{
case 'pass':
case 'newpass':
$sResult = '*******';
$sResult = '********';
break;
}
}

2
rainloop/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -570,7 +570,7 @@ class SmtpClient extends \MailSo\Net\NetClient
$sCommand = \trim($sCommand);
$sRealCommand = $sCommand.(0 === \strlen($sAddToCommand) ? '' : ' '.$sAddToCommand);
$sFakeCommand = ($bSecureLog) ? '**********' : '';
$sFakeCommand = ($bSecureLog) ? '********' : '';
$this->iRequestTime = \microtime(true);
$this->sendRaw($sRealCommand, true, $sFakeCommand);