New: More robust LDAP synchronizing

Dolibarr · Aug 11, 2009 · 7ef1ef9 · 7ef1ef9
1 parent 9382e5b
commit 7ef1ef9
Show file tree

Hide file tree

Showing 19 changed files with 229 additions and 104 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -32,6 +32,7 @@ For users:
 - New: Add log tab on emailing module.
 - New: Minor enhancements in look themes.
 - New: Add option to hide help in menu.
+- New: Added a "force LDAP synchronize" on member and contact cards.
 - Fix: "Now" link works when date popup is not used.
 - Fix: Debug seriously the email notification module.
 - Fix: Error Call to a member function trans when refusing a supplier order.
@@ -44,6 +45,7 @@ For users:
        new product lines.
 - Fix: CC and BCC in emails was not used if using SMTPS handler.
 - Fix: Last character was lost when text end with n or r.
+- Fix: LDAP synchronization is now more robust.
 
 For translators:
 - Update some language files.
@@ -61,6 +63,8 @@ For developers:
 - Better W3C standard.
 - Can add init data when enabling a module.
 - Can fix some corruptions in database by calling the update page with action=repair
+- Log files contains more information (PHP_SELD added and OS user used for log of 
+  command lines scripts) 
 
 
 ***** Changelog for 2.6 compared to 2.5 *****

diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php
@@ -96,12 +96,12 @@ class Adherent extends CommonObject
 	//  var $public;
 	var $array_options;
 
+	var $oldcopy;		// To contains a clone of this when we need to save old properties of object
 
 
 	/**
-	 \brief Adherent
-	 \param DB		base de donnees
-	 \param id		id de l'adherent
+	 *	\brief Adherent
+	 *	\param DB		base de donnees
 	 */
 	function Adherent($DB)
 	{

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
@@ -209,6 +209,8 @@
 	// Create new object
 	if ($result > 0)
 	{
+		$adh->oldcopy=dol_clone($adh);
+
 		// Modifie valeures
 		$adh->prenom      = trim($_POST["prenom"]);
 		$adh->nom         = trim($_POST["nom"]);

diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
@@ -18,11 +18,11 @@
  */
 
 /**
-        \file       htdocs/adherents/ldap.php
-        \ingroup    ldap
-        \brief      Page fiche LDAP adherent
-        \version    $Id$
-*/
+ *       \file       htdocs/adherents/ldap.php
+ *       \ingroup    ldap
+ *       \brief      Page fiche LDAP adherent
+ *       \version    $Id$
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
@@ -64,7 +64,36 @@
 }
 
 
+/*
+ * Actions
+ */
+
+if ($_GET["action"] == 'dolibarr2ldap')
+{
+	$message="";
+
+	$db->begin();
+
+	$ldap=new Ldap();
+	$result=$ldap->connect_bind();
 
+	$info=$adh->_load_ldap_info();
+	$dn=$adh->_load_ldap_dn($info);
+	$olddn=$dn;	// We can say that old dn = dn as we force synchro
+
+	$result=$ldap->update($dn,$info,$user,$olddn);
+
+	if ($result >= 0)
+	{
+		$message.='<div class="ok">'.$langs->trans("MemberSynchronized").'</div>';
+		$db->commit();
+	}
+	else
+	{
+		$message.='<div class="error">'.$ldap->error.'</div>';
+		$db->rollback();
+	}
+}
 
 
 
@@ -138,7 +167,24 @@
 
 print '</div>';
 
-print '<br>';
+
+if ($message) { print $message; }
+
+
+/*
+ * Barre d'actions
+ */
+
+print '<div class="tabsAction">';
+
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
+{
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$adh->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+}
+
+print "</div>\n";
+
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";
 
 
 

diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
@@ -65,6 +65,8 @@ class Contact extends CommonObject
 	var $user_id;
 	var $user_login;
 
+	var $oldcopy;		// To contains a clone of this when we need to save old properties of object
+
 
 	/**
 	 *      \brief      Constructeur de l'objet contact
@@ -375,7 +377,7 @@ function update_perso($id, $user=0)
 	/*
 	 *    \brief      Charge l'objet contact
 	 *    \param      id          id du contact
-	 *    \param      user        Utilisateur lie au contact pour une alerte
+	 *    \param      user        Utilisateur abonnes aux alertes si on veut les alertes de ce contact
 	 *    \return     int         -1 if KO, 0 if OK but not found, 1 if OK
 	 */
 	function fetch($id, $user=0)
@@ -442,7 +444,7 @@ function fetch($id, $user=0)
 				$this->user_id        = $obj->user_id;
 				$this->user_login     = $obj->user_login;
 
-				// Recherche le user Dolibarr li� � ce contact
+				// Recherche le user Dolibarr lie a ce contact
 				$sql = "SELECT u.rowid ";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 				$sql .= " WHERE u.fk_socpeople = ". $this->id;

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
@@ -144,6 +144,9 @@
 if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact->creer)
 {
 	$contact = new Contact($db);
+	$contact->fetch($_POST["contactid"]);
+
+	$contact->oldcopy=dol_clone($contact);
 
 	$contact->old_name      = $_POST["old_name"];
 	$contact->old_firstname = $_POST["old_firstname"];

diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
@@ -18,11 +18,11 @@
  */
 
 /**
-        \file       htdocs/contact/ldap.php
-        \ingroup    ldap
-        \brief      Page fiche LDAP contact
-        \version    $Id$
-*/
+ *       \file       htdocs/contact/ldap.php
+ *       \ingroup    ldap
+ *       \brief      Page fiche LDAP contact
+ *       \version    $Id$
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
@@ -43,11 +43,41 @@
 $contact->fetch($_GET["id"], $user);
 
 
+/*
+ * Actions
+ */
+
+if ($_GET["action"] == 'dolibarr2ldap')
+{
+	$message="";
+
+	$db->begin();
+
+	$ldap=new Ldap();
+	$result=$ldap->connect_bind();
+
+	$info=$contact->_load_ldap_info();
+	$dn=$contact->_load_ldap_dn($info);
+	$olddn=$dn;	// We can say that old dn = dn as we force synchro
+
+	$result=$ldap->update($dn,$info,$user,$olddn);
+
+	if ($result >= 0)
+	{
+		$message.='<div class="ok">'.$langs->trans("ContactSynchronized").'</div>';
+		$db->commit();
+	}
+	else
+	{
+		$message.='<div class="error">'.$ldap->error.'</div>';
+		$db->rollback();
+	}
+}
 
 
 /*
-*	View
-*/
+ *	View
+ */
 
 llxHeader();
 
@@ -72,16 +102,16 @@
 // Company
 if ($contact->socid > 0)
 {
-    $objsoc = new Societe($db);
-    $objsoc->fetch($contact->socid);
+	$objsoc = new Societe($db);
+	$objsoc->fetch($contact->socid);
 
-    print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
 }
 else
 {
-    print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">';
-    print $langs->trans("ContactNotLinkedToCompany");
-    print '</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">';
+	print $langs->trans("ContactNotLinkedToCompany");
+	print '</td></tr>';
 }
 
 // Civility
@@ -104,7 +134,25 @@
 
 print '</div>';
 
-print '<br>';
+
+if ($message) { print $message; }
+
+
+/*
+ * Barre d'actions
+ */
+
+print '<div class="tabsAction">';
+
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
+{
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$contact->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+}
+
+print "</div>\n";
+
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";
+
 
 
 // Affichage attributs LDAP

diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
@@ -135,10 +135,8 @@ function run_trigger($action,$object,$user,$langs,$conf)
         		$ldap=new Ldap();
         		$ldap->connect_bind();
 
-				$oldobject=$object;	// TODO Get oldobject
-
-        		$oldinfo=$oldobject->_load_ldap_info();
-        		$olddn=$oldobject->_load_ldap_dn($oldinfo);
+        		$oldinfo=$object->oldcopy->_load_ldap_info();
+        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
 
         		$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
@@ -205,10 +203,8 @@ function run_trigger($action,$object,$user,$langs,$conf)
         		$ldap=new Ldap();
         		$ldap->connect_bind();
 
-				$oldobject=$object;	// TODO Get oldobject
-
-        		$oldinfo=$oldobject->_load_ldap_info();
-        		$olddn=$oldobject->_load_ldap_dn($oldinfo);
+        		$oldinfo=$object->oldcopy->_load_ldap_info();
+        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
 
         		$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
@@ -268,10 +264,8 @@ function run_trigger($action,$object,$user,$langs,$conf)
         		$ldap=new Ldap();
         		$ldap->connect_bind();
 
-				$oldobject=$object;	// TODO Get oldobject
-
-        		$oldinfo=$oldobject->_load_ldap_info();
-        		$olddn=$oldobject->_load_ldap_dn($oldinfo);
+        		$oldinfo=$object->oldcopy->_load_ldap_info();
+        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
 
 				$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
@@ -384,10 +378,8 @@ function run_trigger($action,$object,$user,$langs,$conf)
         		$ldap=new Ldap();
         		$ldap->connect_bind();
 
-				$oldobject=$object;	// TODO Get oldobject
-
-        		$oldinfo=$oldobject->_load_ldap_info();
-        		$olddn=$oldobject->_load_ldap_dn($oldinfo);
+        		$oldinfo=$object->oldcopy->_load_ldap_info();
+        		$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
 
         		$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);

diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang
@@ -24,5 +24,7 @@ LDAPFieldLastSubscriptionAmount=Last subscription amount
 SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP)
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
+MemberSynchronized=Member synchronized
+ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
@@ -24,5 +24,7 @@ LDAPFieldLastSubscriptionAmount=Montant dernière adhésion
 SynchronizeDolibarr2Ldap=Synchroniser utilisateur (Dolibarr -> LDAP)
 UserSynchronized=Utilisateur synchronisé
 GroupSynchronized=Groupe synchronisé
+MemberSynchronized=Adhérent synchronisé
+ContactSynchronized=Contact synchronizé
 ForceSynchronize=Forcer synchro Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Echec de la lecture de l'annuaire LDAP. Vérifier la configuration du module LDAP et l'accessibilité de l'annuaire.
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2000-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
@@ -35,6 +35,27 @@
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '..');
 if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php");
 
+
+/**
+ *	\brief          Create a clone of instance of object (new instance with same properties)
+ * 					This function works for both PHP4 and PHP5
+ * 	\param			object		Object to clone
+ *	\return         date		Timestamp
+ */
+function dol_clone($object)
+{
+	dol_syslog("Functions.lib::dol_clone Clone object");
+
+	// We create dynamically a clone function, making a =
+	if (version_compare(phpversion(), '5.0') < 0 && ! function_exists('clone'))
+	{
+		eval('function clone($object){return($object);}');
+	}
+	$myclone=clone($object);
+	return $myclone;
+}
+
+
 /**
  *	\brief          Return date for now
  * 	\param			mode		'gmt' => we return GMT timestamp,