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

Filters / Interface (part 2)

Browse source
This commit is contained in:
RainLoop Team 2014-06-18 00:57:38 +04:00
parent 333c063cf1
commit b1327c933b
20 changed files with 456 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -202,23 +202,9 @@ abstract class NetClient
if (!\is_resource($this->rConnect))
{
if (!empty($sErrorStr) && !\MailSo\Base\Utils::IsUtf8($sErrorStr))
{
$sCharset = \MailSo\Base\Utils::DetectSystemCharset();
if (!empty($sCharset))
{
$sErrorStr = \MailSo\Base\Utils::ConvertEncoding(
$sErrorStr, $sCharset, \MailSo\Base\Enumerations\Charset::UTF_8);
}
else
{
$sErrorStr = @\utf8_encode($sErrorStr);
}
}
$this->writeLogException(
new Exceptions\SocketCanNotConnectToHostException(
$sErrorStr, $iErrorNo,
\MailSo\Base\Utils::ConvertSystemString($sErrorStr), (int) $iErrorNo,
'Can\'t connect to host "'.$this->sConnectedHost.':'.$this->iConnectedPort.'"'
), \MailSo\Log\Enumerations\Type::NOTICE, true);
}
@ -232,7 +218,7 @@ abstract class NetClient
{
@\stream_set_timeout($this->rConnect, $this->iSocketTimeOut);
}
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('stream_set_blocking'))
{
@\stream_set_blocking($this->rConnect, 1);