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

MailClient use MailSo\Mime\Enumerations\Header as MimeHeader

Browse source
This commit is contained in:
djmaze 2022-01-07 13:57:32 +01:00
parent d9268773db
commit bb4822c9cf
1 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ use MailSo\Imap\Enumerations\FolderResponseStatus;
use MailSo\Imap\Enumerations\MessageFlag; use MailSo\Imap\Enumerations\MessageFlag;
use MailSo\Imap\Enumerations\StoreAction; use MailSo\Imap\Enumerations\StoreAction;
use MailSo\Imap\SequenceSet; use MailSo\Imap\SequenceSet;
use MailSo\Mime\Enumerations\Header as MimeHeader;
/** /**
* @category MailSo * @category MailSo
@ -77,41 +78,41 @@ class MailClient
} }
return \MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array( return \MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array(
\MailSo\Mime\Enumerations\Header::RETURN_PATH, MimeHeader::RETURN_PATH,
\MailSo\Mime\Enumerations\Header::RECEIVED, MimeHeader::RECEIVED,
\MailSo\Mime\Enumerations\Header::MIME_VERSION, MimeHeader::MIME_VERSION,
\MailSo\Mime\Enumerations\Header::MESSAGE_ID, MimeHeader::MESSAGE_ID,
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, MimeHeader::CONTENT_TYPE,
\MailSo\Mime\Enumerations\Header::FROM_, MimeHeader::FROM_,
\MailSo\Mime\Enumerations\Header::TO_, MimeHeader::TO_,
\MailSo\Mime\Enumerations\Header::CC, MimeHeader::CC,
\MailSo\Mime\Enumerations\Header::BCC, MimeHeader::BCC,
\MailSo\Mime\Enumerations\Header::SENDER, MimeHeader::SENDER,
\MailSo\Mime\Enumerations\Header::REPLY_TO, MimeHeader::REPLY_TO,
\MailSo\Mime\Enumerations\Header::DELIVERED_TO, MimeHeader::DELIVERED_TO,
\MailSo\Mime\Enumerations\Header::IN_REPLY_TO, MimeHeader::IN_REPLY_TO,
\MailSo\Mime\Enumerations\Header::REFERENCES, MimeHeader::REFERENCES,
\MailSo\Mime\Enumerations\Header::DATE, MimeHeader::DATE,
\MailSo\Mime\Enumerations\Header::SUBJECT, MimeHeader::SUBJECT,
\MailSo\Mime\Enumerations\Header::X_MSMAIL_PRIORITY, MimeHeader::X_MSMAIL_PRIORITY,
\MailSo\Mime\Enumerations\Header::IMPORTANCE, MimeHeader::IMPORTANCE,
\MailSo\Mime\Enumerations\Header::X_PRIORITY, MimeHeader::X_PRIORITY,
\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO, MimeHeader::X_DRAFT_INFO,
\MailSo\Mime\Enumerations\Header::RETURN_RECEIPT_TO, MimeHeader::RETURN_RECEIPT_TO,
\MailSo\Mime\Enumerations\Header::DISPOSITION_NOTIFICATION_TO, MimeHeader::DISPOSITION_NOTIFICATION_TO,
\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO, MimeHeader::X_CONFIRM_READING_TO,
\MailSo\Mime\Enumerations\Header::AUTHENTICATION_RESULTS, MimeHeader::AUTHENTICATION_RESULTS,
\MailSo\Mime\Enumerations\Header::X_DKIM_AUTHENTICATION_RESULTS, MimeHeader::X_DKIM_AUTHENTICATION_RESULTS,
\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE, MimeHeader::LIST_UNSUBSCRIBE,
// SPAM // SPAM
\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS, MimeHeader::X_SPAM_STATUS,
// \MailSo\Mime\Enumerations\Header::X_SPAM_FLAG, // MimeHeader::X_SPAM_FLAG,
\MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT, MimeHeader::X_SPAMD_RESULT,
\MailSo\Mime\Enumerations\Header::X_BOGOSITY, MimeHeader::X_BOGOSITY,
// Virus // Virus
\MailSo\Mime\Enumerations\Header::X_VIRUS, MimeHeader::X_VIRUS,
\MailSo\Mime\Enumerations\Header::X_VIRUS_SCANNED, MimeHeader::X_VIRUS_SCANNED,
\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS MimeHeader::X_VIRUS_STATUS
), true); ), true);
// //
// return \MailSo\Imap\Enumerations\FetchType::ENVELOPE; // return \MailSo\Imap\Enumerations\FetchType::ENVELOPE;
@ -247,25 +248,25 @@ class MailClient
if (\strlen($sMimeIndex)) if (\strlen($sMimeIndex))
{ {
$sFileName = $oHeaders->ParameterValue( $sFileName = $oHeaders->ParameterValue(
\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, MimeHeader::CONTENT_DISPOSITION,
\MailSo\Mime\Enumerations\Parameter::FILENAME); \MailSo\Mime\Enumerations\Parameter::FILENAME);
if (!\strlen($sFileName)) if (!\strlen($sFileName))
{ {
$sFileName = $oHeaders->ParameterValue( $sFileName = $oHeaders->ParameterValue(
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, MimeHeader::CONTENT_TYPE,
\MailSo\Mime\Enumerations\Parameter::NAME); \MailSo\Mime\Enumerations\Parameter::NAME);
} }
$sMailEncodingName = $oHeaders->ValueByName( $sMailEncodingName = $oHeaders->ValueByName(
\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING); MimeHeader::CONTENT_TRANSFER_ENCODING);
$sContentType = $oHeaders->ValueByName( $sContentType = $oHeaders->ValueByName(
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE); MimeHeader::CONTENT_TYPE);
} }
else else
{ {
$sSubject = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::SUBJECT); $sSubject = $oHeaders->ValueByName(MimeHeader::SUBJECT);
$sFileName = \strlen($sSubject) ? $sSubject : (string) $iIndex; $sFileName = \strlen($sSubject) ? $sSubject : (string) $iIndex;
$sFileName .= '.eml'; $sFileName .= '.eml';
@ -490,9 +491,9 @@ class MailClient
\MailSo\Imap\Enumerations\FetchType::UID, \MailSo\Imap\Enumerations\FetchType::UID,
\MailSo\Imap\Enumerations\FetchType::FLAGS, \MailSo\Imap\Enumerations\FetchType::FLAGS,
\MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array( \MailSo\Imap\Enumerations\FetchType::BuildBodyCustomHeaderRequest(array(
\MailSo\Mime\Enumerations\Header::FROM_, MimeHeader::FROM_,
\MailSo\Mime\Enumerations\Header::SUBJECT, MimeHeader::SUBJECT,
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE MimeHeader::CONTENT_TYPE
)) ))
), $iPrevUidNext.':*', true); ), $iPrevUidNext.':*', true);
@ -509,7 +510,7 @@ class MailClient
$oHeaders = new \MailSo\Mime\HeaderCollection($sHeaders); $oHeaders = new \MailSo\Mime\HeaderCollection($sHeaders);
$sContentTypeCharset = $oHeaders->ParameterValue( $sContentTypeCharset = $oHeaders->ParameterValue(
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, MimeHeader::CONTENT_TYPE,
\MailSo\Mime\Enumerations\Parameter::CHARSET \MailSo\Mime\Enumerations\Parameter::CHARSET
); );
@ -520,8 +521,8 @@ class MailClient
$aNewMessages[] = array( $aNewMessages[] = array(
'Folder' => $sFolderName, 'Folder' => $sFolderName,
'Uid' => $iUid, 'Uid' => $iUid,
'Subject' => $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::SUBJECT, !$sContentTypeCharset), 'Subject' => $oHeaders->ValueByName(MimeHeader::SUBJECT, !$sContentTypeCharset),
'From' => $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::FROM_, !$sContentTypeCharset) 'From' => $oHeaders->GetAsEmailCollection(MimeHeader::FROM_, !$sContentTypeCharset)
); );
} }
} }