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

OpenPGP first look (#53)

Browse source
This commit is contained in:
RainLoop Team 2014-01-28 01:34:54 +04:00
parent 74991b16d9
commit 098a04eab6
15 changed files with 175 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -356,18 +356,30 @@ class MailClient
$oBodyStructure = null;
$oMessage = false;
$aTextMimeIndexes = array();
$aBodyPeekMimeIndexes = array();
$aFetchResponse = $this->oImapClient->Fetch(array(\MailSo\Imap\Enumerations\FetchType::BODYSTRUCTURE), $iIndex, $bIndexIsUid);
if (0 < \count($aFetchResponse))
if (0 < \count($aFetchResponse) && isset($aFetchResponse[0]))
{
$oBodyStructure = $aFetchResponse[0]->GetFetchBodyStructure();
$aTextParts = $oBodyStructure ? $oBodyStructure->SearchHtmlOrPlainParts() : null;
if (is_array($aTextParts) && 0 < \count($aTextParts))
if ($oBodyStructure)
{
foreach ($aTextParts as $oPart)
$aTextParts = $oBodyStructure->SearchHtmlOrPlainParts();
if (is_array($aTextParts) && 0 < \count($aTextParts))
{
$aTextMimeIndexes[] = $oPart->PartID();
foreach ($aTextParts as $oPart)
{
$aBodyPeekMimeIndexes[] = $oPart->PartID();
}
}
$aSignatureParts = $oBodyStructure->SearchByContentType('application/pgp-signature');
if (is_array($aSignatureParts) && 0 < \count($aSignatureParts))
{
foreach ($aSignatureParts as $oPart)
{
$aBodyPeekMimeIndexes[] = $oPart->PartID();
}
}
}
}
@ -381,9 +393,9 @@ class MailClient
$this->getEnvelopeOrHeadersRequestString()
);
if (0 < \count($aTextMimeIndexes))
if (0 < \count($aBodyPeekMimeIndexes))
{
foreach ($aTextMimeIndexes as $sTextMimeIndex)
foreach ($aBodyPeekMimeIndexes as $sTextMimeIndex)
{
$aFetchItems[] = \MailSo\Imap\Enumerations\FetchType::BODY_PEEK.'['.$sTextMimeIndex.']';
}