Fix: A lot of fix on LDAP synchro.
This commit is contained in:
parent
51cc44ba2e
commit
c81a4029ff
@ -335,13 +335,9 @@ class InterfaceLdapsynchro
|
|||||||
$ldap=new Ldap();
|
$ldap=new Ldap();
|
||||||
$ldap->connect_bind();
|
$ldap->connect_bind();
|
||||||
|
|
||||||
$oldobject=$object; // TODO Get oldobject
|
|
||||||
|
|
||||||
$oldinfo=$oldobject->_load_ldap_info();
|
|
||||||
$olddn=$oldobject->_load_ldap_dn($oldinfo);
|
|
||||||
|
|
||||||
$info=$object->_load_ldap_info();
|
$info=$object->_load_ldap_info();
|
||||||
$dn=$object->_load_ldap_dn($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);
|
$result=$ldap->update($dn,$info,$user,$olddn);
|
||||||
if ($result < 0)
|
if ($result < 0)
|
||||||
@ -367,13 +363,9 @@ class InterfaceLdapsynchro
|
|||||||
$ldap=new Ldap();
|
$ldap=new Ldap();
|
||||||
$ldap->connect_bind();
|
$ldap->connect_bind();
|
||||||
|
|
||||||
$oldobject=$object; // TODO Get oldobject
|
|
||||||
|
|
||||||
$oldinfo=$oldobject->_load_ldap_info();
|
|
||||||
$olddn=$oldobject->_load_ldap_dn($oldinfo);
|
|
||||||
|
|
||||||
$info=$object->_load_ldap_info();
|
$info=$object->_load_ldap_info();
|
||||||
$dn=$object->_load_ldap_dn($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);
|
$result=$ldap->update($dn,$info,$user,$olddn);
|
||||||
if ($result < 0)
|
if ($result < 0)
|
||||||
@ -419,10 +411,11 @@ class InterfaceLdapsynchro
|
|||||||
$ldap=new Ldap();
|
$ldap=new Ldap();
|
||||||
$ldap->connect_bind();
|
$ldap->connect_bind();
|
||||||
|
|
||||||
$info=$object->_load_ldap_info();
|
$info=$object->_load_ldap_info();
|
||||||
$dn=$object->_load_ldap_dn($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)
|
if ($result < 0)
|
||||||
{
|
{
|
||||||
$this->error="ErrorLDAP"." ".$ldap->error;
|
$this->error="ErrorLDAP"." ".$ldap->error;
|
||||||
@ -442,13 +435,9 @@ class InterfaceLdapsynchro
|
|||||||
$ldap=new Ldap();
|
$ldap=new Ldap();
|
||||||
$ldap->connect_bind();
|
$ldap->connect_bind();
|
||||||
|
|
||||||
$oldobject=$object; // TODO Get oldobject
|
|
||||||
|
|
||||||
$oldinfo=$oldobject->_load_ldap_info();
|
|
||||||
$olddn=$oldobject->_load_ldap_dn($oldinfo);
|
|
||||||
|
|
||||||
$info=$object->_load_ldap_info();
|
$info=$object->_load_ldap_info();
|
||||||
$dn=$object->_load_ldap_dn($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);
|
$result=$ldap->update($dn,$info,$user,$olddn);
|
||||||
if ($result < 0)
|
if ($result < 0)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user