Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-10-30 17:13:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed domain popup saving

Browse source
This commit is contained in:
RainLoop Team 2014-11-17 22:38:45 +04:00
parent cb50320db4
commit 2feee6d1dd
4 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -2989,32 +2989,44 @@ class Actions
$sImapErrorDesc = $oException->getMessage();
}
try
if ($oDomain->OutUsePhpMail())
{
$oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance()->SetLogger($this->Logger());
$oSmtpClient->SetTimeOuts(5);
$iTime = \microtime(true);
$oSmtpClient->Connect($oDomain->OutHost(), $oDomain->OutPort(), '127.0.0.1',
$oDomain->OutSecure(), !!$this->Config()->Get('ssl', 'verify_certificate'));
$iSmtpTime = \microtime(true) - $iTime;
$oSmtpClient->Disconnect();
$bSmtpResult = true;
}
catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
{
$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
$sSmtpErrorDesc = $oException->getSocketMessage();
if (empty($sSmtpErrorDesc))
$bSmtpResult = \MailSo\Base\Utils::FunctionExistsAndEnabled('mail');
$bSmtpResult = false;
if (!$bSmtpResult)
{
$sSmtpErrorDesc = $oException->getMessage();
$sSmtpErrorDesc = 'PHP: mail() function is undefined';
}
}
catch (\Exception $oException)
else
{
$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
$sSmtpErrorDesc = $oException->getMessage();
try
{
$oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance()->SetLogger($this->Logger());
$oSmtpClient->SetTimeOuts(5);
$iTime = \microtime(true);
$oSmtpClient->Connect($oDomain->OutHost(), $oDomain->OutPort(), '127.0.0.1',
$oDomain->OutSecure(), !!$this->Config()->Get('ssl', 'verify_certificate'));
$iSmtpTime = \microtime(true) - $iTime;
$oSmtpClient->Disconnect();
$bSmtpResult = true;
}
catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
{
$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
$sSmtpErrorDesc = $oException->getSocketMessage();
if (empty($sSmtpErrorDesc))
{
$sSmtpErrorDesc = $oException->getMessage();
}
}
catch (\Exception $oException)
{
$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
$sSmtpErrorDesc = $oException->getMessage();
}
}
}