From c81a4029ff8fd35cfd3f5ae6a4a7ebec5ab6dccb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Aug 2009 20:23:45 +0000 Subject: [PATCH] Fix: A lot of fix on LDAP synchro. --- .../interface_modLdap_Ldapsynchro.class.php | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php index 3d21b51a5ff..96ce4991119 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php @@ -335,13 +335,9 @@ class InterfaceLdapsynchro $ldap=new Ldap(); $ldap->connect_bind(); - $oldobject=$object; // TODO Get oldobject - - $oldinfo=$oldobject->_load_ldap_info(); - $olddn=$oldobject->_load_ldap_dn($oldinfo); - $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); + $olddn=$dn; // We know olddn=dn as we change only status $result=$ldap->update($dn,$info,$user,$olddn); if ($result < 0) @@ -367,13 +363,9 @@ class InterfaceLdapsynchro $ldap=new Ldap(); $ldap->connect_bind(); - $oldobject=$object; // TODO Get oldobject - - $oldinfo=$oldobject->_load_ldap_info(); - $olddn=$oldobject->_load_ldap_dn($oldinfo); - $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); + $olddn=$dn; // We know olddn=dn as we change only subscriptions $result=$ldap->update($dn,$info,$user,$olddn); if ($result < 0) @@ -419,10 +411,11 @@ class InterfaceLdapsynchro $ldap=new Ldap(); $ldap->connect_bind(); - $info=$object->_load_ldap_info(); + $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); + $olddn=$dn; // We know olddn=dn as we change only password - $result=$ldap->update($dn,$info,$user); + $result=$ldap->update($dn,$info,$user,$olddn); if ($result < 0) { $this->error="ErrorLDAP"." ".$ldap->error; @@ -442,13 +435,9 @@ class InterfaceLdapsynchro $ldap=new Ldap(); $ldap->connect_bind(); - $oldobject=$object; // TODO Get oldobject - - $oldinfo=$oldobject->_load_ldap_info(); - $olddn=$oldobject->_load_ldap_dn($oldinfo); - $info=$object->_load_ldap_info(); $dn=$object->_load_ldap_dn($info); + $olddn=$dn; // We know olddn=dn as we change only status $result=$ldap->update($dn,$info,$user,$olddn); if ($result < 0)