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

Fixes: DKIM status

Browse source
This commit is contained in:
RainLoop Team 2015-01-14 04:26:51 +04:00
parent 9bc977cccf
commit eed1adf36b
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
View file

@ -369,12 +369,14 @@ class HeaderCollection extends \MailSo\Base\Collection
foreach ($aHeaders as $sHeaderValue) foreach ($aHeaders as $sHeaderValue)
{ {
$sStatus = ''; $sStatus = '';
$sDomain = ''; $sHeader = '';
$sDkimLine = ''; $sDkimLine = '';
$aMatch = array(); $aMatch = array();
if (\preg_match('/dkim=[^\r\n;]+/i', $sHeaderValue, $aMatch) && !empty($aMatch[0])) $sHeaderValue = \preg_replace('/[\r\n\t\s]+/', ' ', $sHeaderValue);
if (\preg_match('/dkim=[^;]+/i', $sHeaderValue, $aMatch) && !empty($aMatch[0]))
{ {
$sDkimLine = $aMatch[0]; $sDkimLine = $aMatch[0];
@ -385,15 +387,14 @@ class HeaderCollection extends \MailSo\Base\Collection
} }
$aMatch = array(); $aMatch = array();
if (\preg_match('/header\.(d|i|from)=([^\s]+)/i', $sDkimLine, $aMatch) && !empty($aMatch[2])) if (\preg_match('/header\.(d|i|from)=([^\s;]+)/i', $sDkimLine, $aMatch) && !empty($aMatch[2]))
{ {
$sDomain = \trim($aMatch[2]); $sHeader = \trim($aMatch[2]);
$sDomain = \trim($sDomain, '@.');
} }
if (!empty($sStatus) && !empty($sDomain)) if (!empty($sStatus) && !empty($sHeader))
{ {
$aResult[] = array($sStatus, $sDomain); $aResult[] = array($sStatus, $sHeader);
} }
} }
} }
@ -415,10 +416,11 @@ class HeaderCollection extends \MailSo\Base\Collection
$oEmails->ForeachList(function (/* @var $oItem \MailSo\Mime\Email */ $oItem) use ($aDkimStatuses) { $oEmails->ForeachList(function (/* @var $oItem \MailSo\Mime\Email */ $oItem) use ($aDkimStatuses) {
if ($oItem && $oItem instanceof \MailSo\Mime\Email) if ($oItem && $oItem instanceof \MailSo\Mime\Email)
{ {
$sEmailDomain = $oItem->GetDomain(); $sEmail = $oItem->GetEmail();
foreach ($aDkimStatuses as $aDkimData) foreach ($aDkimStatuses as $aDkimData)
{ {
if (isset($aDkimData[0], $aDkimData[1]) && $sEmailDomain === $aDkimData[1]) if (isset($aDkimData[0], $aDkimData[1]) &&
$aDkimData[1] === \strstr($sEmail, $aDkimData[1]))
{ {
$oItem->SetDkimStatus($aDkimData[0]); $oItem->SetDkimStatus($aDkimData[0]);
} }