diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 568b2a335f3..73304b232ee 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -169,7 +169,7 @@ class Ldap if ($this->serverType == "activedirectory") { $result=$this->setReferrals(); - dol_syslog("Ldap::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser,LOG_DEBUG); + dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser,LOG_DEBUG); $this->result=$this->bindauth($this->searchUser,$this->searchPassword); if ($this->result) { @@ -187,7 +187,7 @@ class Ldap // Try in auth mode if ($this->searchUser && $this->searchPassword) { - dol_syslog("Ldap::connect_bind try bindauth on ".$host." user=".$this->searchUser,LOG_DEBUG); + dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser,LOG_DEBUG); $this->result=$this->bindauth($this->searchUser,$this->searchPassword); if ($this->result) { @@ -203,7 +203,7 @@ class Ldap // Try in anonymous if (! $this->bind) { - dol_syslog("Ldap::connect_bind try bind on ".$host,LOG_DEBUG); + dol_syslog(get_class($this)."::connect_bind try bind on ".$host,LOG_DEBUG); $result=$this->bind(); if ($result) { @@ -225,13 +225,13 @@ class Ldap if ($connected) { $return=$connected; - dol_syslog("Ldap::connect_bind return=".$return, LOG_DEBUG); + dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG); } else { $this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:''); $return=-1; - dol_syslog("Ldap::connect_bind return=".$return.' - '.$this->error, LOG_WARNING); + dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING); } return $return; } @@ -419,7 +419,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::modify dn=".$dn." info=".join(',',$info)); + dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',',$info)); // Check parameters if (! $this->connection) @@ -447,13 +447,13 @@ class Ldap if ($result) { - dol_syslog("Ldap::modify successfull", LOG_DEBUG); + dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG); return 1; } else { $this->error=@ldap_error($this->connection); - dol_syslog("Ldap::modify failed: ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR); return -1; } } @@ -472,7 +472,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::update dn=".$dn." olddn=".$olddn); + dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn); // Check parameters if (! $this->connection) @@ -501,13 +501,13 @@ class Ldap if ($result <= 0) { $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error; - dol_syslog("Ldap::update ".$this->error,LOG_ERR); + dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR); //print_r($info); return -1; } else { - dol_syslog("Ldap::update done successfully"); + dol_syslog(get_class($this)."::update done successfully"); return 1; } } @@ -524,7 +524,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::delete Delete LDAP entry dn=".$dn); + dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn); // Check parameters if (! $this->connection) @@ -638,7 +638,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::addAttribute dn=".$dn." info=".join(',',$info)); + dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',',$info)); // Check parameters if (! $this->connection) @@ -666,13 +666,13 @@ class Ldap if ($result) { - dol_syslog("Ldap::add_attribute successfull", LOG_DEBUG); + dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG); return 1; } else { $this->error=@ldap_error($this->connection); - dol_syslog("Ldap::add_attribute failed: ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR); return -1; } } @@ -690,7 +690,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::updateAttribute dn=".$dn." info=".join(',',$info)); + dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',',$info)); // Check parameters if (! $this->connection) @@ -718,13 +718,13 @@ class Ldap if ($result) { - dol_syslog("Ldap::updateAttribute successfull", LOG_DEBUG); + dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG); return 1; } else { $this->error=@ldap_error($this->connection); - dol_syslog("Ldap::updateAttribute failed: ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR); return -1; } } @@ -742,7 +742,7 @@ class Ldap { global $conf; - dol_syslog("Ldap::deleteAttribute dn=".$dn." info=".join(',',$info)); + dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',',$info)); // Check parameters if (! $this->connection) @@ -770,13 +770,13 @@ class Ldap if ($result) { - dol_syslog("Ldap::deleteAttribute successfull", LOG_DEBUG); + dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG); return 1; } else { $this->error=@ldap_error($this->connection); - dol_syslog("Ldap::deleteAttribute failed: ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR); return -1; } } @@ -872,21 +872,21 @@ class Ldap * @param string $search Valeur champ cle recherche, sinon '*' pour tous. * @param string $userDn DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org) * @param string $useridentifier Name of key field (Ex: uid) - * @param array $attributeArray Array of fields required (Ex: sn,userPassword) - * @param int $activefilter 1=utilise le champ this->filter comme filtre + * @param array $attributeArray Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword) + * @param int $activefilter 1=use field this->filter as filter instead of parameter $search * @return array Array of [id_record][ldap_field]=value */ function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0) { $fulllist=array(); - dol_syslog("Ldap::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")"); + dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")"); // if the directory is AD, then bind first with the search user first if ($this->serverType == "activedirectory") { $this->bindauth($this->searchUser, $this->searchPassword); - dol_syslog("Ldap::bindauth serverType=activedirectory searchUser=".$this->searchUser); + dol_syslog(get_class($this)."::bindauth serverType=activedirectory searchUser=".$this->searchUser); } // Define filter @@ -910,14 +910,14 @@ class Ldap { // Return list with required fields $attributeArray=array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails) - dol_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")"); + dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")"); //var_dump($attributeArray); $this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray); } else { // Return list with fields selected by default - dol_syslog("Ldap::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter); + dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter); $this->result = @ldap_search($this->connection, $userDn, $filter); } if (!$this->result) @@ -1075,7 +1075,7 @@ class Ldap */ function search($checkDn, $filter) { - dol_syslog("Ldap::search checkDn=".$checkDn." filter=".$filter); + dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter); $checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset); $filter=$this->convFromOutputCharset($filter,$this->ldapcharset); @@ -1124,7 +1124,7 @@ class Ldap $i=0; while ($i <= 2) { - dol_syslog("Ldap::fetch search with searchDN=".$searchDN." filter=".$filter); + dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter); $this->result = @ldap_search($this->connection, $searchDN, $filter); if ($this->result) { @@ -1136,7 +1136,7 @@ class Ldap else { $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection); - dol_syslog("Ldap::fetch search fails"); + dol_syslog(get_class($this)."::fetch search fails"); return -1; }