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

#162 SpamAssassin "X-Spam-Status: No," is not spam and "X-Spam-Status: Yes," is spam

Browse source
This commit is contained in:
djmaze 2021-11-18 20:53:17 +01:00
parent fd2304edcf
commit 2ceb036402
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -116,7 +116,7 @@ class MailClient
\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE, \MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE,
// SPAM // SPAM
\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS, \MailSo\Mime\Enumerations\Header::X_SPAM_STATUS,
\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG, // \MailSo\Mime\Enumerations\Header::X_SPAM_FLAG,
\MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT, \MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT,
\MailSo\Mime\Enumerations\Header::X_BOGOSITY, \MailSo\Mime\Enumerations\Header::X_BOGOSITY,
// Virus // Virus

5
snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -466,8 +466,9 @@ class Message implements \JsonSerializable
$this->sSpamResult = "{$value[1]} / {$required[1]}"; $this->sSpamResult = "{$value[1]} / {$required[1]}";
} }
} }
$spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG); $this->bIsSpam = 0 === \strpos($spam, 'Yes,');
$this->bIsSpam = false !== \stripos($spam, 'YES'); // $spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG);
// $this->bIsSpam = false !== \stripos($spam, 'YES');
} }
if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS)) { if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS)) {

1
snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
View file

@ -59,6 +59,7 @@ abstract class Header
X_SPAM_FLAG = 'X-Spam-Flag', // YES/NO X_SPAM_FLAG = 'X-Spam-Flag', // YES/NO
X_SPAM_LEVEL = 'X-Spam-Level', // ******* X_SPAM_LEVEL = 'X-Spam-Level', // *******
X_SPAM_STATUS = 'X-Spam-Status', // Yes|No X_SPAM_STATUS = 'X-Spam-Status', // Yes|No
X_SPAM_BAR = 'X-Spam-Bar', // ++
// Rspamd // Rspamd
X_SPAMD_RESULT = 'X-Spamd-Result', // default: False [7.13 / 9.00], X_SPAMD_RESULT = 'X-Spamd-Result', // default: False [7.13 / 9.00],
X_SPAMD_BAR = 'X-Spamd-Bar', // +++++++ X_SPAMD_BAR = 'X-Spamd-Bar', // +++++++

4
snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
View file

@ -56,8 +56,8 @@ class Header
private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse) : void private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse) : void
{ {
$this->sName = trim($sName); $this->sName = \trim($sName);
$this->sFullValue = trim($sValue); $this->sFullValue = \trim($sValue);
$this->sEncodedValueForReparse = ''; $this->sEncodedValueForReparse = '';
$this->oParameters = null; $this->oParameters = null;