Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 20:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Throw more errors when using PHP mail()

Browse source
This commit is contained in:
the-djmaze 2024-03-27 01:24:12 +01:00
parent 35db1f4eb8
commit 7213395118
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -777,40 +777,40 @@ trait Messages
$oAccount->SmtpConnectAndLogin($this->Plugins(), $oSmtpClient);
if ($oSmtpClient->Settings->usePhpMail) {
if (\MailSo\Base\Utils::FunctionCallable('mail')) {
$oToCollection = $oMessage->GetTo();
if ($oToCollection && $oFrom) {
$sRawBody = \stream_get_contents($rMessageStream);
if (!empty($sRawBody)) {
$sMailTo = \trim($oToCollection->ToString(true));
$sMailSubject = \trim($oMessage->GetSubject());
$sMailSubject = \strlen($sMailSubject) ? \MailSo\Base\Utils::EncodeHeaderValue($sMailSubject) : '';
if (!$sFrom || !\MailSo\Base\Utils::FunctionCallable('mail')) {
throw new ClientException(Notifications::CantSendMessage);
}
$oToCollection = $oMessage->GetTo();
if (!$oToCollection) {
throw new ClientException(Notifications::CantSendMessage);
}
$sRawBody = \stream_get_contents($rMessageStream);
if (empty($sRawBody)) {
throw new ClientException(Notifications::CantSendMessage);
}
$sMailTo = \trim($oToCollection->ToString(true));
$sMailSubject = \trim($oMessage->GetSubject());
$sMailSubject = \strlen($sMailSubject) ? \MailSo\Base\Utils::EncodeHeaderValue($sMailSubject) : '';
$sMailHeaders = $sMailBody = '';
list($sMailHeaders, $sMailBody) = \explode("\r\n\r\n", $sRawBody, 2);
unset($sRawBody);
$sMailHeaders = $sMailBody = '';
list($sMailHeaders, $sMailBody) = \explode("\r\n\r\n", $sRawBody, 2);
unset($sRawBody);
if ($this->Config()->Get('labs', 'mail_func_clear_headers', true)) {
$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
MimeEnumHeader::TO_,
MimeEnumHeader::SUBJECT
));
}
if ($this->Config()->Get('labs', 'mail_func_clear_headers', true)) {
$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
MimeEnumHeader::TO_,
MimeEnumHeader::SUBJECT
));
}
$this->Logger()->WriteDump(array(
$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
), \LOG_DEBUG);
$this->Logger()->WriteDump(array(
$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
), \LOG_DEBUG);
$bR = $this->Config()->Get('labs', 'mail_func_additional_parameters', false) ?
\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders, '-f'.$oFrom->GetEmail()) :
\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders);
if (!$bR) {
throw new ClientException(Notifications::CantSendMessage);
}
}
}
} else {
$bR = $this->Config()->Get('labs', 'mail_func_additional_parameters', false) ?
\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders, '-f'.$sFrom) :
\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders);
if (!$bR) {
throw new ClientException(Notifications::CantSendMessage);
}
} else if ($oSmtpClient->IsConnected()) {