extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

commit regarding problem with persistent session restore; further work needed

Browse Source
This commit is contained in:
Klaus Leithoff 2009-08-18 07:40:26 +00:00
parent 01a45a3d3a
commit f2c4679dcb
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emailadmin/inc/class.emailadmin_bo.inc.php
View File

@ -463,9 +463,9 @@
function getUserProfile($_appName='', $_groups='')
{
if (!(is_array($this->sessionData) && (count($this->sessionData)>0))) $this->restoreSessionData();
if (is_array($this->sessionData) && count($this->sessionData)>0 && $this->sessionData['eapreferences']) {
if (is_array($this->sessionData) && count($this->sessionData)>0 && $this->sessionData['ea_preferences']) {
#error_log("sessionData Restored for UserProfile<br>");
return $this->sessionData['eapreferences'];
return $this->sessionData['ea_preferences'];
}
$appName = ($_appName != '' ? $_appName : $GLOBALS['egw_info']['flags']['currentapp']);
if(!is_array($_groups)) {
@ -547,7 +547,7 @@
$eaPreferences->userDefinedIdentities = ($data['userDefinedIdentities'] == 'yes');
$eaPreferences->ea_user_defined_signatures = ($data['ea_user_defined_signatures'] == 'yes');
$eaPreferences->ea_default_signature = $data['ea_default_signature'];
$this->sessionData['eapreferences'] = $eaPreferences;
$this->sessionData['ea_preferences'] = $eaPreferences;
$this->saveSessionData();
return $eaPreferences;
}
@ -582,8 +582,7 @@
//echo function_backtrace()."<br>";
//unserializing the sessiondata, since they are serialized for objects sake
$this->sessionData = (array) unserialize($GLOBALS['egw']->session->appsession('session_data','emailadmin'));
#$this->userSessionData = $GLOBALS['egw']->session->appsession('user_session_data','emailadmin');
//$this->sessionData = (array) unserialize($GLOBALS['egw']->session->appsession('session_data','emailadmin'));
}
/**

2
felamimail/inc/class.bopreferences.inc.php
View File

@ -41,7 +41,7 @@
// set an own autoload function, search emailadmin for missing classes
$GLOBALS['egw_info']['flags']['autoload'] = array(__CLASS__,'autoload');
$this->sessionData = (array) unserialize($GLOBALS['egw']->session->appsession('fm_preferences','felamimail'));
//$this->sessionData = (array) unserialize($GLOBALS['egw']->session->appsession('fm_preferences','felamimail'));
}
/**