deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Fix isLoggedIn() caching for multiple servers

Browse Source
This commit is contained in:
Deon George 2009-07-11 17:20:21 +10:00
parent d364af141f
commit ed4784b1b6
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ds.php
View File

@ -219,18 +219,26 @@ abstract class DS {
* Return if this datastore's connection method has been logged into * Return if this datastore's connection method has been logged into
*/ */
public function isLoggedIn($method=null) { public function isLoggedIn($method=null) {
static $CACHE = null; static $CACHE = array();
$method = $this->getMethod($method); $method = $this->getMethod($method);
if (! is_null($CACHE)) if (isset($CACHE[$this->index]) && ! is_null($CACHE))
return $CACHE; return $CACHE[$this->index];
$CACHE[$this->index] = null;
# For some authentication types, we need to do the login here # For some authentication types, we need to do the login here
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'http': case 'http':
# If our auth vars are not set, throw up a login box. # If our auth vars are not set, throw up a login box.
if (! isset($_SERVER['PHP_AUTH_USER'])) { if (! isset($_SERVER['PHP_AUTH_USER'])) {
# If this server is not in focus, skip the basic auth prompt.
if (get_request('server_id','REQUEST') != $this->getIndex()) {
$CACHE[$this->index] = false;
break;
}
header(sprintf('WWW-Authenticate: Basic realm="%s %s"',app_name(),_('login'))); header(sprintf('WWW-Authenticate: Basic realm="%s %s"',app_name(),_('login')));
if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0') if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0')
@ -245,7 +253,7 @@ abstract class DS {
'body'=>_('Your configuration file has authentication set to HTTP based authentication, however, there was none presented'), 'body'=>_('Your configuration file has authentication set to HTTP based authentication, however, there was none presented'),
'type'=>'error')); 'type'=>'error'));
$CACHE = false; $CACHE[$this->index] = false;
} }
# Check our auth vars are valid. # Check our auth vars are valid.
@ -256,19 +264,19 @@ abstract class DS {
'body'=>_('Your HTTP based authentication is not accepted by the LDAP server'), 'body'=>_('Your HTTP based authentication is not accepted by the LDAP server'),
'type'=>'error')); 'type'=>'error'));
$CACHE = false; $CACHE[$this->index] = false;
} else } else
$CACHE = true; $CACHE[$this->index] = true;
} }
break; break;
default: default:
$CACHE = is_null($this->getLogin($method)) ? false : true; $CACHE[$this->index] = is_null($this->getLogin($method)) ? false : true;
} }
return $CACHE; return $CACHE[$this->index];
} }
/** /**