Resolve #1580

Author: the-djmaze

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -264,14 +264,15 @@ protected function compileLogParams(string $sLine, ?Model\Account $oAccount = nu
 			}
 
 			if ($oAccount) {
-				$oDomain = $oAccount->Domain();
 				$sLine = \str_replace('{imap:login}', $oAccount->ImapUser(), $sLine);
-				$sLine = \str_replace('{imap:host}', $oDomain->ImapSettings()->host, $sLine);
-				$sLine = \str_replace('{imap:port}', $oDomain->ImapSettings()->port, $sLine);
-
 				$sLine = \str_replace('{smtp:login}', $oAccount->SmtpUser(), $sLine);
-				$sLine = \str_replace('{smtp:host}', $oDomain->SmtpSettings()->host, $sLine);
-				$sLine = \str_replace('{smtp:port}', $oDomain->SmtpSettings()->port, $sLine);
+				$oDomain = $oAccount->Domain();
+				if ($oDomain) {
+					$sLine = \str_replace('{imap:host}', $oDomain->ImapSettings()->host, $sLine);
+					$sLine = \str_replace('{imap:port}', $oDomain->ImapSettings()->port, $sLine);
+					$sLine = \str_replace('{smtp:host}', $oDomain->SmtpSettings()->host, $sLine);
+					$sLine = \str_replace('{smtp:port}', $oDomain->SmtpSettings()->port, $sLine);
+				}
 			}
 
 			$aClear['/\{imap:([^}]*)\}/i'] = 'imap';

snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php

@@ -21,7 +21,7 @@ abstract class Account implements \JsonSerializable
 
 	private ?SensitiveString $oSmtpPass = null;
 
-	private Domain $oDomain;
+	private ?Domain $oDomain = null;
 
 	public function Email() : string
 	{
@@ -49,7 +49,7 @@ public function SmtpUser() : string
 //		return $this->sSmtpUser ?: $this->sEmail ?: $this->sImapUser;
 	}
 
-	public function Domain() : Domain
+	public function Domain() : ?Domain
 	{
 		return $this->oDomain;
 	}