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

Cleanup MIME header email address parsing

Browse source
This commit is contained in:
the-djmaze 2024-01-23 14:35:41 +01:00
parent 443a6df070
commit 4b8ad326fa
4 changed files with 27 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

9
snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
View file

@ -33,15 +33,6 @@ class EmailCollection extends \MailSo\Base\Collection
parent::append($oEmail, $bToTop);
}
public function MergeWithOtherCollection(EmailCollection $oEmails) : self
{
foreach ($oEmails as $oEmail) {
$this->append($oEmail);
}
return $this;
}
public function Unique() : self
{
$aReturn = array();

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

@ -196,11 +196,6 @@ class Header implements \JsonSerializable
return $this->Value();
}
private function IsReparsed() : bool
{
return $this->IsEmail() || $this->IsSubject() || $this->IsParameterized();
}
#[\ReturnTypeWillChange]
public function jsonSerialize()
{

61
snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
View file

@ -51,6 +51,13 @@ class Message extends Part
$this->oAttachmentCollection = new AttachmentCollection;
}
private function getHeaderValue(string $name)
{
return isset($this->aHeadersValue[$name])
? $this->aHeadersValue[$name]
: null;
}
public function DoesNotAddDefaultXMailer() : void
{
$this->bAddDefaultXMailer = false;
@ -58,8 +65,7 @@ class Message extends Part
public function MessageId() : string
{
return empty($this->aHeadersValue[Enumerations\Header::MESSAGE_ID]) ? ''
: $this->aHeadersValue[Enumerations\Header::MESSAGE_ID];
return $this->getHeaderValue(Enumerations\Header::MESSAGE_ID) ?: '';
}
public function SetMessageId(string $sMessageId) : void
@ -79,52 +85,31 @@ class Message extends Part
public function GetSubject() : string
{
return isset($this->aHeadersValue[Enumerations\Header::SUBJECT]) ?
$this->aHeadersValue[Enumerations\Header::SUBJECT] : '';
return $this->getHeaderValue(Enumerations\Header::SUBJECT) ?: '';
}
public function GetFrom() : ?Email
{
if (isset($this->aHeadersValue[Enumerations\Header::FROM_]) &&
$this->aHeadersValue[Enumerations\Header::FROM_] instanceof Email)
{
return $this->aHeadersValue[Enumerations\Header::FROM_];
}
return null;
$value = $this->getHeaderValue(Enumerations\Header::FROM_);
return ($value instanceof Email) ? $value : null;
}
public function GetTo() : EmailCollection
public function GetTo() : ?EmailCollection
{
if (isset($this->aHeadersValue[Enumerations\Header::TO_]) &&
$this->aHeadersValue[Enumerations\Header::TO_] instanceof EmailCollection)
{
return $this->aHeadersValue[Enumerations\Header::TO_]->Unique();
}
return new EmailCollection;
$value = $this->getHeaderValue(Enumerations\Header::TO_);
return ($value instanceof EmailCollection) ? $value->Unique() : null;
}
public function GetCc() : ?EmailCollection
{
if (isset($this->aHeadersValue[Enumerations\Header::CC]) &&
$this->aHeadersValue[Enumerations\Header::CC] instanceof EmailCollection)
{
return $this->aHeadersValue[Enumerations\Header::CC]->Unique();
}
return null;
$value = $this->getHeaderValue(Enumerations\Header::CC);
return ($value instanceof EmailCollection) ? $value->Unique() : null;
}
public function GetBcc() : ?EmailCollection
{
if (isset($this->aHeadersValue[Enumerations\Header::BCC]) &&
$this->aHeadersValue[Enumerations\Header::BCC] instanceof EmailCollection)
{
return $this->aHeadersValue[Enumerations\Header::BCC]->Unique();
}
return null;
$value = $this->getHeaderValue(Enumerations\Header::BCC);
return ($value instanceof EmailCollection) ? $value->Unique() : null;
}
public function GetRcpt() : EmailCollection
@ -133,8 +118,9 @@ class Message extends Part
$headers = array(Enumerations\Header::TO_, Enumerations\Header::CC, Enumerations\Header::BCC);
foreach ($headers as $header) {
if (isset($this->aHeadersValue[$header]) && $this->aHeadersValue[$header] instanceof EmailCollection) {
foreach ($this->aHeadersValue[$header] as $oEmail) {
$value = $this->getHeaderValue($header);
if ($value instanceof EmailCollection) {
foreach ($value as $oEmail) {
$oResult->append($oEmail);
}
}
@ -144,8 +130,9 @@ class Message extends Part
$aReturn = array();
$headers = array(Enumerations\Header::TO_, Enumerations\Header::CC, Enumerations\Header::BCC);
foreach ($headers as $header) {
if (isset($this->aHeadersValue[$header]) && $this->aHeadersValue[$header] instanceof EmailCollection) {
foreach ($this->aHeadersValue[$header] as $oEmail) {
$value = $this->getHeaderValue($header);
if ($value instanceof EmailCollection) {
foreach ($value as $oEmail) {
$oResult->append($oEmail);
$sEmail = $oEmail->GetEmail();
if (!isset($aReturn[$sEmail])) {

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

@ -806,11 +806,11 @@ trait Messages
if ($oSmtpClient->Settings->usePhpMail) {
if (\MailSo\Base\Utils::FunctionCallable('mail')) {
$aToCollection = $oMessage->GetTo();
if ($aToCollection && $oFrom) {
$oToCollection = $oMessage->GetTo();
if ($oToCollection && $oFrom) {
$sRawBody = \stream_get_contents($rMessageStream);
if (!empty($sRawBody)) {
$sMailTo = \trim($aToCollection->ToString(true));
$sMailTo = \trim($oToCollection->ToString(true));
$sMailSubject = \trim($oMessage->GetSubject());
$sMailSubject = \strlen($sMailSubject) ? \MailSo\Base\Utils::EncodeHeaderValue($sMailSubject) : '';