holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

W.I.P. SMIME:

Browse Source 
- Allow saveSession to save other values in cache besides mailbox
This commit is contained in:
Hadi Nategh 2017-07-12 18:32:36 +02:00
parent 79750d22a5
commit c131be8c17
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/src/Mail.php
View File

@ -482,9 +482,13 @@ class Mail
*/
function restoreSessionData()
{
$this->sessionData = array();//Cache::getCache(Cache::SESSION,'mail','session_data',$callback=null,$callback_params=array(),$expiration=60*60*1);
$this->sessionData = array();
self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
if (!empty(self::$activeFolderCache[$this->profileID])) $this->sessionData['mailbox'] = self::$activeFolderCache[$this->profileID];
foreach (self::$activeFolderCache[$this->profileID] as $key => $value)
{
$this->sessionData[$key] = $value;
}
}
/**
@ -493,7 +497,22 @@ class Mail
function saveSessionData()
{
//error_log(__METHOD__.' ('.__LINE__.') '.array2string(array_keys($this->sessionData)));
if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
foreach ($this->sessionData as $key => $value)
{
if (!is_array(self::$activeFolderCache) && empty(self::$activeFolderCache[$this->profileID]))
{
self::$activeFolderCache = array($this->profileID => array($key => $value));
}
else if(empty(self::$activeFolderCache[$this->profileID]))
{
self::$activeFolderCache += array($this->profileID => array($key => $value));
}
else
{
self::$activeFolderCache[$this->profileID] = array_merge(self::$activeFolderCache[$this->profileID], array($key => $value));
}
}
if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
{
Cache::setCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),self::$activeFolderCache, 60*60*10);