index 2bbb1d875ee9a5365f04a675af57c5ed22f27b1e..1aaa8e800c557389bb2888cd22edbfe0a93dc820 100644 (file)
$this->hostname=$hostname;
/* Check if MAX_LDAP_QUERY_TIME is defined */
$this->hostname=$hostname;
/* Check if MAX_LDAP_QUERY_TIME is defined */
- if(isset($config->data['MAIN']['MAX_LDAP_QUERY_TIME'])){
- $str = $config->data['MAIN']['MAX_LDAP_QUERY_TIME'];
+ if($config->get_cfg_value("max_ldap_query_time") != ""){
+ $str = $config->get_cfg_value("max_ldap_query_time");
$this->max_ldap_query_time = (float)($str);
}
$this->max_ldap_query_time = (float)($str);
}
*/
function rename_dn($source,$dest)
{
*/
function rename_dn($source,$dest)
{
+ $source = LDAP::fix($source);
+ $dest = LDAP::fix($dest);
+
/* Check if source and destination are the same entry */
if(strtolower($source) == strtolower($dest)){
trigger_error("Source and destination can't be the same entry.");
/* Check if source and destination are the same entry */
if(strtolower($source) == strtolower($dest)){
trigger_error("Source and destination can't be the same entry.");
+ $this->error = "Source and destination can't be the same entry.";
return(FALSE);
}
/* Check if destination entry exists */
if($this->dn_exists($dest)){
trigger_error("Destination '$dest' already exists.");
return(FALSE);
}
/* Check if destination entry exists */
if($this->dn_exists($dest)){
trigger_error("Destination '$dest' already exists.");
+ $this->error = "Destination '$dest' already exists.";
return(FALSE);
}
return(FALSE);
}
if($this->hascon){
if ($this->reconnect) $this->connect();
if($this->hascon){
if ($this->reconnect) $this->connect();
- $r= @ldap_rename($this->cid,$source,$dest_rdn,$parent,TRUE);
- $this->error = @ldap_error($this->cid);
+ $r= ldap_rename($this->cid,$source,$dest_rdn,$parent,TRUE);
+ $this->error = ldap_error($this->cid);
/* Check if destination dn exists, if not the
server may not support this operation */
/* Check if destination dn exists, if not the
server may not support this operation */
- $r &= $this->dn_exists($dest);
- return(!$r ? $r : TRUE);
+ $r &= is_resource($this->dn_exists($dest));
+ return($r);
}else{
$this->error = "Could not connect to LDAP server";
return(FALSE);
}else{
$this->error = "Could not connect to LDAP server";
return(FALSE);
/* Only read schema if it is allowed */
if(isset($config) && preg_match("/config/i",get_class($config))){
/* Only read schema if it is allowed */
if(isset($config) && preg_match("/config/i",get_class($config))){
- if(!isset($config->data['MAIN']['SCHEMA_CHECK']) || !preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
+ if ($config->get_cfg_value("schema_check") != "true"){
return($objectclasses);
}
}
return($objectclasses);
}
}
}
# Get base to look for schema
}
# Get base to look for schema
- $sr = @ldap_read ($this->cid, NULL, "objectClass=*", array("subschemaSubentry"));
- if(!$sr){
- $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry"));
- }
-
+ $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry"));
$attr = @ldap_get_entries($this->cid,$sr);
if (!isset($attr[0]['subschemasubentry'][0])){
return array();
$attr = @ldap_get_entries($this->cid,$sr);
if (!isset($attr[0]['subschemasubentry'][0])){
return array();
if(class_available("session")){
session::set("LDAP_CACHE::get_objectclasses",$objectclasses);
}
if(class_available("session")){
session::set("LDAP_CACHE::get_objectclasses",$objectclasses);
}
+
return $objectclasses;
}
return $objectclasses;
}