mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-08 17:07:03 +03:00
More changes for #1003
This commit is contained in:
parent
8c7fd77762
commit
206c8abdf5
2 changed files with 29 additions and 17 deletions
|
|
@ -406,15 +406,12 @@ trait Messages
|
|||
{
|
||||
$sRawKey = (string) $this->GetActionParam('RawKey', '');
|
||||
|
||||
$sFolder = '';
|
||||
$iUid = 0;
|
||||
|
||||
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
|
||||
if ($aValues && 2 <= \count($aValues)) {
|
||||
$sFolder = (string) $aValues[0];
|
||||
$iUid = (int) $aValues[1];
|
||||
|
||||
$this->verifyCacheByKey($sRawKey);
|
||||
// $useThreads = !empty($aValues[2]);
|
||||
// $accountHash = $aValues[3];
|
||||
} else {
|
||||
$sFolder = $this->GetActionParam('folder', '');
|
||||
$iUid = (int) $this->GetActionParam('uid', 0);
|
||||
|
|
@ -432,9 +429,10 @@ trait Messages
|
|||
}
|
||||
|
||||
if ($oMessage) {
|
||||
$ETag = $oMessage->ETag($this->ImapClient()->Hash());
|
||||
$this->verifyCacheByKey($ETag);
|
||||
$this->Plugins()->RunHook('filter.result-message', array($oMessage));
|
||||
|
||||
$this->cacheByKey($sRawKey);
|
||||
$this->cacheByKey($ETag);
|
||||
}
|
||||
|
||||
return $this->DefaultResponse($oMessage);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue