GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

You cannot use static that way - using another approach to save reuse the default ldap connection

This commit is contained in:
Craig Andrews 2009-11-18 16:58:06 -05:00
parent 6d69d89cfe
commit a00141a180
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/LdapAuthentication/LdapAuthenticationPlugin.php
View File

@ -159,24 +159,21 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
}
function ldap_get_connection($config = null){
if($config == null){
static $ldap = null;
if($ldap != null){
return $ldap;
}
$config = $this->ldap_get_config();
if($config == null && isset($this->default_ldap)){
return $this->default_ldap;
}
//cannot use Net_LDAP2::connect() as StatusNet uses
//PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
//PEAR handling can be overridden on instance objects, so we do that.
$ldap = new Net_LDAP2($config);
$ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
$ldap->setErrorHandling(PEAR_ERROR_RETURN);
$err=$ldap->bind();
if (Net_LDAP2::isError($err)) {
common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
return false;
}
if($config == null) $this->default_ldap=$ldap;
return $ldap;
}

11
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
View File

@ -158,24 +158,21 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
//-----the below function were copied from LDAPAuthenticationPlugin. They will be moved to a utility class soon.----\\
function ldap_get_connection($config = null){
if($config == null){
static $ldap = null;
if($ldap != null){
return $ldap;
}
$config = $this->ldap_get_config();
if($config == null && isset($this->default_ldap)){
return $this->default_ldap;
}
//cannot use Net_LDAP2::connect() as StatusNet uses
//PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
//PEAR handling can be overridden on instance objects, so we do that.
$ldap = new Net_LDAP2($config);
$ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
$ldap->setErrorHandling(PEAR_ERROR_RETURN);
$err=$ldap->bind();
if (Net_LDAP2::isError($err)) {
common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
return false;
}
if($config == null) $this->default_ldap=$ldap;
return $ldap;
}