From cb784c25af15e8567d8aa467b128c36a976c6c1f Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 13 Jul 2017 15:37:02 +0200 Subject: [PATCH] W.I.P. SMIME: - Fix warning of invalid arguments - Fix sometimes signed content not returning correct mime part --- api/src/Mail.php | 8 +++++--- api/src/Mail/Smime.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/src/Mail.php b/api/src/Mail.php index 20735d5145..806d623fad 100644 --- a/api/src/Mail.php +++ b/api/src/Mail.php @@ -484,10 +484,12 @@ class Mail { $this->sessionData = array(); self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10); - - foreach (self::$activeFolderCache[$this->profileID] as $key => $value) + if (is_array(self::$activeFolderCache[$this->profileID])) { - $this->sessionData[$key] = $value; + foreach (self::$activeFolderCache[$this->profileID] as $key => $value) + { + $this->sessionData[$key] = $value; + } } } diff --git a/api/src/Mail/Smime.php b/api/src/Mail/Smime.php index 33fc29d51b..e38661375f 100644 --- a/api/src/Mail/Smime.php +++ b/api/src/Mail/Smime.php @@ -177,7 +177,7 @@ class Smime extends Horde_Crypt_Smime */ public function extractSignedContents($data) { - return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data)); + return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data), array('forcemime' => true)); } }