extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. SMIME:

Browse Source 
- Fix warning of invalid arguments
- Fix sometimes signed content not returning correct mime part
This commit is contained in:
Hadi Nategh 2017-07-13 15:37:02 +02:00
parent ef8d014719
commit cb784c25af
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Mail.php
View File

@ -484,12 +484,14 @@ class Mail
{ {
$this->sessionData = array(); $this->sessionData = array();
self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10); self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
if (is_array(self::$activeFolderCache[$this->profileID]))
{
foreach (self::$activeFolderCache[$this->profileID] as $key => $value) foreach (self::$activeFolderCache[$this->profileID] as $key => $value)
{ {
$this->sessionData[$key] = $value; $this->sessionData[$key] = $value;
} }
} }
}
/** /**
* saveSessionData saves session data * saveSessionData saves session data

2
api/src/Mail/Smime.php
View File

@ -177,7 +177,7 @@ class Smime extends Horde_Crypt_Smime
*/ */
public function extractSignedContents($data) public function extractSignedContents($data)
{ {
return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data)); return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data), array('forcemime' => true));
} }
} }