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

Drop deprecated Domain::SetConfig()

Browse source
This commit is contained in:
the-djmaze 2024-03-10 23:21:07 +01:00
parent e07749be6a
commit cc22327279
3 changed files with 58 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

14
integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
View file

@ -85,11 +85,15 @@ class InstallStep implements IRepairStep
// $oDomain = \RainLoop\Model\Domain::fromIniArray('nextcloud', []); // $oDomain = \RainLoop\Model\Domain::fromIniArray('nextcloud', []);
$oDomain = new \RainLoop\Model\Domain('nextcloud'); $oDomain = new \RainLoop\Model\Domain('nextcloud');
$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE; $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
$oDomain->SetConfig( $oDomain->ImapSettings()->host = 'localhost';
'localhost', 143, $iSecurityType, true, $oDomain->ImapSettings()->type = $iSecurityType;
true, 'localhost', 4190, $iSecurityType, $oDomain->ImapSettings()->shortLogin = true;
'localhost', 25, $iSecurityType, true, true, false, false, $oDomain->SieveSettings()->enabled = true;
''); $oDomain->SieveSettings()->host = 'localhost';
$oDomain->SieveSettings()->type = $iSecurityType;
$oDomain->SmtpSettings()->host = 'localhost';
$oDomain->SmtpSettings()->type = $iSecurityType;
$oDomain->SmtpSettings()->shortLogin = true;
$oProvider->Save($oDomain); $oProvider->Save($oDomain);
if (!$oConfig->Get('login', 'default_domain', '')) { if (!$oConfig->Get('login', 'default_domain', '')) {
$oConfig->Set('login', 'default_domain', 'nextcloud'); $oConfig->Set('login', 'default_domain', 'nextcloud');

14
integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
View file

@ -78,11 +78,15 @@ class SnappyMailHelper
// $oDomain = \RainLoop\Model\Domain::fromIniArray('owncloud', []); // $oDomain = \RainLoop\Model\Domain::fromIniArray('owncloud', []);
$oDomain = new \RainLoop\Model\Domain('owncloud'); $oDomain = new \RainLoop\Model\Domain('owncloud');
$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE; $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
$oDomain->SetConfig( $oDomain->ImapSettings()->host = 'localhost';
'localhost', 143, $iSecurityType, true, $oDomain->ImapSettings()->type = $iSecurityType;
true, 'localhost', 4190, $iSecurityType, $oDomain->ImapSettings()->shortLogin = true;
'localhost', 25, $iSecurityType, true, true, false, false, $oDomain->SieveSettings()->enabled = true;
''); $oDomain->SieveSettings()->host = 'localhost';
$oDomain->SieveSettings()->type = $iSecurityType;
$oDomain->SmtpSettings()->host = 'localhost';
$oDomain->SmtpSettings()->type = $iSecurityType;
$oDomain->SmtpSettings()->shortLogin = true;
$oProvider->Save($oDomain); $oProvider->Save($oDomain);
if (!$oConfig->Get('login', 'default_domain', '')) { if (!$oConfig->Get('login', 'default_domain', '')) {
$oConfig->Set('login', 'default_domain', 'owncloud'); $oConfig->Set('login', 'default_domain', 'owncloud');

114
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
View file

@ -30,40 +30,6 @@ class Domain implements \JsonSerializable
$this->Sieve = new \MailSo\Sieve\Settings; $this->Sieve = new \MailSo\Sieve\Settings;
} }
/**
* Used by old ToIniString()
*/
public static function fromIniArray(string $sName, array $aDomain) : ?self
{
$oDomain = null;
if (\strlen($sName) && \strlen($aDomain['imap_host'])) {
$oDomain = new self($sName);
$oDomain->IMAP->host = \SnappyMail\IDN::toUtf8($aDomain['imap_host']);
$oDomain->IMAP->port = (int) $aDomain['imap_port'];
$oDomain->IMAP->type = self::StrConnectionSecurityTypeToCons($aDomain['imap_secure'] ?? '');
$oDomain->IMAP->shortLogin = !empty($aDomain['imap_short_login']);
$oDomain->Sieve->enabled = !empty($aDomain['sieve_use']);
$oDomain->Sieve->host = \SnappyMail\IDN::toUtf8($aDomain['sieve_host']);
$oDomain->Sieve->port = (int) ($aDomain['sieve_port'] ?? 4190);;
$oDomain->Sieve->type = self::StrConnectionSecurityTypeToCons($aDomain['sieve_secure'] ?? '');
$oDomain->SMTP->host = \SnappyMail\IDN::toUtf8($aDomain['smtp_host']);
$oDomain->SMTP->port = (int) ($aDomain['smtp_port'] ?? 25);
$oDomain->SMTP->type = self::StrConnectionSecurityTypeToCons($aDomain['smtp_secure'] ?? '');
$oDomain->SMTP->shortLogin = !empty($aDomain['smtp_short_login']);
$oDomain->SMTP->useAuth = !empty($aDomain['smtp_auth']);
$oDomain->SMTP->setSender = !empty($aDomain['smtp_set_sender']);
$oDomain->SMTP->usePhpMail = !empty($aDomain['smtp_php_mail']);
$oDomain->whiteList = \trim($aDomain['white_list'] ?? '');
$oDomain->Normalize();
}
return $oDomain;
}
public function Normalize() public function Normalize()
{ {
$this->IMAP->host = \trim($this->IMAP->host); $this->IMAP->host = \trim($this->IMAP->host);
@ -90,41 +56,6 @@ class Domain implements \JsonSerializable
return $iSecurityType; return $iSecurityType;
} }
/**
* deprecated
*/
public function SetConfig(
string $sIncHost, int $iIncPort, int $iIncSecure, bool $bIncShortLogin,
bool $bUseSieve, string $sSieveHost, int $iSievePort, int $iSieveSecure,
string $sOutHost, int $iOutPort, int $iOutSecure, bool $bOutShortLogin,
bool $bOutAuth, bool $bOutSetSender, bool $bOutUsePhpMail,
string $sWhiteList = '') : self
{
$this->IMAP->host = $sIncHost;
$this->IMAP->port = $iIncPort;
$this->IMAP->type = $iIncSecure;
$this->IMAP->shortLogin = $bIncShortLogin;
$this->SMTP->host = $sOutHost;
$this->SMTP->port = $iOutPort;
$this->SMTP->type = $iOutSecure;
$this->SMTP->shortLogin = $bOutShortLogin;
$this->SMTP->useAuth = $bOutAuth;
$this->SMTP->setSender = $bOutSetSender;
$this->SMTP->usePhpMail = $bOutUsePhpMail;
$this->Sieve->enabled = $bUseSieve;
$this->Sieve->host = $sSieveHost;
$this->Sieve->port = $iSievePort;
$this->Sieve->type = $iSieveSecure;
$this->whiteList = \trim($sWhiteList);
$this->Normalize();
return $this;
}
public function Name() : string public function Name() : string
{ {
return $this->Name; return $this->Name;
@ -203,16 +134,16 @@ class Domain implements \JsonSerializable
return $this->IMAP; return $this->IMAP;
} }
public function SmtpSettings() : \MailSo\Smtp\Settings
{
return $this->SMTP;
}
public function SieveSettings() : \MailSo\Sieve\Settings public function SieveSettings() : \MailSo\Sieve\Settings
{ {
return $this->Sieve; return $this->Sieve;
} }
public function SmtpSettings() : \MailSo\Smtp\Settings
{
return $this->SMTP;
}
/** /**
* See jsonSerialize() for valid values * See jsonSerialize() for valid values
*/ */
@ -228,6 +159,7 @@ class Domain implements \JsonSerializable
$oDomain->Sieve = \MailSo\Sieve\Settings::fromArray($aDomain['Sieve']); $oDomain->Sieve = \MailSo\Sieve\Settings::fromArray($aDomain['Sieve']);
$oDomain->whiteList = (string) $aDomain['whiteList']; $oDomain->whiteList = (string) $aDomain['whiteList'];
} else if (\strlen($aDomain['imapHost'])) { } else if (\strlen($aDomain['imapHost'])) {
// Old way
$oDomain->IMAP->host = $aDomain['imapHost']; $oDomain->IMAP->host = $aDomain['imapHost'];
$oDomain->IMAP->port = (int) $aDomain['imapPort']; $oDomain->IMAP->port = (int) $aDomain['imapPort'];
$oDomain->IMAP->type = (int) $aDomain['imapSecure']; $oDomain->IMAP->type = (int) $aDomain['imapSecure'];
@ -255,6 +187,40 @@ class Domain implements \JsonSerializable
return $oDomain; return $oDomain;
} }
/**
* Used by old RainLoop ToIniString()
*/
public static function fromIniArray(string $sName, array $aDomain) : ?self
{
$oDomain = null;
if (\strlen($sName) && \strlen($aDomain['imap_host'])) {
$oDomain = new self($sName);
$oDomain->IMAP->host = \SnappyMail\IDN::toUtf8($aDomain['imap_host']);
$oDomain->IMAP->port = (int) $aDomain['imap_port'];
$oDomain->IMAP->type = self::StrConnectionSecurityTypeToCons($aDomain['imap_secure'] ?? '');
$oDomain->IMAP->shortLogin = !empty($aDomain['imap_short_login']);
$oDomain->Sieve->enabled = !empty($aDomain['sieve_use']);
$oDomain->Sieve->host = \SnappyMail\IDN::toUtf8($aDomain['sieve_host']);
$oDomain->Sieve->port = (int) ($aDomain['sieve_port'] ?? 4190);;
$oDomain->Sieve->type = self::StrConnectionSecurityTypeToCons($aDomain['sieve_secure'] ?? '');
$oDomain->SMTP->host = \SnappyMail\IDN::toUtf8($aDomain['smtp_host']);
$oDomain->SMTP->port = (int) ($aDomain['smtp_port'] ?? 25);
$oDomain->SMTP->type = self::StrConnectionSecurityTypeToCons($aDomain['smtp_secure'] ?? '');
$oDomain->SMTP->shortLogin = !empty($aDomain['smtp_short_login']);
$oDomain->SMTP->useAuth = !empty($aDomain['smtp_auth']);
$oDomain->SMTP->setSender = !empty($aDomain['smtp_set_sender']);
$oDomain->SMTP->usePhpMail = !empty($aDomain['smtp_php_mail']);
$oDomain->whiteList = \trim($aDomain['white_list'] ?? '');
$oDomain->Normalize();
}
return $oDomain;
}
#[\ReturnTypeWillChange] #[\ReturnTypeWillChange]
public function jsonSerialize() public function jsonSerialize()
{ {