forked from extern/egroupware
W.I.P. SMIME:
- Fix warning of invalid arguments - Fix sometimes signed content not returning correct mime part
This commit is contained in:
parent
ef8d014719
commit
cb784c25af
@ -484,12 +484,14 @@ 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);
|
||||
|
||||
if (is_array(self::$activeFolderCache[$this->profileID]))
|
||||
{
|
||||
foreach (self::$activeFolderCache[$this->profileID] as $key => $value)
|
||||
{
|
||||
$this->sessionData[$key] = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* saveSessionData saves session data
|
||||
|
@ -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));
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user