the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/View/Popup/Domain.js
View file

@ -81,11 +81,11 @@
}, this);
this.domainIsComputed = ko.computed(function () {
var bPhpMail = this.smtpPhpMail();
return '' !== this.name() &&
'' !== this.imapServer() &&
'' !== this.imapPort() &&
'' !== this.smtpServer() &&
'' !== this.smtpPort();
(('' !== this.smtpServer() && '' !== this.smtpPort()) || bPhpMail);
}, this);
this.canBeTested = ko.computed(function () {

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();
}
}
}

7
rainloop/v/0.0.0/app/src/RainLoop/Model/Domain.php
View file

@ -136,16 +136,15 @@ class Domain
{
$oDomain = null;
if (0 < \strlen($sName) && \is_array($aDomain) && 0 < \strlen($aDomain['imap_host']) && 0 < \strlen($aDomain['imap_port']) &&
0 < \strlen($aDomain['smtp_host']) && 0 < \strlen($aDomain['smtp_port']))
if (0 < \strlen($sName) && \is_array($aDomain) && 0 < \strlen($aDomain['imap_host']) && 0 < \strlen($aDomain['imap_port']))
{
$sIncHost = (string) $aDomain['imap_host'];
$iIncPort = (int) $aDomain['imap_port'];
$iIncSecure = self::StrConnectionSecurityTypeToCons(
!empty($aDomain['imap_secure']) ? $aDomain['imap_secure'] : '');
$sOutHost = (string) $aDomain['smtp_host'];
$iOutPort = (int) $aDomain['smtp_port'];
$sOutHost = empty($aDomain['smtp_host']) ? '' : (string) $aDomain['smtp_host'];
$iOutPort = empty($aDomain['smtp_port']) ? 25 : (int) $aDomain['smtp_port'];
$iOutSecure = self::StrConnectionSecurityTypeToCons(
!empty($aDomain['smtp_secure']) ? $aDomain['smtp_secure'] : '');

2
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
View file

@ -83,7 +83,7 @@
name: 'Checkbox',
params: {
enable: capa,
label: 'Show &quot;Powered by RainLoop&quot; link (White Labeling)',
label: 'Show &quot;Powered by RainLoop&quot; link',
value: loginPowered
}
}"></div>