Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1580

Browse source
This commit is contained in:
the-djmaze 2024-05-15 00:22:38 +02:00
parent 0dcc468ae1
commit c3c75c216b
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -264,14 +264,15 @@ class Actions
} }
if ($oAccount) { if ($oAccount) {
$oDomain = $oAccount->Domain();
$sLine = \str_replace('{imap:login}', $oAccount->ImapUser(), $sLine); $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:login}', $oAccount->SmtpUser(), $sLine);
$sLine = \str_replace('{smtp:host}', $oDomain->SmtpSettings()->host, $sLine); $oDomain = $oAccount->Domain();
$sLine = \str_replace('{smtp:port}', $oDomain->SmtpSettings()->port, $sLine); 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'; $aClear['/\{imap:([^}]*)\}/i'] = 'imap';

4
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
View file

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