mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-06 16:07:03 +03:00
Make Domain::Normalize() private
This commit is contained in:
parent
1e55f86f51
commit
de150b359c
1 changed files with 19 additions and 19 deletions
|
|
@ -30,7 +30,7 @@ class Domain implements \JsonSerializable
|
||||||
$this->Sieve = new \MailSo\Sieve\Settings;
|
$this->Sieve = new \MailSo\Sieve\Settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function Normalize()
|
private function Normalize()
|
||||||
{
|
{
|
||||||
$this->IMAP->host = \trim($this->IMAP->host);
|
$this->IMAP->host = \trim($this->IMAP->host);
|
||||||
$this->Sieve->host = \trim($this->Sieve->host);
|
$this->Sieve->host = \trim($this->Sieve->host);
|
||||||
|
|
@ -38,24 +38,6 @@ class Domain implements \JsonSerializable
|
||||||
$this->whiteList = \trim($this->whiteList);
|
$this->whiteList = \trim($this->whiteList);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Use by old fromIniArray()
|
|
||||||
*/
|
|
||||||
public static function StrConnectionSecurityTypeToCons(string $sType) : int
|
|
||||||
{
|
|
||||||
$iSecurityType = ConnectionSecurityType::NONE;
|
|
||||||
switch (\strtoupper($sType))
|
|
||||||
{
|
|
||||||
case 'SSL':
|
|
||||||
$iSecurityType = ConnectionSecurityType::SSL;
|
|
||||||
break;
|
|
||||||
case 'TLS':
|
|
||||||
$iSecurityType = ConnectionSecurityType::STARTTLS;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return $iSecurityType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function Name() : string
|
public function Name() : string
|
||||||
{
|
{
|
||||||
return $this->Name;
|
return $this->Name;
|
||||||
|
|
@ -230,6 +212,24 @@ class Domain implements \JsonSerializable
|
||||||
return $oDomain;
|
return $oDomain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use by old RainLoop fromIniArray()
|
||||||
|
*/
|
||||||
|
public static function StrConnectionSecurityTypeToCons(string $sType) : int
|
||||||
|
{
|
||||||
|
$iSecurityType = ConnectionSecurityType::NONE;
|
||||||
|
switch (\strtoupper($sType))
|
||||||
|
{
|
||||||
|
case 'SSL':
|
||||||
|
$iSecurityType = ConnectionSecurityType::SSL;
|
||||||
|
break;
|
||||||
|
case 'TLS':
|
||||||
|
$iSecurityType = ConnectionSecurityType::STARTTLS;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $iSecurityType;
|
||||||
|
}
|
||||||
|
|
||||||
#[\ReturnTypeWillChange]
|
#[\ReturnTypeWillChange]
|
||||||
public function jsonSerialize()
|
public function jsonSerialize()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue