diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index e06d472f326..58eedc0ad9d 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -195,15 +195,15 @@ class Ldap
 				if (is_resource($this->connection))
 				{
 					// Begin TLS if requested by the configuration
-	    			if (! empty($conf->global->LDAP_SERVER_USE_TLS))
-	    			{
-	    			    if (! ldap_start_tls($this->connection))
-	    			    {
-	    			        dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
-	    			        $connected = 0;
-	    			        $this->close();
-	    				}
-	    			}
+					if (! empty($conf->global->LDAP_SERVER_USE_TLS))
+					{
+						if (! ldap_start_tls($this->connection))
+						{
+							dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
+							$connected = 0;
+							$this->close();
+						}
+					}
 
 					// Execute the ldap_set_option here (after connect and before bind)
 					$this->setVersion();
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 561ba330694..9c5112dd68a 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
+/* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2017	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,553 +50,548 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        if (empty($conf->ldap->enabled)) return 0;     // Module not active, we do nothing
+	{
+		if (empty($conf->ldap->enabled)) return 0;     // Module not active, we do nothing
 
-        if (! function_exists('ldap_connect'))
-        {
-        	dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
-        	return 0;
-        }
+		if (! function_exists('ldap_connect'))
+		{
+			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
+			return 0;
+		}
 
-        // Users
-        if ($action == 'USER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
+		$result=0;
 
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
+		// Users
+		if ($action == 'USER_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-	    	    $result=$ldap->add($dn,$info,$user);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->add($dn,$info,$user);
 				}
-				return $result;
-    		}
-        }
-        elseif ($action == 'USER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
 
-        	    if (empty($object->oldcopy) || ! is_object($object->oldcopy))
-                {
-                	dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-					$object->oldcopy = clone $object;
-                }
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'USER_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-        		$oldinfo=$object->oldcopy->_load_ldap_info();
-        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
-
-        		// Verify if entry exist
-        		$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
-        		$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
-        		$records=$ldap->search($container,$search);
-        		if (count($records) && $records['count'] == 0)
-        		{
-        			$olddn = '';
-        		}
-
-        		$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->update($dn,$info,$user,$olddn);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					{
+						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
+						$object->oldcopy = clone $object;
+					}
+
+					$oldinfo=$object->oldcopy->_load_ldap_info();
+					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+
+					// Verify if entry exist
+					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
+					$records=$ldap->search($container,$search);
+					if (count($records) && $records['count'] == 0)
+					{
+						$olddn = '';
+					}
+
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
-				return $result;
-    		}
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-            {
-                $ldap=new Ldap();
-                $ldap->connect_bind();
 
-                if (empty($object->oldcopy) || ! is_object($object->oldcopy))
-                {
-                	dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-					$object->oldcopy = clone $object;
-                }
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'USER_NEW_PASSWORD')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-                $oldinfo=$object->oldcopy->_load_ldap_info();
-                $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
-
-                // Verify if entry exist
-                $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
-                $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
-                $records=$ldap->search($container,$search);
-                if (count($records) && $records['count'] == 0)
-                {
-                    $olddn = '';
-                }
-
-                $info=$object->_load_ldap_info();
-                $dn=$object->_load_ldap_dn($info);
-
-                $result=$ldap->update($dn,$info,$user,$olddn);
-                if ($result < 0)
-                {
-                    $this->error="ErrorLDAP ".$ldap->error;
-                }
-                return $result;
-            }
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->delete($dn);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					{
+						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
+						$object->oldcopy = clone $object;
+					}
+
+					$oldinfo=$object->oldcopy->_load_ldap_info();
+					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+
+					// Verify if entry exist
+					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
+					$records=$ldap->search($container,$search);
+					if (count($records) && $records['count'] == 0)
+					{
+						$olddn = '';
+					}
+
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
-				return $result;
-    		}
-        }
-        elseif ($action == 'USER_SETINGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-            {
-                $ldap=new Ldap();
-                $ldap->connect_bind();
 
-                // Must edit $object->newgroupid
-                $usergroup=new UserGroup($this->db);
-                if ($object->newgroupid > 0)
-                {
-                    $usergroup->fetch($object->newgroupid);
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'USER_ENABLEDISABLE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		}
+		elseif ($action == 'USER_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-                    $oldinfo=$usergroup->_load_ldap_info();
-                    $olddn=$usergroup->_load_ldap_dn($oldinfo);
+				if ($result > 0)
+				{
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
 
-                    // Verify if entry exist
-                    $container=$usergroup->_load_ldap_dn($oldinfo,1);
-                    $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";
-                    $records=$ldap->search($container,$search);
-                    if (count($records) && $records['count'] == 0)
-                    {
-                        $olddn = '';
-                    }
+					$result=$ldap->delete($dn);
+				}
 
-                    $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-                    $dn=$usergroup->_load_ldap_dn($info);
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'USER_SETINGROUP')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-                    $result=$ldap->update($dn,$info,$user,$olddn);
-                    if ($result < 0)
-                    {
-                        $this->error="ErrorLDAP ".$ldap->error;
-                    }
-                }
-                return $result;
-            }
-        }
-        elseif ($action == 'USER_REMOVEFROMGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-            {
-                $ldap=new Ldap();
-                $ldap->connect_bind();
+				if ($result > 0)
+				{
+					// Must edit $object->newgroupid
+					$usergroup=new UserGroup($this->db);
+					if ($object->newgroupid > 0)
+					{
+						$usergroup->fetch($object->newgroupid);
 
-                // Must edit $object->newgroupid
-                $usergroup=new UserGroup($this->db);
-                if ($object->oldgroupid > 0)
-                {
-                    $usergroup->fetch($object->oldgroupid);
+						$oldinfo=$usergroup->_load_ldap_info();
+						$olddn=$usergroup->_load_ldap_dn($oldinfo);
 
-                    $oldinfo=$usergroup->_load_ldap_info();
-                    $olddn=$usergroup->_load_ldap_dn($oldinfo);
+						// Verify if entry exist
+						$container=$usergroup->_load_ldap_dn($oldinfo,1);
+						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";
+						$records=$ldap->search($container,$search);
+						if (count($records) && $records['count'] == 0)
+						{
+							$olddn = '';
+						}
 
-                    // Verify if entry exist
-                    $container=$usergroup->_load_ldap_dn($oldinfo,1);
-                    $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";
-                    $records=$ldap->search($container,$search);
-                    if (count($records) && $records['count'] == 0)
-                    {
-                        $olddn = '';
-                    }
+						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+						$dn=$usergroup->_load_ldap_dn($info);
 
-                    $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-                    $dn=$usergroup->_load_ldap_dn($info);
+						$result=$ldap->update($dn,$info,$user,$olddn);
+					}
+				}
 
-                    $result=$ldap->update($dn,$info,$user,$olddn);
-                    if ($result < 0)
-                    {
-                        $this->error="ErrorLDAP ".$ldap->error;
-                    }
-                }
-                return $result;
-            }
-        }
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'USER_REMOVEFROMGROUP')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					// Must edit $object->newgroupid
+					$usergroup=new UserGroup($this->db);
+					if ($object->oldgroupid > 0)
+					{
+						$usergroup->fetch($object->oldgroupid);
+
+						$oldinfo=$usergroup->_load_ldap_info();
+						$olddn=$usergroup->_load_ldap_dn($oldinfo);
+
+						// Verify if entry exist
+						$container=$usergroup->_load_ldap_dn($oldinfo,1);
+						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";
+						$records=$ldap->search($container,$search);
+						if (count($records) && $records['count'] == 0)
+						{
+							$olddn = '';
+						}
+
+						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+						$dn=$usergroup->_load_ldap_dn($info);
+
+						$result=$ldap->update($dn,$info,$user,$olddn);
+					}
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
 
 		// Groupes
-        elseif ($action == 'GROUP_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
+		elseif ($action == 'GROUP_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-				// Get a gid number for objectclass PosixGroup
-				if(in_array('posixGroup',$info['objectclass']))
-					$info['gidNumber'] = $ldap->getNextGroupGid();
-
-	    	    $result=$ldap->add($dn,$info,$user);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					// Get a gid number for objectclass PosixGroup
+					if (in_array('posixGroup',$info['objectclass'])) {
+						$info['gidNumber'] = $ldap->getNextGroupGid();
+					}
+
+					$result=$ldap->add($dn,$info,$user);
 				}
-				return $result;
-    		}
-		}
-        elseif ($action == 'GROUP_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
 
-        	    if (empty($object->oldcopy) || ! is_object($object->oldcopy))
-                {
-                	dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-					$object->oldcopy = clone $object;
-                }
-
-        		$oldinfo=$object->oldcopy->_load_ldap_info();
-        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
-
-        	    // Verify if entry exist
-        		$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
-        		$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
-        		$records=$ldap->search($container,$search);
-        		if (count($records) && $records['count'] == 0)
-        		{
-        			$olddn = '';
-        		}
-
-        		$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->update($dn,$info,$user,$olddn);
-				if ($result < 0)
-				{
-					$this->error="ErrorLDAP ".$ldap->error;
-				}
-				return $result;
-    		}
-		}
-        elseif ($action == 'GROUP_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->delete($dn);
-				if ($result < 0)
-				{
-					$this->error="ErrorLDAP ".$ldap->error;
-				}
-				return $result;
-    		}
-		}
-
-        // Contacts
-        elseif ($action == 'CONTACT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-	      	if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->add($dn,$info,$user);
-				if ($result < 0)
-				{
-					$this->error="ErrorLDAP ".$ldap->error;
-				}
-				return $result;
-    		}
-        }
-        elseif ($action == 'CONTACT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
-
-        	    if (empty($object->oldcopy) || ! is_object($object->oldcopy))
-                {
-                	dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-					$object->oldcopy = clone $object;
-                }
-
-        		$oldinfo=$object->oldcopy->_load_ldap_info();
-        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
-
-        		// Verify if entry exist
-        		$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
-        		$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
-        		$records=$ldap->search($container,$search);
-        		if (count($records) && $records['count'] == 0)
-        		{
-        			$olddn = '';
-        		}
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->update($dn,$info,$user,$olddn);
-				if ($result < 0)
-				{
-					$this->error="ErrorLDAP ".$ldap->error;
-				}
-				return $result;
-    		}
-        }
-        elseif ($action == 'CONTACT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-	    	if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
-	    	{
-	    		$ldap=new Ldap();
-	    		$ldap->connect_bind();
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->delete($dn);
-				if ($result < 0)
-				{
-					$this->error="ErrorLDAP ".$ldap->error;
-				}
-	    	    return $result;
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 			}
-        }
+		}
+		elseif ($action == 'GROUP_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-        // Members
-        elseif ($action == 'MEMBER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
-
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->add($dn,$info,$user);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					{
+						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
+						$object->oldcopy = clone $object;
+					}
+
+					$oldinfo=$object->oldcopy->_load_ldap_info();
+					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+
+					// Verify if entry exist
+					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
+					$records=$ldap->search($container,$search);
+					if (count($records) && $records['count'] == 0)
+					{
+						$olddn = '';
+					}
+
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
-	    	    return $result;
-    		}
-        }
-        elseif ($action == 'MEMBER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'GROUP_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->delete($dn);
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+
+		// Contacts
+		elseif ($action == 'CONTACT_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->add($dn,$info,$user);
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'CONTACT_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					{
+						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
+						$object->oldcopy = clone $object;
+					}
+
+					$oldinfo=$object->oldcopy->_load_ldap_info();
+					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+
+					// Verify if entry exist
+					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
+					$records=$ldap->search($container,$search);
+					if (count($records) && $records['count'] == 0)
+					{
+						$olddn = '';
+					}
+
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->update($dn,$info,$user,$olddn);
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'CONTACT_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->delete($dn);
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+
+		// Members
+		elseif ($action == 'MEMBER_CREATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
+
+				if ($result > 0)
+				{
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->add($dn,$info,$user);
+				}
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'MEMBER_VALIDATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
 				// If status field is setup to be synchronized
 				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
 				{
 					$ldap=new Ldap();
-	        		$ldap->connect_bind();
+					$result=$ldap->connect_bind();
 
-	        		$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)
+					if ($result > 0)
 					{
-						$this->error="ErrorLDAP ".$ldap->error;
+						$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);
 					}
-		    	    return $result;
+
+					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 				}
 			}
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
+		}
+		elseif ($action == 'MEMBER_SUBSCRIPTION')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
 				// If subscriptions fields are setup to be synchronized
 				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE
-				|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT
-				|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE
-				|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT
-				|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
+					|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT
+					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE
+					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT
+					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
 				{
 					$ldap=new Ldap();
-	        		$ldap->connect_bind();
+					$result=$ldap->connect_bind();
 
-	        		$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)
+					if ($result > 0)
 					{
-						$this->error="ErrorLDAP ".$ldap->error;
+						$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);
 					}
-		    	    return $result;
+
+					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 				}
 			}
-        }
-        elseif ($action == 'MEMBER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
-        		$ldap=new Ldap();
-        		$ldap->connect_bind();
+		}
+		elseif ($action == 'MEMBER_MODIFY')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
+				$ldap=new Ldap();
+				$result=$ldap->connect_bind();
 
-        	    if (empty($object->oldcopy) || ! is_object($object->oldcopy))
-                {
-                	dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-					$object->oldcopy = clone $object;
-                }
-
-        		$oldinfo=$object->oldcopy->_load_ldap_info();
-        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
-
-        		// Verify if entry exist
-        		$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
-        		$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
-        		$records=$ldap->search($container,$search);
-        		if (count($records) && $records['count'] == 0)
-        		{
-        			$olddn = '';
-        		}
-
-        		$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-	    	    $result=$ldap->update($dn,$info,$user,$olddn);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					{
+						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
+						$object->oldcopy = clone $object;
+					}
+
+					$oldinfo=$object->oldcopy->_load_ldap_info();
+					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+
+					// Verify if entry exist
+					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);
+					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";
+					$records=$ldap->search($container,$search);
+					if (count($records) && $records['count'] == 0)
+					{
+						$olddn = '';
+					}
+
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
-	    	    return $result;
-    		}
-        }
-        elseif ($action == 'MEMBER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+			}
+		}
+		elseif ($action == 'MEMBER_NEW_PASSWORD')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
 				// If password field is setup to be synchronized
 				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
 				{
 					$ldap=new Ldap();
-	        		$ldap->connect_bind();
+					$result=$ldap->connect_bind();
 
-        			$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,$olddn);
-					if ($result < 0)
+					if ($result > 0)
 					{
-						$this->error="ErrorLDAP ".$ldap->error;
+						$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,$olddn);
 					}
-		    	    return $result;
+
+					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 				}
 			}
 		}
-        elseif ($action == 'MEMBER_RESILIATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
-        	{
+		elseif ($action == 'MEMBER_RESILIATE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			{
 				// If status field is setup to be synchronized
 				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
 				{
 					$ldap=new Ldap();
-	        		$ldap->connect_bind();
+					$result=$ldap->connect_bind();
 
-	        		$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)
+					if ($result > 0)
 					{
-						$this->error="ErrorLDAP ".$ldap->error;
+						$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);
 					}
-		    	    return $result;
+
+					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 				}
 			}
-        }
-        elseif ($action == 'MEMBER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		}
+		elseif ($action == 'MEMBER_DELETE')
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
 			{
 				$ldap=new Ldap();
-				$ldap->connect_bind();
+				$result=$ldap->connect_bind();
 
-				$info=$object->_load_ldap_info();
-				$dn=$object->_load_ldap_dn($info);
-
-				$result=$ldap->delete($dn);
-				if ($result < 0)
+				if ($result > 0)
 				{
-					$this->error="ErrorLDAP ".$ldap->error;
+					$info=$object->_load_ldap_info();
+					$dn=$object->_load_ldap_dn($info);
+
+					$result=$ldap->delete($dn);
 				}
-				return $result;
+
+				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
 			}
         }
 
-		// If not found
-/*
-        else
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
-			return -1;
-        }
-*/
-		return 0;
+        return $result;
     }
 
 }