extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed problem reported on the german list: memberships get not set if a new user gets creted in ldap

Browse Source 
It turned out to be a caching problem, as the cache of the accounts-class still contained a failed id2name resolution for the new account.
This was caused by the session-restore with stored the cache in the global accounts object ($GLOBALS[egw]->accounts) too.
Now the global cache is in the global account-object and all other account objects use just a reference to that cache. It get stored from common::egw_final by calling $GLOBALS[egw]->accounts->save_session_cache() in the session."
This commit is contained in:
Ralf Becker 2007-07-27 07:46:55 +00:00
parent 4f6b0ae2da
commit d899beeb55
1 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
phpgwapi/inc/class.accounts.inc.php
View File

@ -502,6 +502,7 @@ class accounts extends accounts_backend
*/ */
function set_memberships($groups,$account_id) function set_memberships($groups,$account_id)
{ {
//echo "<p>accounts::set_memberships(".print_r($groups,true).",$account_id)</p>\n";
if (!is_int($account_id) && !is_numeric($account_id)) if (!is_int($account_id) && !is_numeric($account_id))
{ {
$account_id = $this->name2id($account_id); $account_id = $this->name2id($account_id);
@ -620,24 +621,6 @@ class accounts extends accounts_backend
return False; return False;
} }
/**
* Invalidate the cache (or parts of it) after change in $account_id
*
* Atm simplest approach - delete it all ;-)
*
* @param int $account_id for which account_id should the cache be invalid, default 0 = all
*/
function cache_invalidate($account_id=0)
{
//echo "<p>accounts::cache_invalidate($account_id)</p>\n";
$GLOBALS['egw_info']['accounts']['cache'] = array();
if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) // egw object in setup is limited
{
$GLOBALS['egw']->invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
}
}
/** /**
* Add an account for an authenticated user * Add an account for an authenticated user
* *
@ -729,6 +712,28 @@ class accounts extends accounts_backend
} }
} }
/**
* Invalidate the cache (or parts of it) after change in $account_id
*
* Atm simplest approach - delete it all ;-)
*
* @param int $account_id for which account_id should the cache be invalid, default 0 = all
*/
function cache_invalidate($account_id=0)
{
//echo "<p>accounts::cache_invalidate($account_id)</p>\n";
if (is_object($GLOBALS['egw']->accounts))
{
$GLOBALS['egw']->accounts->cache = array();
}
if ($this->cache) $this->cache = array();
if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) // egw object in setup is limited
{
$GLOBALS['egw']->invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
}
}
/** /**
* Internal functions not meant to use outside this class!!! * Internal functions not meant to use outside this class!!!
*/ */
@ -743,22 +748,38 @@ class accounts extends accounts_backend
*/ */
function setup_cache() function setup_cache()
{ {
//echo "<p>accounts::setup_cache() use_session_cache=$this->use_session_cache, cache_setup=".(int)$GLOBALS['egw_info']['flags']['session_cache_setup']."</p>\n"; //echo "<p>accounts::setup_cache() use_session_cache=$this->use_session_cache, is_array(this->cache)=".(int)is_array($this->cache)."</p>\n";
if ($this->use_session_cache && // are we supposed to use a session-cache if (is_array($this->cache)) return; // cache is already setup
!@$GLOBALS['egw_info']['flags']['session_cache_setup'] && // is it already setup
// is the account-class ready (startup !) if ($this->use_session_cache && isset($GLOBALS['egw']->accounts) && !is_array($GLOBALS['egw']->accounts->cache))
is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->account_id)
{ {
// setting up the session-cache //echo "<p>restoring the session-cache for \$GLOBALS['egw']->accounts</p>\n";
$GLOBALS['egw_info']['accounts']['cache'] = $GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi'); $GLOBALS['egw']->accounts->cache = $GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi');
$GLOBALS['egw_info']['flags']['session_cache_setup'] = True;
//echo "accounts::setup_cache() cache=<pre>".print_r($GLOBALS['egw_info']['accounts']['cache'],True)."</pre>\n";
} }
if (!isset($this->cache)) if (!isset($this->cache) && isset($GLOBALS['egw']->accounts))
{ {
$this->cache = &$GLOBALS['egw_info']['accounts']['cache']; $this->cache =& $GLOBALS['egw']->accounts->cache;
} }
if (!is_array($this->cache)) $this->cache = array(); if (!is_array($this->cache))
{
//echo "<p>initialising this->cache to array()</p>\n";
$this->cache = array();
}
}
/**
* Magic function called if the object get's unserialized
*
* We unset our cache, which is a reference to the cache of the global account object in $GLOBALS['egw']->accounts,
* as it will be no reference after wakeup (causes cache_invalidate to no longer work).
* For the global accounts object the cache get unset too, as the object was stored in a early state of the framework
* initialisation, and it the cache stored in the session by save_session_cache is a lot more up to date.
*
* @internal
*/
function __wakeup()
{
unset($this->cache);
} }
/** /**
@ -770,14 +791,10 @@ class accounts extends accounts_backend
*/ */
function save_session_cache() function save_session_cache()
{ {
//echo "<p>save_session_cache()".($GLOBALS['egw_info']['flags']['session_cache_setup'] ? 'is setup' : 'is NOT setup')."</p>\n"; if (is_object($GLOBALS['egw']->session) && is_array($GLOBALS['egw']->accounts->cache))
if (// is somehow not longer set! $this->use_session_cache && // are we supposed to use a session-cache
$GLOBALS['egw_info']['flags']['session_cache_setup'] && // is it already setup
// is the account-class ready (startup !)
is_object($GLOBALS['egw']->session))
{ {
//echo "<p>save_session_cache() saving</p>\n"; //echo "<p>save_session_cache() saving</p>\n";
$GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi',$GLOBALS['egw_info']['accounts']['cache']); $GLOBALS['egw']->session->appsession('accounts_cache','phpgwapi',$GLOBALS['egw']->accounts->cache);
} }
} }