Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mailto links fixes

Browse source 
Filters interface fixes
DKIM status a new message
This commit is contained in:
RainLoop Team 2015-01-31 23:00:10 +04:00
parent 0152f1583b
commit 0735071f1c
18 changed files with 212 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rainloop/v/0.0.0/app/libraries/MailSo/Mime/Email.php
View file

@ -37,6 +37,11 @@ class Email
*/
private $sDkimStatus;
/**
* @var string
*/
private $sDkimValue;
/**
* @access private
*
@ -58,6 +63,7 @@ class Email
$this->sRemark = \trim($sRemark);
$this->sDkimStatus = \MailSo\Mime\Enumerations\DkimStatus::NONE;
$this->sDkimValue = '';
}
/**
@ -238,6 +244,14 @@ class Email
return $this->sDkimStatus;
}
/**
* @return string
*/
public function GetDkimValue()
{
return $this->sDkimValue;
}
/**
* @return string
*/
@ -258,10 +272,12 @@ class Email
/**
* @param string $sDkimStatus
* @param string $sDkimValue = ''
*/
public function SetDkimStatus($sDkimStatus)
public function SetDkimStatusAndValue($sDkimStatus, $sDkimValue = '')
{
$this->sDkimStatus = \MailSo\Mime\Enumerations\DkimStatus::normalizeValue($sDkimStatus);
$this->sDkimValue = $sDkimValue;
}
/**
@ -271,7 +287,8 @@ class Email
*/
public function ToArray($bIdn = false)
{
return array($this->sDisplayName, $this->GetEmail($bIdn), $this->sRemark, $this->sDkimStatus);
return array($this->sDisplayName, $this->GetEmail($bIdn), $this->sRemark,
$this->sDkimStatus, $this->sDkimValue);
}
/**

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

@ -394,7 +394,7 @@ class HeaderCollection extends \MailSo\Base\Collection
if (!empty($sStatus) && !empty($sHeader))
{
$aResult[] = array($sStatus, $sHeader);
$aResult[] = array($sStatus, $sHeader, $sDkimLine);
}
}
}
@ -426,7 +426,7 @@ class HeaderCollection extends \MailSo\Base\Collection
if (!empty($sStatus) && !empty($sHeader))
{
$aResult[] = array($sStatus, $sHeader);
$aResult[] = array($sStatus, $sHeader, $sHeaderValue);
}
}
}
@ -454,7 +454,7 @@ class HeaderCollection extends \MailSo\Base\Collection
if (isset($aDkimData[0], $aDkimData[1]) &&
$aDkimData[1] === \strstr($sEmail, $aDkimData[1]))
{
$oItem->SetDkimStatus($aDkimData[0]);
$oItem->SetDkimStatusAndValue($aDkimData[0], empty($aDkimData[2]) ? '' : $aDkimData[2]);
}
}
}