From de150b359cea4fd7b10558ce2beb55a3f853ad91 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sun, 10 Mar 2024 23:58:54 +0100 Subject: [PATCH] Make Domain::Normalize() private --- .../app/libraries/RainLoop/Model/Domain.php | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php index ce977e959..49c451d87 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php @@ -30,7 +30,7 @@ class Domain implements \JsonSerializable $this->Sieve = new \MailSo\Sieve\Settings; } - public function Normalize() + private function Normalize() { $this->IMAP->host = \trim($this->IMAP->host); $this->Sieve->host = \trim($this->Sieve->host); @@ -38,24 +38,6 @@ class Domain implements \JsonSerializable $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 { return $this->Name; @@ -230,6 +212,24 @@ class Domain implements \JsonSerializable 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] public function jsonSerialize() {