bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-22 09:59:06 +01:00
Code Issues Projects Releases Wiki Activity

- Correction bug [#1672] Les attributs vides ne sont pas supprimés

Browse source
This commit is contained in:
Benjamin Renard 2008-05-15 10:01:59 +00:00
parent c6bcdfeafa
commit 6e8c58392d
1 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
trunk/includes/class/class.LSldap.php
View file

@ -176,11 +176,11 @@ class LSldap {
* @param[in] $dn string DN de l'entré Ldap
*
* @retval ldapentry|array Un objet ldapentry (PEAR::Net_LDAP2)
* ou un tableau (si c'est une nouvelle entrée):
* Array (
* 'entry' => ldapentry,
* 'new' => true
* )
* ou un tableau (si c'est une nouvelle entrée):
* Array (
* 'entry' => ldapentry,
* 'new' => true
* )
*/
function getEntry($object_type,$dn) {
if(isset($GLOBALS['LSobjects'][$object_type])){
@ -189,17 +189,17 @@ class LSldap {
if (Net_LDAP2::isError($entry)) {
//$newentry = new Net_LDAP2_Entry(&$this -> cnx);
//$newentry -> dn($dn);
//$newentry -> add(array('objectclass' => $obj_conf['objectclass']));
//$newentry -> add(array('objectclass' => $obj_conf['objectclass']));
//foreach($obj_conf['attrs'] as $attr_name => $attr_conf) {
// $newentry->add(array($attr_name => $attr_conf['default_value']));
//}
$attributes = array(
'objectclass' => $obj_conf['objectclass']
);
foreach($obj_conf['attrs'] as $attr_name => $attr_conf) {
if( isset($attr_conf['default_value']) ) {
$attributes[$attr_name]=$attr_conf['default_value'];
}
$attributes = array(
'objectclass' => $obj_conf['objectclass']
);
foreach($obj_conf['attrs'] as $attr_name => $attr_conf) {
if( isset($attr_conf['default_value']) ) {
$attributes[$attr_name]=$attr_conf['default_value'];
}
}
$newentry = Net_LDAP2_Entry::createFresh($dn,$attributes);
@ -231,14 +231,14 @@ class LSldap {
function update($object_type,$dn,$change) {
debug($change);
$dropAttr=array();
$entry=$this -> getEntry($object_type,$dn);
if (is_array($entry)) {
$new = $entry['new'];
$entry = $entry['entry'];
}
else {
$new = false;
}
$entry=$this -> getEntry($object_type,$dn);
if (is_array($entry)) {
$new = $entry['new'];
$entry = $entry['entry'];
}
else {
$new = false;
}
if($entry) {
foreach($change as $attrName => $attrVal) {
@ -265,23 +265,28 @@ class LSldap {
debug('change : <pre>'.print_r($changeData,true).'</pre>');
debug('drop : <pre>'.print_r($dropAttr,true).'</pre>');
if ($new) {
$ret = $this -> cnx -> add($entry);
}
else {
$ret = $entry -> update();
}
if ($new) {
$ret = $this -> cnx -> add($entry);
}
else {
$ret = $entry -> update();
}
if (Net_LDAP2::isError($ret)) {
$GLOBALS['LSerror'] -> addErrorCode(5,$dn);
debug('NetLdap-Error : '.$ret->getMessage());
}
else {
if (!empty($dropAttr)) {
foreach($dropAttr as $attr) {
$entry -> delete($attr);
}
}
if (!empty($dropAttr)) {
foreach($dropAttr as $attr) {
$entry -> delete($attr);
}
$ret = $entry -> update();
if (Net_LDAP2::isError($ret)) {
debug('Erreur durant la suppression des attributs vides');
debug('NetLdap-Error : '.$ret->getMessage());
}
}
return true;
}
}