alxarafe / alixar

dolibarr/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php

Indentation +210 added lines, -210 removed lines

@@ -50,221 +50,221 @@
         $this->db = $db;
 
         $this->name = preg_replace('/^Interface/i', '', get_class($this));
-	    $this->family = 'stripe';
+        $this->family = 'stripe';
         $this->description = "Triggers of the module Stripe";
         $this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
         $this->picto = 'stripe@stripe';
     }
 
-	/**
-	 * Trigger name
-	 *
-	 * @return string Name of trigger file
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-
-	/**
-	 * Trigger description
-	 *
-	 * @return string Description of trigger file
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-	/**
-	 * Trigger version
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') {
-			return $langs->trans("Development");
-		} elseif ($this->version == 'experimental') {
-			return $langs->trans("Experimental");
-		} elseif ($this->version == 'dolibarr') {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file
-	 * is inside directory core/triggers
-	 *
-	 * @param 	string 			$action 	Event action code
-	 * @param 	CommonObject 	$object 	Object
-	 * @param 	User 			$user 		Object user
-	 * @param 	Translate 		$langs 		Object langs
-	 * @param 	Conf 			$conf 		Object conf
-	 * @return 	int              			<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
-		// Put here code you want to execute when a Dolibarr business event occurs.
-		// Data and type of action are stored into $object and $action
-		global $langs, $db, $conf;
-
-		// Load translation files required by the page
+    /**
+     * Trigger name
+     *
+     * @return string Name of trigger file
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+
+    /**
+     * Trigger description
+     *
+     * @return string Description of trigger file
+     */
+    public function getDesc()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Trigger version
+     *
+     * @return string Version of trigger file
+     */
+    public function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == 'development') {
+            return $langs->trans("Development");
+        } elseif ($this->version == 'experimental') {
+            return $langs->trans("Experimental");
+        } elseif ($this->version == 'dolibarr') {
+            return DOL_VERSION;
+        } elseif ($this->version) {
+            return $this->version;
+        } else {
+            return $langs->trans("Unknown");
+        }
+    }
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file
+     * is inside directory core/triggers
+     *
+     * @param 	string 			$action 	Event action code
+     * @param 	CommonObject 	$object 	Object
+     * @param 	User 			$user 		Object user
+     * @param 	Translate 		$langs 		Object langs
+     * @param 	Conf 			$conf 		Object conf
+     * @return 	int              			<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
+        // Put here code you want to execute when a Dolibarr business event occurs.
+        // Data and type of action are stored into $object and $action
+        global $langs, $db, $conf;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("members","other","users","mails"));
 
-		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-		$stripe = new Stripe($db);
-
-		if (empty($conf->stripe->enabled)) return 0;
-
-		$ok = 1;
-
-		$service = 'StripeTest';
-		$servicestatus = 0;
-		if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
-		{
-			$service = 'StripeLive';
-			$servicestatus = 1;
-		}
-
-		// If customer is linked to Stripe, we update/delete Stripe too
-		if ($action == 'COMPANY_MODIFY') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
-
-			if ($object->client != 0) {
-				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);	// This make a network request
-				if ($customer)
-				{
-					$namecleaned = $object->name ? $object->name : null;
-					$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
-
-					$taxinfo = array('type'=>'vat');
-					if ($vatcleaned)
-					{
-						$taxinfo["tax_id"] = $vatcleaned;
-					}
-					// We force data to "null" if not defined as expected by Stripe
-					if (empty($vatcleaned)) $taxinfo=null;
-
-					// Detect if we change a Stripe info (email, description, vat id)
-					$changerequested = 0;
-					if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
-					if ($namecleaned != $customer->description) $changerequested++;
-					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
-					{
-						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
-					}
-
-					if ($changerequested)
-					{
-						if (! empty($object->email)) $customer->email = $object->email;
-						$customer->description = $namecleaned;
-						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
-						else $customer->tax_info = $taxinfo;
-
-						$customer->save();
-					}
-				}
-			}
-		}
-		if ($action == 'COMPANY_DELETE') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
-
-			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-			if ($customer)
-			{
-				$customer->delete();
-			}
-
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
-			$sql.= " WHERE site='stripe' AND fk_soc = " . $object->id;
-			$this->db->query($sql);
-		}
-
-		// If payment mode is linked to Stripee, we update/delete Stripe too
-		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
-
-			// For creation of credit card, we do not create in Stripe automatically
-		}
-		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-			if (! empty($object->stripe_card_ref))
-			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
-
-				if ($stripecu)
-				{
-					// Get customer (required to get a card)
-					if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::retrieve($stripecu);
-					} else {
-						$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
-					}
-
-					if ($customer)
-					{
-						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
-						if ($card) {
-							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
-							try {
-								$card->save($dataforcard);
-							}
-							catch(Exception $e)
-							{
-								$ok = -1;
-								$this->error = $e->getMessages();
-							}
-						}
-					}
-				}
-			}
-		}
-		if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-			if (! empty($object->stripe_card_ref))
-			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
-
-				if ($stripecu)
-				{
-					// Get customer (required to get a card)
-					if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::retrieve($stripecu);
-					} else {
-						$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
-					}
-
-					if ($customer)
-					{
-						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
-						if ($card) {
-							if (method_exists($card, 'detach')) $card->detach();
-							else $card->delete();
-						}
-					}
-				}
-			}
-		}
-
-		return $ok;
-	}
+        require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+        $stripe = new Stripe($db);
+
+        if (empty($conf->stripe->enabled)) return 0;
+
+        $ok = 1;
+
+        $service = 'StripeTest';
+        $servicestatus = 0;
+        if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
+        {
+            $service = 'StripeLive';
+            $servicestatus = 1;
+        }
+
+        // If customer is linked to Stripe, we update/delete Stripe too
+        if ($action == 'COMPANY_MODIFY') {
+            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+            $stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+
+            if ($object->client != 0) {
+                $customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);	// This make a network request
+                if ($customer)
+                {
+                    $namecleaned = $object->name ? $object->name : null;
+                    $vatcleaned = $object->tva_intra ? $object->tva_intra : null;
+
+                    $taxinfo = array('type'=>'vat');
+                    if ($vatcleaned)
+                    {
+                        $taxinfo["tax_id"] = $vatcleaned;
+                    }
+                    // We force data to "null" if not defined as expected by Stripe
+                    if (empty($vatcleaned)) $taxinfo=null;
+
+                    // Detect if we change a Stripe info (email, description, vat id)
+                    $changerequested = 0;
+                    if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
+                    if ($namecleaned != $customer->description) $changerequested++;
+                    if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
+                    elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
+                    elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
+                    {
+                        if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
+                    }
+
+                    if ($changerequested)
+                    {
+                        if (! empty($object->email)) $customer->email = $object->email;
+                        $customer->description = $namecleaned;
+                        if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
+                        else $customer->tax_info = $taxinfo;
+
+                        $customer->save();
+                    }
+                }
+            }
+        }
+        if ($action == 'COMPANY_DELETE') {
+            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+            $stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+
+            $customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+            if ($customer)
+            {
+                $customer->delete();
+            }
+
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
+            $sql.= " WHERE site='stripe' AND fk_soc = " . $object->id;
+            $this->db->query($sql);
+        }
+
+        // If payment mode is linked to Stripee, we update/delete Stripe too
+        if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
+
+            // For creation of credit card, we do not create in Stripe automatically
+        }
+        if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
+            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+            if (! empty($object->stripe_card_ref))
+            {
+                $stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
+                $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+
+                if ($stripecu)
+                {
+                    // Get customer (required to get a card)
+                    if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+                        $customer = \Stripe\Customer::retrieve($stripecu);
+                    } else {
+                        $customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
+                    }
+
+                    if ($customer)
+                    {
+                        $card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
+                        if ($card) {
+                            $card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
+                            try {
+                                $card->save($dataforcard);
+                            }
+                            catch(Exception $e)
+                            {
+                                $ok = -1;
+                                $this->error = $e->getMessages();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
+            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+            if (! empty($object->stripe_card_ref))
+            {
+                $stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
+                $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+
+                if ($stripecu)
+                {
+                    // Get customer (required to get a card)
+                    if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+                        $customer = \Stripe\Customer::retrieve($stripecu);
+                    } else {
+                        $customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
+                    }
+
+                    if ($customer)
+                    {
+                        $card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
+                        if ($card) {
+                            if (method_exists($card, 'detach')) $card->detach();
+                            else $card->delete();
+                        }
+                    }
+                }
+            }
+        }
+
+        return $ok;
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -119,7 +119,7 @@ 
 		global $langs, $db, $conf;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("members","other","users","mails"));
+        $langs->loadLangs(array("members", "other", "users", "mails"));
 
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
@@ -130,7 +130,7 @@ 
 
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
+		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
 		{
 			$service = 'StripeLive';
 			$servicestatus = 1;
@@ -138,12 +138,12 @@ 
 
 		// If customer is linked to Stripe, we update/delete Stripe too
 		if ($action == 'COMPANY_MODIFY') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+			$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
 			if ($object->client != 0) {
-				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);	// This make a network request
+				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus); // This make a network request
 				if ($customer)
 				{
 					$namecleaned = $object->name ? $object->name : null;
@@ -155,22 +155,22 @@ 
 						$taxinfo["tax_id"] = $vatcleaned;
 					}
 					// We force data to "null" if not defined as expected by Stripe
-					if (empty($vatcleaned)) $taxinfo=null;
+					if (empty($vatcleaned)) $taxinfo = null;
 
 					// Detect if we change a Stripe info (email, description, vat id)
 					$changerequested = 0;
-					if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
+					if (!empty($object->email) && $object->email != $customer->email) $changerequested++;
 					if ($namecleaned != $customer->description) $changerequested++;
-					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
+					if (!isset($customer->tax_info['tax_id']) && !is_null($vatcleaned)) $changerequested++;
 					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
+					elseif (isset($customer->tax_info['tax_id']) && !is_null($vatcleaned))
 					{
 						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
 					}
 
 					if ($changerequested)
 					{
-						if (! empty($object->email)) $customer->email = $object->email;
+						if (!empty($object->email)) $customer->email = $object->email;
 						$customer->description = $namecleaned;
 						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
 						else $customer->tax_info = $taxinfo;
@@ -181,9 +181,9 @@ 
 			}
 		}
 		if ($action == 'COMPANY_DELETE') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+			$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
 			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 			if ($customer)
@@ -192,7 +192,7 @@ 
 			}
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
-			$sql.= " WHERE site='stripe' AND fk_soc = " . $object->id;
+			$sql .= " WHERE site='stripe' AND fk_soc = ".$object->id;
 			$this->db->query($sql);
 		}
 
@@ -202,12 +202,12 @@ 
 			// For creation of credit card, we do not create in Stripe automatically
 		}
 		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($object->stripe_card_ref))
+			if (!empty($object->stripe_card_ref))
 			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
+				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
 				if ($stripecu)
 				{
@@ -222,11 +222,11 @@ 
 					{
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
-							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
+							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save($dataforcard);
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
@@ -237,12 +237,12 @@ 
 			}
 		}
 		if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($object->stripe_card_ref))
+			if (!empty($object->stripe_card_ref))
 			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
+				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
 				if ($stripecu)
 				{

Braces +34 added lines, -15 removed lines

@@ -124,7 +124,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
 
-		if (empty($conf->stripe->enabled)) return 0;
+		if (empty($conf->stripe->enabled)) {
+		    return 0;
+		}
 
 		$ok = 1;
 
@@ -155,25 +157,40 @@ 
 						$taxinfo["tax_id"] = $vatcleaned;
 					}
 					// We force data to "null" if not defined as expected by Stripe
-					if (empty($vatcleaned)) $taxinfo=null;
+					if (empty($vatcleaned)) {
+					    $taxinfo=null;
+					}
 
 					// Detect if we change a Stripe info (email, description, vat id)
 					$changerequested = 0;
-					if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
-					if ($namecleaned != $customer->description) $changerequested++;
-					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
+					if (! empty($object->email) && $object->email != $customer->email) {
+					    $changerequested++;
+					}
+					if ($namecleaned != $customer->description) {
+					    $changerequested++;
+					}
+					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) {
+					    $changerequested++;
+					} elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) {
+					    $changerequested++;
+					} elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
 					{
-						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
+						if ($vatcleaned != $customer->tax_info['tax_id']) {
+						    $changerequested++;
+						}
 					}
 
 					if ($changerequested)
 					{
-						if (! empty($object->email)) $customer->email = $object->email;
+						if (! empty($object->email)) {
+						    $customer->email = $object->email;
+						}
 						$customer->description = $namecleaned;
-						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
-						else $customer->tax_info = $taxinfo;
+						if (empty($taxinfo)) {
+						    $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
+						} else {
+						    $customer->tax_info = $taxinfo;
+						}
 
 						$customer->save();
 					}
@@ -225,8 +242,7 @@ 
 							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save($dataforcard);
-							}
-							catch(Exception $e)
+							} catch(Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
@@ -257,8 +273,11 @@ 
 					{
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
-							if (method_exists($card, 'detach')) $card->detach();
-							else $card->delete();
+							if (method_exists($card, 'detach')) {
+							    $card->detach();
+							} else {
+							    $card->delete();
+							}
 						}
 					}
 				}

dolibarr/htdocs/core/triggers/interface_50_modNotification_Notification.class.php

Indentation +115 added lines, -115 removed lines

@@ -30,119 +30,119 @@
  */
 class InterfaceNotification extends DolibarrTriggers
 {
-	public $family = 'notification';
-	public $description = "Triggers of this module send email notifications according to Notification module setup.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'email';
-
-	// @TODO Defined also into notify.class.php)
-	public $listofmanagedevents=array(
-		'BILL_VALIDATE',
-		'BILL_PAYED',
-		'ORDER_VALIDATE',
-		'PROPAL_VALIDATE',
-		'PROPAL_CLOSE_SIGNED',
-		'FICHINTER_VALIDATE',
-		'FICHINTER_ADD_CONTACT',
-		'ORDER_SUPPLIER_VALIDATE',
-		'ORDER_SUPPLIER_APPROVE',
-		'ORDER_SUPPLIER_REFUSE',
-		'SHIPPING_VALIDATE',
-		'EXPENSE_REPORT_VALIDATE',
-		'EXPENSE_REPORT_APPROVE',
-		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
-	);
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @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->notification->enabled)) return 0;     // Module not active, we do nothing
-
-		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-		$notify = new Notify($this->db);
-
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
-
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-		$notify->send($action, $object);
-
-		return 1;
-	}
-
-
-	/**
-	 * Return list of events managed by notification module
-	 *
-	 * @return      array       Array of events managed by notification module
-	 */
-	function getListOfManagedEvents()
-	{
-		global $conf;
-
-		$ret=array();
-
-		$sql = "SELECT rowid, code, label, description, elementtype";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
-		$sql.= $this->db->order("rang, elementtype, code");
-		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj=$this->db->fetch_object($resql);
-
-				$qualified=0;
-				// Check is this event is supported by notification module
-				if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
-				// Check if module for this event is active
-				if ($qualified)
-				{
-					//print 'xx'.$obj->code;
-					$element=$obj->elementtype;
-
-					// Exclude events if related module is disabled
-					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-					elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
-				}
-
-				if ($qualified)
-				{
-					$ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
-				}
-
-				$i++;
-			}
-		}
-		else dol_print_error($this->db);
-
-		return $ret;
-	}
+    public $family = 'notification';
+    public $description = "Triggers of this module send email notifications according to Notification module setup.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'email';
+
+    // @TODO Defined also into notify.class.php)
+    public $listofmanagedevents=array(
+        'BILL_VALIDATE',
+        'BILL_PAYED',
+        'ORDER_VALIDATE',
+        'PROPAL_VALIDATE',
+        'PROPAL_CLOSE_SIGNED',
+        'FICHINTER_VALIDATE',
+        'FICHINTER_ADD_CONTACT',
+        'ORDER_SUPPLIER_VALIDATE',
+        'ORDER_SUPPLIER_APPROVE',
+        'ORDER_SUPPLIER_REFUSE',
+        'SHIPPING_VALIDATE',
+        'EXPENSE_REPORT_VALIDATE',
+        'EXPENSE_REPORT_APPROVE',
+        'HOLIDAY_VALIDATE',
+        'HOLIDAY_APPROVE'
+    );
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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->notification->enabled)) return 0;     // Module not active, we do nothing
+
+        require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+        $notify = new Notify($this->db);
+
+        if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+
+        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+        $notify->send($action, $object);
+
+        return 1;
+    }
+
+
+    /**
+     * Return list of events managed by notification module
+     *
+     * @return      array       Array of events managed by notification module
+     */
+    function getListOfManagedEvents()
+    {
+        global $conf;
+
+        $ret=array();
+
+        $sql = "SELECT rowid, code, label, description, elementtype";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
+        $sql.= $this->db->order("rang, elementtype, code");
+        dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj=$this->db->fetch_object($resql);
+
+                $qualified=0;
+                // Check is this event is supported by notification module
+                if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
+                // Check if module for this event is active
+                if ($qualified)
+                {
+                    //print 'xx'.$obj->code;
+                    $element=$obj->elementtype;
+
+                    // Exclude events if related module is disabled
+                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
+                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
+                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
+                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
+                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
+                    elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
+                }
+
+                if ($qualified)
+                {
+                    $ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
+                }
+
+                $i++;
+            }
+        }
+        else dol_print_error($this->db);
+
+        return $ret;
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -45,7 +45,7 @@ 
 	public $picto = 'email';
 
 	// @TODO Defined also into notify.class.php)
-	public $listofmanagedevents=array(
+	public $listofmanagedevents = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
 		'ORDER_VALIDATE',
@@ -76,12 +76,12 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
 
-		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (!in_array($action, $notify->arrayofnotifsupported)) return 0;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -100,42 +100,42 @@ 
 	{
 		global $conf;
 
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT rowid, code, label, description, elementtype";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
-		$sql.= $this->db->order("rang, elementtype, code");
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
+		$sql .= $this->db->order("rang, elementtype, code");
 		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
-				$obj=$this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 
-				$qualified=0;
+				$qualified = 0;
 				// Check is this event is supported by notification module
-				if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
+				if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
 				// Check if module for this event is active
 				if ($qualified)
 				{
 					//print 'xx'.$obj->code;
-					$element=$obj->elementtype;
+					$element = $obj->elementtype;
 
 					// Exclude events if related module is disabled
-					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-					elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
+					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified = 0;
+					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified = 0;
+					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified = 0;
+					elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) $qualified = 0;
 				}
 
 				if ($qualified)
 				{
-					$ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
+					$ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
 				}
 
 				$i++;

Braces +25 added lines, -10 removed lines

@@ -76,12 +76,17 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
 
 		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (! in_array($action, $notify->arrayofnotifsupported)) {
+		    return 0;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -117,7 +122,9 @@ 
 
 				$qualified=0;
 				// Check is this event is supported by notification module
-				if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
+				if (in_array($obj->code, $this->listofmanagedevents)) {
+				    $qualified=1;
+				}
 				// Check if module for this event is active
 				if ($qualified)
 				{
@@ -125,12 +132,19 @@ 
 					$element=$obj->elementtype;
 
 					// Exclude events if related module is disabled
-					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-					elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
+					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) {
+					    $qualified=0;
+					} elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) {
+					    $qualified=0;
+					} elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) {
+					    $qualified=0;
+					} elseif ($element == 'shipping' && empty($conf->expedition->enabled)) {
+					    $qualified=0;
+					} elseif ($element == 'member' && empty($conf->adherent->enabled)) {
+					    $qualified=0;
+					} elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) {
+					    $qualified=0;
+					}
 				}
 
 				if ($qualified)
@@ -140,8 +154,9 @@ 
 
 				$i++;
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $ret;
 	}

dolibarr/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php

Indentation +771 added lines, -771 removed lines

@@ -31,781 +31,781 @@
  */
 class InterfaceLdapsynchro extends DolibarrTriggers
 {
-	public $family = 'ldap';
-	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @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 (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, 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;
-		}
-
-		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
-		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
-
-		$result=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();
-				$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 == '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();
-
-				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);
-					$newrdn=$object->_load_ldap_dn($info,2);
-					$newparent=$object->_load_ldap_dn($info,1);
-
-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
-				}
-
-				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();
-
-				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 == '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();
-
-				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;
-			}
-		}
-		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();
-
-				if ($result > 0)
-				{
-					// Must edit $object->newgroupid
-					$usergroup=new UserGroup($this->db);
-					if ($object->newgroupid > 0)
-					{
-						$usergroup->fetch($object->newgroupid);
-
-						$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;
-			}
-		}
-		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();
-				$result=$ldap->connect_bind();
-
-				if ($result > 0)
-				{
-					$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('LDAP_KEY_GROUPS');
-					}
-
-					$result=$ldap->add($dn,$info,$user);
-				}
-
-				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();
-
-				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 == '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);
-
-					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
-						$membertype=new AdherentType($this->db);
-						if ($object->typeid > 0)
-						{
-							$membertype->fetch($object->typeid);
-							$membertype->listMembersForMemberType('', 1);
-
-							$oldinfo=$membertype->_load_ldap_info();
-							$olddn=$membertype->_load_ldap_dn($oldinfo);
-
-							// Verify if entry exist
-							$container=$membertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
-							if (count($records) && $records['count'] == 0)
-							{
-								$olddn = '';
-							}
-
-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$membertype->_load_ldap_dn($info);
-
-							$result=$ldap->update($dn,$info,$user,$olddn);
-						}
-					}
-				}
-
-				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();
-					$result=$ldap->connect_bind();
-
-					if ($result > 0)
-					{
-						$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) $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')
-			{
-				// 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)
-				{
-					$ldap=new Ldap();
-					$result=$ldap->connect_bind();
-
-					if ($result > 0)
-					{
-						$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) $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();
-				$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);
-					$newrdn=$object->_load_ldap_dn($info,2);
-					$newparent=$object->_load_ldap_dn($info,1);
-
-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
-
-					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
-						/*
+    public $family = 'ldap';
+    public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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 (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, 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;
+        }
+
+        require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
+
+        $result=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();
+                $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 == '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();
+
+                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);
+                    $newrdn=$object->_load_ldap_dn($info,2);
+                    $newparent=$object->_load_ldap_dn($info,1);
+
+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
+                }
+
+                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();
+
+                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 == '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();
+
+                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;
+            }
+        }
+        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();
+
+                if ($result > 0)
+                {
+                    // Must edit $object->newgroupid
+                    $usergroup=new UserGroup($this->db);
+                    if ($object->newgroupid > 0)
+                    {
+                        $usergroup->fetch($object->newgroupid);
+
+                        $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;
+            }
+        }
+        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();
+                $result=$ldap->connect_bind();
+
+                if ($result > 0)
+                {
+                    $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('LDAP_KEY_GROUPS');
+                    }
+
+                    $result=$ldap->add($dn,$info,$user);
+                }
+
+                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();
+
+                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 == '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);
+
+                    // For member type
+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+                    {
+                        $membertype=new AdherentType($this->db);
+                        if ($object->typeid > 0)
+                        {
+                            $membertype->fetch($object->typeid);
+                            $membertype->listMembersForMemberType('', 1);
+
+                            $oldinfo=$membertype->_load_ldap_info();
+                            $olddn=$membertype->_load_ldap_dn($oldinfo);
+
+                            // Verify if entry exist
+                            $container=$membertype->_load_ldap_dn($oldinfo,1);
+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
+                            $records=$ldap->search($container,$search);
+                            if (count($records) && $records['count'] == 0)
+                            {
+                                $olddn = '';
+                            }
+
+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+                            $dn=$membertype->_load_ldap_dn($info);
+
+                            $result=$ldap->update($dn,$info,$user,$olddn);
+                        }
+                    }
+                }
+
+                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();
+                    $result=$ldap->connect_bind();
+
+                    if ($result > 0)
+                    {
+                        $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) $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')
+            {
+                // 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)
+                {
+                    $ldap=new Ldap();
+                    $result=$ldap->connect_bind();
+
+                    if ($result > 0)
+                    {
+                        $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) $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();
+                $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);
+                    $newrdn=$object->_load_ldap_dn($info,2);
+                    $newparent=$object->_load_ldap_dn($info,1);
+
+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
+
+                    // For member type
+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+                    {
+                        /*
 						 * Change member info
 						 */
-						$newmembertype=new AdherentType($this->db);
-						$newmembertype->fetch($object->typeid);
-						$newmembertype->listMembersForMemberType('', 1);
-
-						$oldinfo=$newmembertype->_load_ldap_info();
-						$olddn=$newmembertype->_load_ldap_dn($oldinfo);
-
-						// Verify if entry exist
-						$container=$newmembertype->_load_ldap_dn($oldinfo,1);
-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";
-						$records=$ldap->search($container,$search);
-						if (count($records) && $records['count'] == 0)
-						{
-							$olddn = '';
-						}
-
-						$info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-						$dn=$newmembertype->_load_ldap_dn($info);
-
-						$result=$ldap->update($dn,$info,$user,$olddn);
-
-						if ($object->oldcopy->typeid != $object->typeid)
-						{
-							/*
+                        $newmembertype=new AdherentType($this->db);
+                        $newmembertype->fetch($object->typeid);
+                        $newmembertype->listMembersForMemberType('', 1);
+
+                        $oldinfo=$newmembertype->_load_ldap_info();
+                        $olddn=$newmembertype->_load_ldap_dn($oldinfo);
+
+                        // Verify if entry exist
+                        $container=$newmembertype->_load_ldap_dn($oldinfo,1);
+                        $search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";
+                        $records=$ldap->search($container,$search);
+                        if (count($records) && $records['count'] == 0)
+                        {
+                            $olddn = '';
+                        }
+
+                        $info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+                        $dn=$newmembertype->_load_ldap_dn($info);
+
+                        $result=$ldap->update($dn,$info,$user,$olddn);
+
+                        if ($object->oldcopy->typeid != $object->typeid)
+                        {
+                            /*
 							 * Remove member in old member type
 							 */
-							$oldmembertype=new AdherentType($this->db);
-							$oldmembertype->fetch($object->oldcopy->typeid);
-							$oldmembertype->listMembersForMemberType('', 1);
-
-							$oldinfo=$oldmembertype->_load_ldap_info();
-							$olddn=$oldmembertype->_load_ldap_dn($oldinfo);
-
-							// Verify if entry exist
-							$container=$oldmembertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
-							if (count($records) && $records['count'] == 0)
-							{
-								$olddn = '';
-							}
-
-							$info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$oldmembertype->_load_ldap_dn($info);
-
-							$result=$ldap->update($dn,$info,$user,$olddn);
-						}
-					}
-				}
-
-				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();
-					$result=$ldap->connect_bind();
-
-					if ($result > 0)
-					{
-						$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) $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')
-			{
-				// If status field is setup to be synchronized
-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
-				{
-					$ldap=new Ldap();
-					$result=$ldap->connect_bind();
-
-					if ($result > 0)
-					{
-						$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) $this->error="ErrorLDAP ".$ldap->error;
-				}
-			}
-		}
-		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();
-				$result=$ldap->connect_bind();
-
-				if ($result > 0)
-				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
-
-					$result=$ldap->delete($dn);
-
-					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-					{
-						if ($object->typeid > 0)
-						{
-							/*
+                            $oldmembertype=new AdherentType($this->db);
+                            $oldmembertype->fetch($object->oldcopy->typeid);
+                            $oldmembertype->listMembersForMemberType('', 1);
+
+                            $oldinfo=$oldmembertype->_load_ldap_info();
+                            $olddn=$oldmembertype->_load_ldap_dn($oldinfo);
+
+                            // Verify if entry exist
+                            $container=$oldmembertype->_load_ldap_dn($oldinfo,1);
+                            $search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";
+                            $records=$ldap->search($container,$search);
+                            if (count($records) && $records['count'] == 0)
+                            {
+                                $olddn = '';
+                            }
+
+                            $info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+                            $dn=$oldmembertype->_load_ldap_dn($info);
+
+                            $result=$ldap->update($dn,$info,$user,$olddn);
+                        }
+                    }
+                }
+
+                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();
+                    $result=$ldap->connect_bind();
+
+                    if ($result > 0)
+                    {
+                        $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) $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')
+            {
+                // If status field is setup to be synchronized
+                if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
+                {
+                    $ldap=new Ldap();
+                    $result=$ldap->connect_bind();
+
+                    if ($result > 0)
+                    {
+                        $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) $this->error="ErrorLDAP ".$ldap->error;
+                }
+            }
+        }
+        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();
+                $result=$ldap->connect_bind();
+
+                if ($result > 0)
+                {
+                    $info=$object->_load_ldap_info();
+                    $dn=$object->_load_ldap_dn($info);
+
+                    $result=$ldap->delete($dn);
+
+                    // For member type
+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+                    {
+                        if ($object->typeid > 0)
+                        {
+                            /*
 							 * Remove member in member type
 							 */
-							$membertype=new AdherentType($this->db);
-							$membertype->fetch($object->typeid);
-							$membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list
-
-							$oldinfo=$membertype->_load_ldap_info();
-							$olddn=$membertype->_load_ldap_dn($oldinfo);
-
-							// Verify if entry exist
-							$container=$membertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
-							if (count($records) && $records['count'] == 0)
-							{
-								$olddn = '';
-							}
-
-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$membertype->_load_ldap_dn($info);
-
-							$result=$ldap->update($dn,$info,$user,$olddn);
-						}
-					}
-				}
-
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
-			}
-		}
-
-		// Members types
-		elseif ($action == 'MEMBER_TYPE_CREATE')
-		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
-
-				if ($result > 0)
-				{
-					$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('LDAP_KEY_MEMBERS_TYPE');
-					}
-
-					$result=$ldap->add($dn,$info,$user);
-				}
-
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
-			}
-		}
-		elseif ($action == 'MEMBER_TYPE_MODIFY')
-		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
-			{
-				$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;
-					}
-
-					$object->oldcopy->listMembersForMemberType('', 1);
-
-					$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 = '';
-					}
-
-					$object->listMembersForMemberType('', 1);
-
-					$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 == 'MEMBER_TYPE_DELETE')
-		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_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->delete($dn);
-				}
-
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
-			}
-		}
-
-		return $result;
-	}
+                            $membertype=new AdherentType($this->db);
+                            $membertype->fetch($object->typeid);
+                            $membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list
+
+                            $oldinfo=$membertype->_load_ldap_info();
+                            $olddn=$membertype->_load_ldap_dn($oldinfo);
+
+                            // Verify if entry exist
+                            $container=$membertype->_load_ldap_dn($oldinfo,1);
+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
+                            $records=$ldap->search($container,$search);
+                            if (count($records) && $records['count'] == 0)
+                            {
+                                $olddn = '';
+                            }
+
+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
+                            $dn=$membertype->_load_ldap_dn($info);
+
+                            $result=$ldap->update($dn,$info,$user,$olddn);
+                        }
+                    }
+                }
+
+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+            }
+        }
+
+        // Members types
+        elseif ($action == 'MEMBER_TYPE_CREATE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+            {
+                $ldap=new Ldap();
+                $result=$ldap->connect_bind();
+
+                if ($result > 0)
+                {
+                    $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('LDAP_KEY_MEMBERS_TYPE');
+                    }
+
+                    $result=$ldap->add($dn,$info,$user);
+                }
+
+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+            }
+        }
+        elseif ($action == 'MEMBER_TYPE_MODIFY')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+            {
+                $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;
+                    }
+
+                    $object->oldcopy->listMembersForMemberType('', 1);
+
+                    $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 = '';
+                    }
+
+                    $object->listMembersForMemberType('', 1);
+
+                    $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 == 'MEMBER_TYPE_DELETE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_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->delete($dn);
+                }
+
+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+            }
+        }
+
+        return $result;
+    }
 }

Spacing +258 added lines, -258 removed lines

@@ -58,10 +58,10 @@ 
 	 */
 	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 (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing
+		if (empty($conf->ldap->enabled)) return 0; // Module not active, we do nothing
+		if (defined('DISABLE_LDAP_SYNCHRO')) return 0; // If constant defined, we do nothing
 
-		if (! function_exists('ldap_connect'))
+		if (!function_exists('ldap_connect'))
 		{
 			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
 			return 0;
@@ -70,102 +70,102 @@ 
 		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
-		$result=0;
+		$result = 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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->add($dn,$info,$user);
+					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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);
+					$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);
+					$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);
-					$newrdn=$object->_load_ldap_dn($info,2);
-					$newparent=$object->_load_ldap_dn($info,1);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
+					$newrdn = $object->_load_ldap_dn($info, 2);
+					$newparent = $object->_load_ldap_dn($info, 1);
 
-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
+					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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);
+					$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);
+					$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);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_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;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 		elseif ($action == 'USER_ENABLEDISABLE')
@@ -175,96 +175,96 @@ 
 		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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->delete($dn);
+					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
 					// Must edit $object->newgroupid
-					$usergroup=new UserGroup($this->db);
+					$usergroup = new UserGroup($this->db);
 					if ($object->newgroupid > 0)
 					{
 						$usergroup->fetch($object->newgroupid);
 
-						$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);
+						$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;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
 					// Must edit $object->newgroupid
-					$usergroup=new UserGroup($this->db);
+					$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);
+						$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;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 
@@ -272,81 +272,81 @@ 
 		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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
 					// Get a gid number for objectclass PosixGroup
-					if (in_array('posixGroup',$info['objectclass'])) {
+					if (in_array('posixGroup', $info['objectclass'])) {
 						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');
 					}
 
-					$result=$ldap->add($dn,$info,$user);
+					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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);
+					$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);
+					$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);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_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;
+				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')
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->delete($dn);
+					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 
@@ -354,76 +354,76 @@ 
 		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))
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->add($dn,$info,$user);
+					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				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))
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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);
+					$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);
+					$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);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_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;
+				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))
+			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->delete($dn);
+					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 
@@ -431,78 +431,78 @@ 
 		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')
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->add($dn,$info,$user);
+					$result = $ldap->add($dn, $info, $user);
 
 					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 					{
-						$membertype=new AdherentType($this->db);
+						$membertype = new AdherentType($this->db);
 						if ($object->typeid > 0)
 						{
 							$membertype->fetch($object->typeid);
 							$membertype->listMembersForMemberType('', 1);
 
-							$oldinfo=$membertype->_load_ldap_info();
-							$olddn=$membertype->_load_ldap_dn($oldinfo);
+							$oldinfo = $membertype->_load_ldap_info();
+							$olddn = $membertype->_load_ldap_dn($oldinfo);
 
 							// Verify if entry exist
-							$container=$membertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
+							$container = $membertype->_load_ldap_dn($oldinfo, 1);
+							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";
+							$records = $ldap->search($container, $search);
 							if (count($records) && $records['count'] == 0)
 							{
 								$olddn = '';
 							}
 
-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$membertype->_load_ldap_dn($info);
+							$info = $membertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+							$dn = $membertype->_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;
+				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 (!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))
+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
 				{
-					$ldap=new Ldap();
-					$result=$ldap->connect_bind();
+					$ldap = new Ldap();
+					$result = $ldap->connect_bind();
 
 					if ($result > 0)
 					{
-						$info=$object->_load_ldap_info();
-						$dn=$object->_load_ldap_dn($info);
-						$olddn=$dn;	// We know olddn=dn as we change only status
+						$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);
+						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					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')
+			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
@@ -511,212 +511,212 @@ 
 					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT
 					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
 				{
-					$ldap=new Ldap();
-					$result=$ldap->connect_bind();
+					$ldap = new Ldap();
+					$result = $ldap->connect_bind();
 
 					if ($result > 0)
 					{
-						$info=$object->_load_ldap_info();
-						$dn=$object->_load_ldap_dn($info);
-						$olddn=$dn;	// We know olddn=dn as we change only subscriptions
+						$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);
+						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					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')
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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);
+					$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);
+					$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);
-					$newrdn=$object->_load_ldap_dn($info,2);
-					$newparent=$object->_load_ldap_dn($info,1);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
+					$newrdn = $object->_load_ldap_dn($info, 2);
+					$newparent = $object->_load_ldap_dn($info, 1);
 
-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
+					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 
 					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 					{
 						/*
 						 * Change member info
 						 */
-						$newmembertype=new AdherentType($this->db);
+						$newmembertype = new AdherentType($this->db);
 						$newmembertype->fetch($object->typeid);
 						$newmembertype->listMembersForMemberType('', 1);
 
-						$oldinfo=$newmembertype->_load_ldap_info();
-						$olddn=$newmembertype->_load_ldap_dn($oldinfo);
+						$oldinfo = $newmembertype->_load_ldap_info();
+						$olddn = $newmembertype->_load_ldap_dn($oldinfo);
 
 						// Verify if entry exist
-						$container=$newmembertype->_load_ldap_dn($oldinfo,1);
-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";
-						$records=$ldap->search($container,$search);
+						$container = $newmembertype->_load_ldap_dn($oldinfo, 1);
+						$search = "(".$newmembertype->_load_ldap_dn($oldinfo, 2).")";
+						$records = $ldap->search($container, $search);
 						if (count($records) && $records['count'] == 0)
 						{
 							$olddn = '';
 						}
 
-						$info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-						$dn=$newmembertype->_load_ldap_dn($info);
+						$info = $newmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+						$dn = $newmembertype->_load_ldap_dn($info);
 
-						$result=$ldap->update($dn,$info,$user,$olddn);
+						$result = $ldap->update($dn, $info, $user, $olddn);
 
 						if ($object->oldcopy->typeid != $object->typeid)
 						{
 							/*
 							 * Remove member in old member type
 							 */
-							$oldmembertype=new AdherentType($this->db);
+							$oldmembertype = new AdherentType($this->db);
 							$oldmembertype->fetch($object->oldcopy->typeid);
 							$oldmembertype->listMembersForMemberType('', 1);
 
-							$oldinfo=$oldmembertype->_load_ldap_info();
-							$olddn=$oldmembertype->_load_ldap_dn($oldinfo);
+							$oldinfo = $oldmembertype->_load_ldap_info();
+							$olddn = $oldmembertype->_load_ldap_dn($oldinfo);
 
 							// Verify if entry exist
-							$container=$oldmembertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
+							$container = $oldmembertype->_load_ldap_dn($oldinfo, 1);
+							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo, 2).")";
+							$records = $ldap->search($container, $search);
 							if (count($records) && $records['count'] == 0)
 							{
 								$olddn = '';
 							}
 
-							$info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$oldmembertype->_load_ldap_dn($info);
+							$info = $oldmembertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+							$dn = $oldmembertype->_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;
+				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 (!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();
-					$result=$ldap->connect_bind();
+					$ldap = new Ldap();
+					$result = $ldap->connect_bind();
 
 					if ($result > 0)
 					{
-						$info=$object->_load_ldap_info();
-						$dn=$object->_load_ldap_dn($info);
-						$olddn=$dn;	// We know olddn=dn as we change only password
+						$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);
+						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					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')
+			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))
+				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
 				{
-					$ldap=new Ldap();
-					$result=$ldap->connect_bind();
+					$ldap = new Ldap();
+					$result = $ldap->connect_bind();
 
 					if ($result > 0)
 					{
-						$info=$object->_load_ldap_info();
-						$dn=$object->_load_ldap_dn($info);
-						$olddn=$dn;	// We know olddn=dn as we change only status
+						$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);
+						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					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);
-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->delete($dn);
+					$result = $ldap->delete($dn);
 
 					// For member type
-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 					{
 						if ($object->typeid > 0)
 						{
 							/*
 							 * Remove member in member type
 							 */
-							$membertype=new AdherentType($this->db);
+							$membertype = new AdherentType($this->db);
 							$membertype->fetch($object->typeid);
-							$membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list
+							$membertype->listMembersForMemberType('a.rowid != '.$object->id, 1); // remove deleted member from the list
 
-							$oldinfo=$membertype->_load_ldap_info();
-							$olddn=$membertype->_load_ldap_dn($oldinfo);
+							$oldinfo = $membertype->_load_ldap_info();
+							$olddn = $membertype->_load_ldap_dn($oldinfo);
 
 							// Verify if entry exist
-							$container=$membertype->_load_ldap_dn($oldinfo,1);
-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";
-							$records=$ldap->search($container,$search);
+							$container = $membertype->_load_ldap_dn($oldinfo, 1);
+							$search = "(".$membertype->_load_ldap_dn($oldinfo, 2).")";
+							$records = $ldap->search($container, $search);
 							if (count($records) && $records['count'] == 0)
 							{
 								$olddn = '';
 							}
 
-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)
-							$dn=$membertype->_load_ldap_dn($info);
+							$info = $membertype->_load_ldap_info(); // Contains all members, included the new one (insert already done before trigger call)
+							$dn = $membertype->_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;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 
@@ -724,38 +724,38 @@ 
 		elseif ($action == 'MEMBER_TYPE_CREATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
 					// Get a gid number for objectclass PosixGroup
-					if (in_array('posixGroup',$info['objectclass'])) {
+					if (in_array('posixGroup', $info['objectclass'])) {
 						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');
 					}
 
-					$result=$ldap->add($dn,$info,$user);
+					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 		elseif ($action == 'MEMBER_TYPE_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))
+					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;
@@ -763,13 +763,13 @@ 
 
 					$object->oldcopy->listMembersForMemberType('', 1);
 
-					$oldinfo=$object->oldcopy->_load_ldap_info();
-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);
+					$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);
+					$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 = '';
@@ -777,32 +777,32 @@ 
 
 					$object->listMembersForMemberType('', 1);
 
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_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;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 		elseif ($action == 'MEMBER_TYPE_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
 			{
-				$ldap=new Ldap();
-				$result=$ldap->connect_bind();
+				$ldap = new Ldap();
+				$result = $ldap->connect_bind();
 
 				if ($result > 0)
 				{
-					$info=$object->_load_ldap_info();
-					$dn=$object->_load_ldap_dn($info);
+					$info = $object->_load_ldap_info();
+					$dn = $object->_load_ldap_dn($info);
 
-					$result=$ldap->delete($dn);
+					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
 

Braces +92 added lines, -60 removed lines

@@ -58,8 +58,14 @@ 
 	 */
 	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 (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing
+		if (empty($conf->ldap->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
+		if (defined('DISABLE_LDAP_SYNCHRO')) {
+		    return 0;
+		}
+		// If constant defined, we do nothing
 
 		if (! function_exists('ldap_connect'))
 		{
@@ -89,10 +95,11 @@ 
 					$result=$ldap->add($dn,$info,$user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'USER_MODIFY')
+		} 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')
@@ -128,10 +135,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'USER_NEW_PASSWORD')
+		} 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')
@@ -165,14 +173,14 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'USER_ENABLEDISABLE')
+		} elseif ($action == 'USER_ENABLEDISABLE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		}
-		elseif ($action == 'USER_DELETE')
+		} 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')
@@ -188,10 +196,11 @@ 
 					$result=$ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'USER_SETINGROUP')
+		} 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')
@@ -226,10 +235,11 @@ 
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'USER_REMOVEFROMGROUP')
+		} 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')
@@ -264,7 +274,9 @@ 
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -290,10 +302,11 @@ 
 					$result=$ldap->add($dn,$info,$user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'GROUP_MODIFY')
+		} 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')
@@ -327,10 +340,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'GROUP_DELETE')
+		} 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')
@@ -346,7 +360,9 @@ 
 					$result=$ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -367,10 +383,11 @@ 
 					$result=$ldap->add($dn,$info,$user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'CONTACT_MODIFY')
+		} 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))
@@ -404,10 +421,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'CONTACT_DELETE')
+		} 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))
@@ -423,7 +441,9 @@ 
 					$result=$ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -472,10 +492,11 @@ 
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'MEMBER_VALIDATE')
+		} 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')
@@ -495,11 +516,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_SUBSCRIPTION')
+		} 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')
@@ -523,11 +545,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_MODIFY')
+		} 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')
@@ -618,10 +641,11 @@ 
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'MEMBER_NEW_PASSWORD')
+		} 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')
@@ -641,11 +665,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_RESILIATE')
+		} 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')
@@ -665,11 +690,12 @@ 
 						$result=$ldap->update($dn,$info,$user,$olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+					    $this->error="ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_DELETE')
+		} 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')
@@ -716,7 +742,9 @@ 
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -742,10 +770,11 @@ 
 					$result=$ldap->add($dn,$info,$user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_MODIFY')
+		} elseif ($action == 'MEMBER_TYPE_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -783,10 +812,11 @@ 
 					$result=$ldap->update($dn,$info,$user,$olddn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_DELETE')
+		} elseif ($action == 'MEMBER_TYPE_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -802,7 +832,9 @@ 
 					$result=$ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+				    $this->error="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 

dolibarr/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

Indentation +350 added lines, -350 removed lines

@@ -34,58 +34,58 @@ 
  */
 class InterfaceActionsAuto extends DolibarrTriggers
 {
-	public $family = 'agenda';
-	public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'action';
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * Following properties may be set before calling trigger. The may be completed by this trigger to be used for writing the event into database:
-	 *      $object->actiontypecode (translation action code: AC_OTH, ...)
-	 *      $object->actionmsg (note, long text)
-	 *      $object->actionmsg2 (label, short text)
-	 *      $object->sendtoid (id of contact or array of ids)
-	 *      $object->socid (id of thirdparty)
-	 *      $object->fk_project
-	 *      $object->fk_element
-	 *      $object->elementtype
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
+    public $family = 'agenda';
+    public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'action';
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * Following properties may be set before calling trigger. The may be completed by this trigger to be used for writing the event into database:
+     *      $object->actiontypecode (translation action code: AC_OTH, ...)
+     *      $object->actionmsg (note, long text)
+     *      $object->actionmsg2 (label, short text)
+     *      $object->sendtoid (id of contact or array of ids)
+     *      $object->socid (id of thirdparty)
+     *      $object->fk_project
+     *      $object->fk_element
+     *      $object->elementtype
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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->agenda->enabled)) return 0;     // Module not active, we do nothing
 
-		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
+        $key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 
-		// Do not log events not enabled for this action
-		if (empty($conf->global->$key)) {
-			return 0;
-		}
+        // Do not log events not enabled for this action
+        if (empty($conf->global->$key)) {
+            return 0;
+        }
 
-		$langs->load("agenda");
+        $langs->load("agenda");
 
-		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+        if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
 
-		// Actions
-		if ($action == 'COMPANY_CREATE')
+        // Actions
+        if ($action == 'COMPANY_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","companies"));
@@ -94,8 +94,8 @@ 
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
 
-			$object->sendtoid=0;
-			$object->socid=$object->id;
+            $object->sendtoid=0;
+            $object->socid=$object->id;
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
@@ -106,7 +106,7 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
+        }
         elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
@@ -116,22 +116,22 @@ 
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'CONTRACT_SENTBYMAIL')
-		{
-			// Load translation files required by the page
+        }
+        elseif ($action == 'CONTRACT_SENTBYMAIL')
+        {
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
-			if (empty($object->actionmsg))
-			{
-				$object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
-			}
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+            if (empty($object->actionmsg))
+            {
+                $object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
+            }
 
-			// Parameters $object->sendtoid defined by caller
-			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_VALIDATE')
+            // Parameters $object->sendtoid defined by caller
+            //$object->sendtoid=0;
+        }
+        elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
@@ -139,8 +139,8 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
-			$object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
@@ -154,8 +154,8 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_SIGNED')
+        }
+        elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
@@ -163,9 +163,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
@@ -173,9 +173,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_REFUSED')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
@@ -183,9 +183,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_VALIDATE')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","orders"));
@@ -193,9 +193,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CLOSE')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -203,9 +203,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CLASSIFY_BILLED')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -213,9 +213,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CANCEL')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -223,9 +223,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SENTBYMAIL')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -238,8 +238,8 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_VALIDATE')
+        }
+        elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -247,18 +247,18 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_UNVALIDATE')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'BILL_UNVALIDATE')
         {
-           // Load translation files required by the page
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
         elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
@@ -272,8 +272,8 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_PAYED')
+        }
+        elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -283,8 +283,8 @@ 
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_CANCEL')
+        }
+        elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -293,8 +293,8 @@ 
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'FICHINTER_CREATE')
+        }
+        elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
@@ -303,10 +303,10 @@ 
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_VALIDATE')
+            $object->fk_element=0;
+            $object->elementtype='';
+        }
+        elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
@@ -315,10 +315,10 @@ 
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_MODIFY')
+            $object->fk_element=0;
+            $object->elementtype='';
+        }
+        elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
@@ -327,10 +327,10 @@ 
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_SENTBYMAIL')
+            $object->fk_element=0;
+            $object->elementtype='';
+        }
+        elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
@@ -338,7 +338,7 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
-            	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+                $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -349,18 +349,18 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+                if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+                $object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
         }
-	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+                if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+                $object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
         }
@@ -373,24 +373,24 @@ 
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
-		}
+            $object->fk_element=0;
+            $object->elementtype='';
+        }
         elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","sendings"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
-        	if (empty($object->actionmsg))
-        	{
-        		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
-        	}
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg))
+            {
+                $object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+            }
 
-        	// Parameters $object->sendtoid defined by caller
-        	//$object->sendtoid=0;
+            // Parameters $object->sendtoid defined by caller
+            //$object->sendtoid=0;
         }
-		elseif ($action == 'SHIPPING_SENTBYMAIL')
+        elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","sendings"));
@@ -403,22 +403,22 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		} elseif ($action == 'RECEPTION_VALIDATE')
+        } elseif ($action == 'RECEPTION_VALIDATE')
         {
             $langs->load("agenda");
             $langs->load("other");
-        	$langs->load("receptions");
+            $langs->load("receptions");
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
-        	if (empty($object->actionmsg))
-        	{
-        		$object->actionmsg=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
-        	}
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg))
+            {
+                $object->actionmsg=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+            }
 
-        	// Parameters $object->sendtoid defined by caller
-        	//$object->sendtoid=0;
+            // Parameters $object->sendtoid defined by caller
+            //$object->sendtoid=0;
         }
-		elseif ($action == 'RECEPTION_SENTBYMAIL')
+        elseif ($action == 'RECEPTION_SENTBYMAIL')
         {
             $langs->load("agenda");
             $langs->load("other");
@@ -432,52 +432,52 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
-		{
-			// Load translation files required by the page
+        }
+        elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+        {
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
-		{
-			// Load translation files required by the page
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+        {
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
-			if (empty($object->actionmsg))
-			{
-				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
-			}
-
-			// Parameters $object->sendtoid defined by caller
-			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
-		{
-			// Load translation files required by the page
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            if (empty($object->actionmsg))
+            {
+                $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            }
+
+            // Parameters $object->sendtoid defined by caller
+            //$object->sendtoid=0;
+        }
+        elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+        {
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
-		{
-			// Load translation files required by the page
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+        {
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_CREATE')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -486,8 +486,8 @@ 
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+        }
+        elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -496,28 +496,28 @@ 
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
-		{
+        }
+        elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+        {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
-		{
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+        {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -526,8 +526,8 @@ 
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+        }
+        elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
@@ -536,8 +536,8 @@ 
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+        }
+        elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills","orders"));
@@ -551,7 +551,7 @@ 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
         }
-		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+        elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills","orders"));
@@ -564,7 +564,7 @@ 
 
             $object->sendtoid=0;
         }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+        elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -573,8 +573,8 @@ 
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+        }
+        elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -583,7 +583,7 @@ 
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
+        }
         elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
@@ -598,7 +598,7 @@ 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
         }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
+        elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -606,9 +606,9 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_CANCELED')
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -616,8 +616,8 @@ 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
-			$object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
 
         // Members
         elseif ($action == 'MEMBER_VALIDATE')
@@ -630,9 +630,9 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+            $object->sendtoid=0;
         }
-		elseif ($action == 'MEMBER_MODIFY')
+        elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
@@ -643,7 +643,7 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
             $object->sendtoid=0;
-		}
+        }
         elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
@@ -656,38 +656,38 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
             $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
-			$object->sendtoid=0;
-			if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+            $object->sendtoid=0;
+            if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
-        	// Load translation files required by the page
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
+            $object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
+            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+            $object->sendtoid=0;
+            if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
-        	// Load translation files required by the page
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
+            $object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
+            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+            $object->sendtoid=0;
+            if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
         }
         elseif ($action == 'MEMBER_RESILIATE')
         {
@@ -699,7 +699,7 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+            $object->sendtoid=0;
         }
         elseif ($action == 'MEMBER_DELETE')
         {
@@ -711,7 +711,7 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+            $object->sendtoid=0;
         }
 
         // Projects
@@ -720,11 +720,11 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
 
-        	$object->sendtoid=0;
+            $object->sendtoid=0;
         }
         elseif($action == 'PROJECT_VALIDATE')
         {
@@ -749,74 +749,74 @@ 
             $object->sendtoid=0;
         }
 
-		// Project tasks
-		elseif($action == 'TASK_CREATE')
-		{
+        // Project tasks
+        elseif($action == 'TASK_CREATE')
+        {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
 
-		elseif($action == 'TASK_MODIFY')
-		{
+        elseif($action == 'TASK_MODIFY')
+        {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
 
-		elseif($action == 'TASK_DELETE')
-		{
+        elseif($action == 'TASK_DELETE')
+        {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
-
-			$object->sendtoid=0;
-		}
-		// TODO Merge all previous cases into this generic one
-		else	// $action = TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
-		{
-		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
-		    // Load translation files required by the page
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+
+            $object->sendtoid=0;
+        }
+        // TODO Merge all previous cases into this generic one
+        else	// $action = TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+        {
+            // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
+            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other"));
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
-		    if (empty($object->actionmsg))  $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
+            if (empty($object->actionmsg))  $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
 
-		    $object->sendtoid=0;
-		}
+            $object->sendtoid=0;
+        }
 
-		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
+        $object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
 
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         // Add entry in event table
-		$now=dol_now();
+        $now=dol_now();
 
-		if (isset($_SESSION['listofnames-'.$object->trackid]))
-		{
-			$attachs=$_SESSION['listofnames-'.$object->trackid];
-			if ($attachs && strpos($action,'SENTBYMAIL'))
-			{
+        if (isset($_SESSION['listofnames-'.$object->trackid]))
+        {
+            $attachs=$_SESSION['listofnames-'.$object->trackid];
+            if ($attachs && strpos($action,'SENTBYMAIL'))
+            {
                 $object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
-			}
-		}
+            }
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		$contactforaction=new Contact($this->db);
+        $contactforaction=new Contact($this->db);
         $societeforaction=new Societe($this->db);
         // Set contactforaction if there is only 1 contact.
         if (is_array($object->sendtoid))
@@ -838,87 +838,87 @@ 
         $elementtype = $object->element;
         if ($object->element == 'subscription')
         {
-        	$elementid = $object->fk_adherent;
-        	$elementtype = 'member';
+            $elementid = $object->fk_adherent;
+            $elementtype = 'member';
         }
         //var_dump($societeforaction);var_dump($contactforaction);exit;
 
-		// Insertion action
-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-		$actioncomm->code        = 'AC_'.$action;
-		$actioncomm->label       = $object->actionmsg2;
-		$actioncomm->note        = $object->actionmsg;          // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
-		$actioncomm->fk_project  = $projectid;
-		$actioncomm->datep       = $now;
-		$actioncomm->datef       = $now;
-		$actioncomm->durationp   = 0;
-		$actioncomm->punctual    = 1;
-		$actioncomm->percentage  = -1;   // Not applicable
-		$actioncomm->societe     = $societeforaction;
-		$actioncomm->contact     = $contactforaction;
-		$actioncomm->socid       = $societeforaction->id;
-		$actioncomm->contactid   = $contactforaction->id;
-		$actioncomm->authorid    = $user->id;   // User saving action
-		$actioncomm->userownerid = $user->id;	// Owner of action
+        // Insertion action
+        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+        $actioncomm = new ActionComm($this->db);
+        $actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+        $actioncomm->code        = 'AC_'.$action;
+        $actioncomm->label       = $object->actionmsg2;
+        $actioncomm->note        = $object->actionmsg;          // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
+        $actioncomm->fk_project  = $projectid;
+        $actioncomm->datep       = $now;
+        $actioncomm->datef       = $now;
+        $actioncomm->durationp   = 0;
+        $actioncomm->punctual    = 1;
+        $actioncomm->percentage  = -1;   // Not applicable
+        $actioncomm->societe     = $societeforaction;
+        $actioncomm->contact     = $contactforaction;
+        $actioncomm->socid       = $societeforaction->id;
+        $actioncomm->contactid   = $contactforaction->id;
+        $actioncomm->authorid    = $user->id;   // User saving action
+        $actioncomm->userownerid = $user->id;	// Owner of action
         // Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
-		$actioncomm->email_msgid   = $object->email_msgid;
-		$actioncomm->email_from    = $object->email_from;
-		$actioncomm->email_sender  = $object->email_sender;
-		$actioncomm->email_to      = $object->email_to;
-		$actioncomm->email_tocc    = $object->email_tocc;
-		$actioncomm->email_tobcc   = $object->email_tobcc;
-		$actioncomm->email_subject = $object->email_subject;
-		$actioncomm->errors_to     = $object->errors_to;
-
-		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
-		// for such objects because there is already a dedicated field into table llx_actioncomm.
-		if (! in_array($elementtype, array('societe','contact','project')))
-		{
-			$actioncomm->fk_element  = $elementid;
-			$actioncomm->elementtype = $elementtype;
-		}
-
-		if (property_exists($object,'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles)>0) {
-			$actioncomm->attachedfiles=$object->attachedfiles;
-		}
-		if (property_exists($object,'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
-			$actioncomm->userassigned=$object->sendtouserid;
-		}
-
-		$ret=$actioncomm->create($user);       // User creating action
-
-		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
-		{
-			if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
-				foreach($object->attachedfiles['paths'] as $key=>$filespath) {
-					$srcfile = $filespath;
-					$destdir = $conf->agenda->dir_output . '/' . $ret;
-					$destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
-					if (dol_mkdir($destdir) >= 0) {
-						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-						dol_copy($srcfile, $destfile);
-					}
-				}
-			}
-		}
-
-		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
-
-		if ($ret > 0)
-		{
-			$_SESSION['LAST_ACTION_CREATED'] = $ret;
-			return 1;
-		}
-		else
-		{
+        $actioncomm->email_msgid   = $object->email_msgid;
+        $actioncomm->email_from    = $object->email_from;
+        $actioncomm->email_sender  = $object->email_sender;
+        $actioncomm->email_to      = $object->email_to;
+        $actioncomm->email_tocc    = $object->email_tocc;
+        $actioncomm->email_tobcc   = $object->email_tobcc;
+        $actioncomm->email_subject = $object->email_subject;
+        $actioncomm->errors_to     = $object->errors_to;
+
+        // Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
+        // for such objects because there is already a dedicated field into table llx_actioncomm.
+        if (! in_array($elementtype, array('societe','contact','project')))
+        {
+            $actioncomm->fk_element  = $elementid;
+            $actioncomm->elementtype = $elementtype;
+        }
+
+        if (property_exists($object,'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles)>0) {
+            $actioncomm->attachedfiles=$object->attachedfiles;
+        }
+        if (property_exists($object,'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
+            $actioncomm->userassigned=$object->sendtouserid;
+        }
+
+        $ret=$actioncomm->create($user);       // User creating action
+
+        if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
+        {
+            if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
+                foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+                    $srcfile = $filespath;
+                    $destdir = $conf->agenda->dir_output . '/' . $ret;
+                    $destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+                    if (dol_mkdir($destdir) >= 0) {
+                        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+                        dol_copy($srcfile, $destfile);
+                    }
+                }
+            }
+        }
+
+        unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
+
+        if ($ret > 0)
+        {
+            $_SESSION['LAST_ACTION_CREATED'] = $ret;
+            return 1;
+        }
+        else
+        {
             $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
             $this->error=$error;
             $this->errors=$actioncomm->errors;
 
             dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
             return -1;
-		}
+        }
     }
 }

Spacing +299 added lines, -299 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->agenda->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
 
 		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 
@@ -82,25 +82,25 @@ 
 
 		$langs->load("agenda");
 
-		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+		if (empty($object->actiontypecode)) $object->actiontypecode = 'AC_OTH_AUTO';
 
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","companies"));
+            $langs->loadLangs(array("agenda", "other", "companies"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
-            $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
-            if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+            $object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+            if (!empty($object->prefix)) $object->actionmsg .= " (".$object->prefix.")";
 
-			$object->sendtoid=0;
-			$object->socid=$object->id;
+			$object->sendtoid = 0;
+			$object->socid = $object->id;
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
 
@@ -110,22 +110,22 @@ 
         elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","contracts"));
+            $langs->loadLangs(array("agenda", "other", "contracts"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'CONTRACT_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","contracts"));
+            $langs->loadLangs(array("agenda", "other", "contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
 			{
-				$object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
+				$object->actionmsg = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -134,22 +134,22 @@ 
 		elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -158,82 +158,82 @@ 
 		elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","orders"));
+            $langs->loadLangs(array("agenda", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("OrderSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -242,32 +242,32 @@ 
 		elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_UNVALIDATE')
         {
            // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
         elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -276,69 +276,69 @@ 
 		elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
             // Values for this action can't be defined by caller.
-            $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-            	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            	$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -347,44 +347,44 @@ 
         elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
         elseif ($action == 'FICHINTER_DELETE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
         elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","sendings"));
+            $langs->loadLangs(array("agenda", "other", "sendings"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
         	if (empty($object->actionmsg))
         	{
-        		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        		$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -393,12 +393,12 @@ 
 		elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","sendings"));
+            $langs->loadLangs(array("agenda", "other", "sendings"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -409,10 +409,10 @@ 
             $langs->load("other");
         	$langs->load("receptions");
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
         	if (empty($object->actionmsg))
         	{
-        		$object->actionmsg=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        		$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -424,10 +424,10 @@ 
             $langs->load("other");
             $langs->load("receptions");
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -436,22 +436,22 @@ 
 		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
 			{
-				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -460,92 +460,92 @@ 
 		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -554,45 +554,45 @@ 
 		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
             }
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
         elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -601,201 +601,201 @@ 
 		elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
         // Members
         elseif ($action == 'MEMBER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
 		elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
         elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+            $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+            $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-			$object->sendtoid=0;
-			if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+			$object->sendtoid = 0;
+			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
         	// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+        	$object->sendtoid = 0;
+        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
         	// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+        	$object->sendtoid = 0;
+        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_RESILIATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
         elseif ($action == 'MEMBER_DELETE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
 
         // Projects
         elseif ($action == 'PROJECT_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+        	$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
-        	$object->sendtoid=0;
+        	$object->sendtoid = 0;
         }
-        elseif($action == 'PROJECT_VALIDATE')
+        elseif ($action == 'PROJECT_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+            $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
-        elseif($action == 'PROJECT_MODIFY')
+        elseif ($action == 'PROJECT_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+            $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 
 		// Project tasks
-		elseif($action == 'TASK_CREATE')
+		elseif ($action == 'TASK_CREATE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
-		elseif($action == 'TASK_MODIFY')
+		elseif ($action == 'TASK_MODIFY')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
-		elseif($action == 'TASK_DELETE')
+		elseif ($action == 'TASK_DELETE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		// TODO Merge all previous cases into this generic one
 		else	// $action = TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
 		{
 		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
 		    // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other"));
+            $langs->loadLangs(array("agenda", "other"));
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
-		    if (empty($object->actionmsg))  $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities($action."InDolibarr", $object->ref);
+		    if (empty($object->actionmsg))  $object->actionmsg = $langs->transnoentities($action."InDolibarr", $object->ref);
 
-		    $object->sendtoid=0;
+		    $object->sendtoid = 0;
 		}
 
 		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
@@ -803,21 +803,21 @@ 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         // Add entry in event table
-		$now=dol_now();
+		$now = dol_now();
 
 		if (isset($_SESSION['listofnames-'.$object->trackid]))
 		{
-			$attachs=$_SESSION['listofnames-'.$object->trackid];
-			if ($attachs && strpos($action,'SENTBYMAIL'))
+			$attachs = $_SESSION['listofnames-'.$object->trackid];
+			if ($attachs && strpos($action, 'SENTBYMAIL'))
 			{
-                $object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
+                $object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
 			}
 		}
 
         require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		$contactforaction=new Contact($this->db);
-        $societeforaction=new Societe($this->db);
+		$contactforaction = new Contact($this->db);
+        $societeforaction = new Societe($this->db);
         // Set contactforaction if there is only 1 contact.
         if (is_array($object->sendtoid))
         {
@@ -831,7 +831,7 @@ 
         if ($object->socid > 0)			$societeforaction->fetch($object->socid);
         elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
-        $projectid = isset($object->fk_project)?$object->fk_project:0;
+        $projectid = isset($object->fk_project) ? $object->fk_project : 0;
         if ($object->element == 'project') $projectid = $object->id;
 
         $elementid = $object->id;
@@ -846,22 +846,22 @@ 
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
 		$actioncomm->label       = $object->actionmsg2;
-		$actioncomm->note        = $object->actionmsg;          // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
+		$actioncomm->note        = $object->actionmsg; // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
 		$actioncomm->fk_project  = $projectid;
 		$actioncomm->datep       = $now;
 		$actioncomm->datef       = $now;
 		$actioncomm->durationp   = 0;
 		$actioncomm->punctual    = 1;
-		$actioncomm->percentage  = -1;   // Not applicable
+		$actioncomm->percentage  = -1; // Not applicable
 		$actioncomm->societe     = $societeforaction;
 		$actioncomm->contact     = $contactforaction;
 		$actioncomm->socid       = $societeforaction->id;
 		$actioncomm->contactid   = $contactforaction->id;
-		$actioncomm->authorid    = $user->id;   // User saving action
-		$actioncomm->userownerid = $user->id;	// Owner of action
+		$actioncomm->authorid    = $user->id; // User saving action
+		$actioncomm->userownerid = $user->id; // Owner of action
         // Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
 		$actioncomm->email_msgid   = $object->email_msgid;
 		$actioncomm->email_from    = $object->email_from;
@@ -874,28 +874,28 @@ 
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm.
-		if (! in_array($elementtype, array('societe','contact','project')))
+		if (!in_array($elementtype, array('societe', 'contact', 'project')))
 		{
 			$actioncomm->fk_element  = $elementid;
 			$actioncomm->elementtype = $elementtype;
 		}
 
-		if (property_exists($object,'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles)>0) {
-			$actioncomm->attachedfiles=$object->attachedfiles;
+		if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles) > 0) {
+			$actioncomm->attachedfiles = $object->attachedfiles;
 		}
-		if (property_exists($object,'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
-			$actioncomm->userassigned=$object->sendtouserid;
+		if (property_exists($object, 'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid) > 0) {
+			$actioncomm->userassigned = $object->sendtouserid;
 		}
 
-		$ret=$actioncomm->create($user);       // User creating action
+		$ret = $actioncomm->create($user); // User creating action
 
 		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
 		{
-			if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
-				foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+			if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
+				foreach ($object->attachedfiles['paths'] as $key=>$filespath) {
 					$srcfile = $filespath;
-					$destdir = $conf->agenda->dir_output . '/' . $ret;
-					$destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+					$destdir = $conf->agenda->dir_output.'/'.$ret;
+					$destfile = $destdir.'/'.$object->attachedfiles['names'][$key];
 					if (dol_mkdir($destdir) >= 0) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						dol_copy($srcfile, $destfile);
@@ -904,7 +904,7 @@ 
 			}
 		}
 
-		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
+		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
 
 		if ($ret > 0)
 		{
@@ -913,9 +913,9 @@ 
 		}
 		else
 		{
-            $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
-            $this->error=$error;
-            $this->errors=$actioncomm->errors;
+            $error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
+            $this->error = $error;
+            $this->errors = $actioncomm->errors;
 
             dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
             return -1;

Braces +273 added lines, -188 removed lines

@@ -71,7 +71,10 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->agenda->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->agenda->enabled)) {
+            return 0;
+        }
+        // Module not active, we do nothing
 
 		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 
@@ -82,7 +85,9 @@ 
 
 		$langs->load("agenda");
 
-		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+		if (empty($object->actiontypecode)) {
+		    $object->actiontypecode='AC_OTH_AUTO';
+		}
 
 		// Actions
 		if ($action == 'COMPANY_CREATE')
@@ -90,39 +95,46 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","companies"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
+            }
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
-            if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
+            if (! empty($object->prefix)) {
+                $object->actionmsg.=" (".$object->prefix.")";
+            }
 
 			$object->sendtoid=0;
 			$object->socid=$object->id;
-        }
-        elseif ($action == 'COMPANY_SENTBYMAIL')
+        } elseif ($action == 'COMPANY_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
+            if (empty($object->actionmsg2)) {
+                dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
+            }
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-        elseif ($action == 'CONTRACT_VALIDATE')
+		} elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","contracts"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'CONTRACT_SENTBYMAIL')
+		} elseif ($action == 'CONTRACT_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			}
 			if (empty($object->actionmsg))
 			{
 				$object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
@@ -130,23 +142,25 @@ 
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_VALIDATE')
+		} elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
 			$object->sendtoid=0;
-		}
-        elseif ($action == 'PROPAL_SENTBYMAIL')
+		} elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
@@ -154,83 +168,91 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_SIGNED')
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+		} elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_REFUSED')
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_VALIDATE')
+		} elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CLOSE')
+		} elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CLASSIFY_BILLED')
+		} elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_CANCEL')
+		} elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("OrderSentByEMail",$object->ref);
@@ -238,33 +260,36 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_VALIDATE')
+		} elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_UNVALIDATE')
+		} elseif ($action == 'BILL_UNVALIDATE')
         {
            // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-        elseif ($action == 'BILL_SENTBYMAIL')
+		} elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
@@ -272,8 +297,7 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_PAYED')
+		} elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
@@ -283,59 +307,64 @@ 
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_CANCEL')
+		} elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'FICHINTER_CREATE')
+		} elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
 			$object->fk_element=0;
 			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_VALIDATE')
+		} elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
 			$object->fk_element=0;
 			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_MODIFY')
+		} elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
 			$object->fk_element=0;
 			$object->elementtype='';
-		}
-		elseif ($action == 'FICHINTER_SENTBYMAIL')
+		} elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
             	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
@@ -343,45 +372,49 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) {
+           	    $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	}
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-        }
-	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) {
+           	    $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	}
            	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-        }
-        elseif ($action == 'FICHINTER_DELETE')
+        } elseif ($action == 'FICHINTER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
 
             $object->sendtoid=0;
 			$object->fk_element=0;
 			$object->elementtype='';
-		}
-        elseif ($action == 'SHIPPING_VALIDATE')
+		} elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","sendings"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) {
+        	    $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        	}
         	if (empty($object->actionmsg))
         	{
         		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
@@ -389,13 +422,14 @@ 
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'SHIPPING_SENTBYMAIL')
+        } elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","sendings"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ShippingSentByEMail",$object->ref);
@@ -409,7 +443,9 @@ 
             $langs->load("other");
         	$langs->load("receptions");
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) {
+        	    $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        	}
         	if (empty($object->actionmsg))
         	{
         		$object->actionmsg=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
@@ -417,14 +453,15 @@ 
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'RECEPTION_SENTBYMAIL')
+        } elseif ($action == 'RECEPTION_SENTBYMAIL')
         {
             $langs->load("agenda");
             $langs->load("other");
             $langs->load("receptions");
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
@@ -432,23 +469,25 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			}
 			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			}
 			if (empty($object->actionmsg))
 			{
 				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
@@ -456,93 +495,102 @@ 
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_CREATE')
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+		} elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
@@ -550,46 +598,50 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+        } elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
             }
 
             $object->sendtoid=0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+        } elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
 
             $object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
 
             $object->sendtoid=0;
-		}
-        elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills","orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+            }
             if (empty($object->actionmsg))
             {
                 $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
@@ -597,23 +649,25 @@ 
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
+        } elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_CANCELED')
+		} elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
 
 			$object->sendtoid=0;
@@ -625,31 +679,35 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
+            }
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid=0;
-        }
-		elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
+            }
             $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
             $object->sendtoid=0;
-		}
-        elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
+            }
             $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
@@ -657,14 +715,17 @@ 
             $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
 			$object->sendtoid=0;
-			if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
+			if ($object->fk_soc > 0) {
+			    $object->socid=$object->fk_soc;
+			}
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
+        	if (empty($object->actionmsg2)) {
+        	    $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
+        	}
         	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
         	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
         	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
@@ -672,14 +733,17 @@ 
         	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
         	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
+        	if ($object->fk_soc > 0) {
+        	    $object->socid=$object->fk_soc;
+        	}
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
+        	if (empty($object->actionmsg2)) {
+        	    $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
+        	}
         	$object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
         	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
         	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
@@ -687,26 +751,30 @@ 
         	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
 
         	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_RESILIATE')
+        	if ($object->fk_soc > 0) {
+        	    $object->socid=$object->fk_soc;
+        	}
+        } elseif ($action == 'MEMBER_RESILIATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
+            }
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid=0;
-        }
-        elseif ($action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
+            }
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
@@ -720,29 +788,33 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+        	if (empty($object->actionmsg2)) {
+        	    $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+        	}
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
 
         	$object->sendtoid=0;
-        }
-        elseif($action == 'PROJECT_VALIDATE')
+        } elseif($action == 'PROJECT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
 
             $object->sendtoid=0;
-        }
-        elseif($action == 'PROJECT_MODIFY')
+        } elseif($action == 'PROJECT_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) {
+                $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
+            }
             $object->actionmsg=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
@@ -755,31 +827,33 @@ 
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid=0;
-		}
-
-		elseif($action == 'TASK_MODIFY')
+		} elseif($action == 'TASK_MODIFY')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid=0;
-		}
-
-		elseif($action == 'TASK_DELETE')
+		} elseif($action == 'TASK_DELETE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) {
+			    $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
+			}
 			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 
@@ -792,8 +866,12 @@ 
 		    // Load translation files required by the page
             $langs->loadLangs(array("agenda","other"));
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
-		    if (empty($object->actionmsg))  $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    if (empty($object->actionmsg2)) {
+		        $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    }
+		    if (empty($object->actionmsg)) {
+		        $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    }
 
 		    $object->sendtoid=0;
 		}
@@ -821,18 +899,26 @@ 
         // Set contactforaction if there is only 1 contact.
         if (is_array($object->sendtoid))
         {
-            if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
-        }
-        else
+            if (count($object->sendtoid) == 1) {
+                $contactforaction->fetch(reset($object->sendtoid));
+            }
+        } else
         {
-            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+            if ($object->sendtoid > 0) {
+                $contactforaction->fetch($object->sendtoid);
+            }
         }
         // Set societeforaction.
-        if ($object->socid > 0)			$societeforaction->fetch($object->socid);
-        elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
+        if ($object->socid > 0) {
+            $societeforaction->fetch($object->socid);
+        } elseif ($object->fk_soc > 0) {
+            $societeforaction->fetch($object->fk_soc);
+        }
 
         $projectid = isset($object->fk_project)?$object->fk_project:0;
-        if ($object->element == 'project') $projectid = $object->id;
+        if ($object->element == 'project') {
+            $projectid = $object->id;
+        }
 
         $elementid = $object->id;
         $elementtype = $object->element;
@@ -910,8 +996,7 @@ 
 		{
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
-		}
-		else
+		} else
 		{
             $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
             $this->error=$error;

dolibarr/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

Indentation +100 added lines, -100 removed lines

@@ -29,33 +29,33 @@ 
  */
 class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 {
-	public $family = 'mailmanspip';
-	public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
+    public $family = 'mailmanspip';
+    public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
 
         require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
@@ -63,39 +63,39 @@ 
 
         if ($action == 'CATEGORY_LINK')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// We add subscription if we change category (new category may means more mailing-list to subscribe)
-        	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
-    		{
-    			$this->error=$object->context['linkto']->error;
-    			$this->errors=$object->context['linkto']->errors;
-    			$return=-1;
-    		}
-			else
-			{
-				$return=1;
-			}
-
-        	return $return;
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+            // We add subscription if we change category (new category may means more mailing-list to subscribe)
+            if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
+            {
+                $this->error=$object->context['linkto']->error;
+                $this->errors=$object->context['linkto']->errors;
+                $return=-1;
+            }
+            else
+            {
+                $return=1;
+            }
+
+            return $return;
         }
         elseif ($action == 'CATEGORY_UNLINK')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
-        	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
-        	{
-        		$this->error=$object->context['unlinkoff']->error;
-        		$this->errors=$object->context['unlinkoff']->errors;
-        		$return=-1;
-        	}
-        	else
-        	{
-        		$return=1;
-        	}
-
-        	return $return;
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+            // We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
+            if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
+            {
+                $this->error=$object->context['unlinkoff']->error;
+                $this->errors=$object->context['unlinkoff']->errors;
+                $return=-1;
+            }
+            else
+            {
+                $return=1;
+            }
+
+            return $return;
         }
 
         // Members
@@ -103,37 +103,37 @@ 
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$return=0;
+            $return=0;
             // Add user into some linked tools (mailman, spip, etc...)
-			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
-			{
-				if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
-				{
-					if ($object->oldcopy->del_to_abo() < 0)
-					{
-						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
-						$this->errors=$object->oldcopy->errors;
-						$return=-1;
-					}
-					else
-					{
-						$return=1;
-					}
-				}
-    			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
-    			if ($object->add_to_abo() < 0)
-    			{
-    				 if (! empty($object->error)) $this->error=$object->error;
-    				 $this->errors=$object->errors;
-    				 $return=-1;
-    			}
-				else
-				{
-					$return=1;
-				}
-			}
-
-			return $return;
+            if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
+            {
+                if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
+                {
+                    if ($object->oldcopy->del_to_abo() < 0)
+                    {
+                        if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
+                        $this->errors=$object->oldcopy->errors;
+                        $return=-1;
+                    }
+                    else
+                    {
+                        $return=1;
+                    }
+                }
+                // We add subscription if new email or new type (new type may means more mailing-list to subscribe)
+                if ($object->add_to_abo() < 0)
+                {
+                        if (! empty($object->error)) $this->error=$object->error;
+                        $this->errors=$object->errors;
+                        $return=-1;
+                }
+                else
+                {
+                    $return=1;
+                }
+            }
+
+            return $return;
         }
         elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
@@ -141,20 +141,20 @@ 
 
             $return=0;
             // Remove from external tools (mailman, spip, etc...)
-        	if ($object->del_to_abo() < 0)
-			{
-				if (! empty($object->error)) $this->error=$object->error;
-				$this->errors=$object->errors;
-				$return=-1;
-			}
-			else
-			{
-				$return=1;
-			}
-
-	        return $return;
+            if ($object->del_to_abo() < 0)
+            {
+                if (! empty($object->error)) $this->error=$object->error;
+                $this->errors=$object->errors;
+                $return=-1;
+            }
+            else
+            {
+                $return=1;
+            }
+
+            return $return;
         }
 
-		return 0;
+        return 0;
     }
 }

Spacing +23 added lines, -23 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
 
         require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
         require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
@@ -68,13 +68,13 @@ 
         	// We add subscription if we change category (new category may means more mailing-list to subscribe)
         	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
     		{
-    			$this->error=$object->context['linkto']->error;
-    			$this->errors=$object->context['linkto']->errors;
-    			$return=-1;
+    			$this->error = $object->context['linkto']->error;
+    			$this->errors = $object->context['linkto']->errors;
+    			$return = -1;
     		}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
         	return $return;
@@ -86,13 +86,13 @@ 
         	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
         	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
         	{
-        		$this->error=$object->context['unlinkoff']->error;
-        		$this->errors=$object->context['unlinkoff']->errors;
-        		$return=-1;
+        		$this->error = $object->context['unlinkoff']->error;
+        		$this->errors = $object->context['unlinkoff']->errors;
+        		$return = -1;
         	}
         	else
         	{
-        		$return=1;
+        		$return = 1;
         	}
 
         	return $return;
@@ -103,7 +103,7 @@ 
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$return=0;
+			$return = 0;
             // Add user into some linked tools (mailman, spip, etc...)
 			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
 			{
@@ -111,25 +111,25 @@ 
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
-						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
-						$this->errors=$object->oldcopy->errors;
-						$return=-1;
+						if (!empty($object->oldcopy->error)) $this->error = $object->oldcopy->error;
+						$this->errors = $object->oldcopy->errors;
+						$return = -1;
 					}
 					else
 					{
-						$return=1;
+						$return = 1;
 					}
 				}
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
-    				 $this->errors=$object->errors;
-    				 $return=-1;
+    				 if (!empty($object->error)) $this->error = $object->error;
+    				 $this->errors = $object->errors;
+    				 $return = -1;
     			}
 				else
 				{
-					$return=1;
+					$return = 1;
 				}
 			}
 
@@ -139,17 +139,17 @@ 
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $return=0;
+            $return = 0;
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
-				$this->errors=$object->errors;
-				$return=-1;
+				if (!empty($object->error)) $this->error = $object->error;
+				$this->errors = $object->errors;
+				$return = -1;
 			}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
 	        return $return;

Braces +20 added lines, -18 removed lines

@@ -56,7 +56,10 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) {
+            return 0;
+        }
+        // Module not active, we do nothing
 
         require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
         require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
@@ -71,15 +74,13 @@ 
     			$this->error=$object->context['linkto']->error;
     			$this->errors=$object->context['linkto']->errors;
     			$return=-1;
-    		}
-			else
+    		} else
 			{
 				$return=1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -89,8 +90,7 @@ 
         		$this->error=$object->context['unlinkoff']->error;
         		$this->errors=$object->context['unlinkoff']->errors;
         		$return=-1;
-        	}
-        	else
+        	} else
         	{
         		$return=1;
         	}
@@ -105,17 +105,18 @@ 
 
 			$return=0;
             // Add user into some linked tools (mailman, spip, etc...)
-			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
+			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
+			    // TODO Do del/add also if type change
 			{
 				if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
 						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
+			}
 						$this->errors=$object->oldcopy->errors;
 						$return=-1;
-					}
-					else
+					} else
 					{
 						$return=1;
 					}
@@ -123,19 +124,19 @@ 
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
+    				 if (! empty($object->error)) {
+    				     $this->error=$object->error;
+    				 }
     				 $this->errors=$object->errors;
     				 $return=-1;
-    			}
-				else
+    			} else
 				{
 					$return=1;
 				}
 			}
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -143,11 +144,12 @@ 
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
+				if (! empty($object->error)) {
+				    $this->error=$object->error;
+				}
 				$this->errors=$object->errors;
 				$return=-1;
-			}
-			else
+			} else
 			{
 				$return=1;
 			}

dolibarr/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

Indentation +211 added lines, -211 removed lines

@@ -32,39 +32,39 @@ 
 
 class InterfaceWorkflowManager extends DolibarrTriggers
 {
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
 
-	public $family = 'core';
-	public $description = "Triggers of this module allows to manage workflows";
+    public $family = 'core';
+    public $description = "Triggers of this module allows to manage workflows";
 
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
 
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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->workflow->enabled)) return 0;     // Module not active, we do nothing
 
         // Proposals to order
         if ($action == 'PROPAL_CLOSE_SIGNED')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
             {
                 include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -102,132 +102,132 @@ 
         // Order classify billed proposal
         if ($action == 'ORDER_CLASSIFY_BILLED')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
-        	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-				if (! empty($object->linkedObjects))
-				{
-				    $totalonlinkedelements=0;
-					foreach($object->linkedObjects['propal'] as $element)
-					{
-					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-					}
-					dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-					if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-					{
-    					foreach($object->linkedObjects['propal'] as $element)
-    					{
-    					    $ret=$element->classifyBilled($user);
-    					}
-					}
-				}
-        		return $ret;
-        	}
+            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
+            {
+                $object->fetchObjectLinked('','propal',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['propal'] as $element)
+                    {
+                        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    {
+                        foreach($object->linkedObjects['propal'] as $element)
+                        {
+                            $ret=$element->classifyBilled($user);
+                        }
+                    }
+                }
+                return $ret;
+            }
         }
 
         // classify billed order & billed propososal
         if ($action == 'BILL_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
 
-			// First classify billed the order to allow the proposal classify process
-			if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
-        	{
-        		$object->fetchObjectLinked('','commande',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['commande'] as $element)
-        		    {
-        		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-        		    {
-        		        foreach($object->linkedObjects['commande'] as $element)
-        		        {
-        		            $ret=$element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        		return $ret;
-        	}
+            // First classify billed the order to allow the proposal classify process
+            if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
+            {
+                $object->fetchObjectLinked('','commande',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['commande'] as $element)
+                    {
+                        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    {
+                        foreach($object->linkedObjects['commande'] as $element)
+                        {
+                            $ret=$element->classifyBilled($user);
+                        }
+                    }
+                }
+                return $ret;
+            }
 
-			// Second classify billed the proposal.
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
-        	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['propal'] as $element)
-        		    {
-        		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-        		    {
-        		        foreach($object->linkedObjects['propal'] as $element)
-        		        {
-        		            $ret=$element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        		return $ret;
-        	}
+            // Second classify billed the proposal.
+            if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
+            {
+                $object->fetchObjectLinked('','propal',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['propal'] as $element)
+                    {
+                        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    {
+                        foreach($object->linkedObjects['propal'] as $element)
+                        {
+                            $ret=$element->classifyBilled($user);
+                        }
+                    }
+                }
+                return $ret;
+            }
         }
 
         // classify billed order & billed propososal
         if ($action == 'BILL_SUPPLIER_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
 
-        	// First classify billed the order to allow the proposal classify process
-        	if (! empty($conf->fournisseur->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
-        	{
-        		$object->fetchObjectLinked('','order_supplier',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
-        		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['order_supplier'] as $element)
-        			{
-        				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-        			{
-        				foreach($object->linkedObjects['order_supplier'] as $element)
-        				{
-        					$ret=$element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
+            // First classify billed the order to allow the proposal classify process
+            if (! empty($conf->fournisseur->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
+            {
+                $object->fetchObjectLinked('','order_supplier',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['order_supplier'] as $element)
+                    {
+                        if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    {
+                        foreach($object->linkedObjects['order_supplier'] as $element)
+                        {
+                            $ret=$element->classifyBilled($user);
+                        }
+                    }
+                }
+                return $ret;
+            }
 
-        	// Second classify billed the proposal.
-        	if (! empty($conf->supplier_proposal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
-        	{
-        		$object->fetchObjectLinked('','supplier_proposal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
-        		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['supplier_proposal'] as $element)
-        			{
-        				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-        			{
-        				foreach($object->linkedObjects['supplier_proposal'] as $element)
-        				{
-        					$ret=$element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
+            // Second classify billed the proposal.
+            if (! empty($conf->supplier_proposal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
+            {
+                $object->fetchObjectLinked('','supplier_proposal',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['supplier_proposal'] as $element)
+                    {
+                        if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    {
+                        foreach($object->linkedObjects['supplier_proposal'] as $element)
+                        {
+                            $ret=$element->classifyBilled($user);
+                        }
+                    }
+                }
+                return $ret;
+            }
         }
 
         // Invoice classify billed order
@@ -260,88 +260,88 @@ 
 
         if ($action=='SHIPPING_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
 
-        	if (! empty($conf->commande->enabled) && ! empty($conf->expedition->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
-        	{
-        		$qtyshipped=array();
-        		$qtyordred=array();
-        		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+            if (! empty($conf->commande->enabled) && ! empty($conf->expedition->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
+            {
+                $qtyshipped=array();
+                $qtyordred=array();
+                require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-        		//find all shippement on order origin
-        		$order = new Commande($this->db);
-        		$ret=$order->fetch($object->origin_id);
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
-        			return $ret;
-        		}
-        		$ret=$order->fetchObjectLinked($order->id,'commande',null,'shipping');
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
-        			return $ret;
-        		}
-        		//Build array of quantity shipped by product for an order
-        		if (is_array($order->linkedObjects) && count($order->linkedObjects)>0) {
-        			foreach($order->linkedObjects as $type=>$shipping_array) {
-        				if ($type=='shipping' && is_array($shipping_array) && count($shipping_array)>0) {
-        					foreach ($shipping_array as $shipping) {
-		        				if (is_array($shipping->lines) && count($shipping->lines)>0) {
-		        					foreach($shipping->lines as $shippingline) {
-		        						$qtyshipped[$shippingline->fk_product]+=$shippingline->qty;
-		        					}
-		        				}
-	        				}
-        				}
-        			}
-        		}
+                //find all shippement on order origin
+                $order = new Commande($this->db);
+                $ret=$order->fetch($object->origin_id);
+                if ($ret<0) {
+                    $this->error=$order->error; $this->errors=$order->errors;
+                    return $ret;
+                }
+                $ret=$order->fetchObjectLinked($order->id,'commande',null,'shipping');
+                if ($ret<0) {
+                    $this->error=$order->error; $this->errors=$order->errors;
+                    return $ret;
+                }
+                //Build array of quantity shipped by product for an order
+                if (is_array($order->linkedObjects) && count($order->linkedObjects)>0) {
+                    foreach($order->linkedObjects as $type=>$shipping_array) {
+                        if ($type=='shipping' && is_array($shipping_array) && count($shipping_array)>0) {
+                            foreach ($shipping_array as $shipping) {
+                                if (is_array($shipping->lines) && count($shipping->lines)>0) {
+                                    foreach($shipping->lines as $shippingline) {
+                                        $qtyshipped[$shippingline->fk_product]+=$shippingline->qty;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
 
-        		//Build array of quantity ordered by product
-        		if (is_array($order->lines) && count($order->lines)>0) {
-        			foreach($order->lines as $orderline) {
-        				$qtyordred[$orderline->fk_product]+=$orderline->qty;
-        			}
-        		}
-        		//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
-        		//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
-        		//Compare array
-        		$diff_array=array_diff_assoc($qtyordred,$qtyshipped);
-        		if (count($diff_array)==0) {
-        			//No diff => mean everythings is shipped
-        			$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
-        			if ($ret<0) {
-        				$this->error=$object->error; $this->errors=$object->errors;
-        				return $ret;
-        			}
-        		}
-        	}
+                //Build array of quantity ordered by product
+                if (is_array($order->lines) && count($order->lines)>0) {
+                    foreach($order->lines as $orderline) {
+                        $qtyordred[$orderline->fk_product]+=$orderline->qty;
+                    }
+                }
+                //dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
+                //dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
+                //Compare array
+                $diff_array=array_diff_assoc($qtyordred,$qtyshipped);
+                if (count($diff_array)==0) {
+                    //No diff => mean everythings is shipped
+                    $ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
+                    if ($ret<0) {
+                        $this->error=$object->error; $this->errors=$object->errors;
+                        return $ret;
+                    }
+                }
+            }
         }
-		 // classify billed reception
+            // classify billed reception
         if ($action == 'BILL_SUPPLIER_VALIDATE')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
 
-        	if (! empty($conf->reception->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
-        	{
-        		$object->fetchObjectLinked('','reception',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
-        		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['reception'] as $element)
-        		    {
-        		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
-        		    if ($totalonlinkedelements == $object->total_ht)
-        		    {
-        		        foreach($object->linkedObjects['reception'] as $element)
-        		        {
-        		            $ret=$element->set_billed();
-        		        }
-        		    }
-        		}
-        		return $ret;
-        	}
-		}
+            if (! empty($conf->reception->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
+            {
+                $object->fetchObjectLinked('','reception',$object->id,$object->element);
+                if (! empty($object->linkedObjects))
+                {
+                    $totalonlinkedelements=0;
+                    foreach($object->linkedObjects['reception'] as $element)
+                    {
+                        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+                    }
+                    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+                    if ($totalonlinkedelements == $object->total_ht)
+                    {
+                        foreach($object->linkedObjects['reception'] as $element)
+                        {
+                            $ret=$element->set_billed();
+                        }
+                    }
+                }
+                return $ret;
+            }
+        }
 
         return 0;
     }

Spacing +97 added lines, -97 removed lines

@@ -59,13 +59,13 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-        if (empty($conf->workflow->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
 
         // Proposals to order
         if ($action == 'PROPAL_CLOSE_SIGNED')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
+            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
             {
                 include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
                 $newobject = new Commande($this->db);
@@ -74,8 +74,8 @@ 
                 $newobject->context['origin'] = $object->element;
                 $newobject->context['origin_id'] = $object->id;
 
-                $ret=$newobject->createFromProposal($object, $user);
-                if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
+                $ret = $newobject->createFromProposal($object, $user);
+                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
                 return $ret;
             }
         }
@@ -84,7 +84,7 @@ 
         if ($action == 'ORDER_CLOSE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
+            if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
             {
                 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
                 $newobject = new Facture($this->db);
@@ -93,8 +93,8 @@ 
                 $newobject->context['origin'] = $object->element;
                 $newobject->context['origin_id'] = $object->id;
 
-                $ret=$newobject->createFromOrder($object, $user);
-                if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
+                $ret = $newobject->createFromOrder($object, $user);
+                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
                 return $ret;
             }
         }
@@ -102,23 +102,23 @@ 
         // Order classify billed proposal
         if ($action == 'ORDER_CLASSIFY_BILLED')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
         	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-				if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+				if (!empty($object->linkedObjects))
 				{
-				    $totalonlinkedelements=0;
-					foreach($object->linkedObjects['propal'] as $element)
+				    $totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['propal'] as $element)
 					{
 					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
 					}
-					dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-					if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
 					{
-    					foreach($object->linkedObjects['propal'] as $element)
+    					foreach ($object->linkedObjects['propal'] as $element)
     					{
-    					    $ret=$element->classifyBilled($user);
+    					    $ret = $element->classifyBilled($user);
     					}
 					}
 				}
@@ -129,25 +129,25 @@ 
         // classify billed order & billed propososal
         if ($action == 'BILL_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			// First classify billed the order to allow the proposal classify process
-			if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
+			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
         	{
-        		$object->fetchObjectLinked('','commande',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['commande'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['commande'] as $element)
         		    {
         		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
         		    }
-        		    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        		    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        		    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         		    {
-        		        foreach($object->linkedObjects['commande'] as $element)
+        		        foreach ($object->linkedObjects['commande'] as $element)
         		        {
-        		            $ret=$element->classifyBilled($user);
+        		            $ret = $element->classifyBilled($user);
         		        }
         		    }
         		}
@@ -155,22 +155,22 @@ 
         	}
 
 			// Second classify billed the proposal.
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
+        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
         	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['propal'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['propal'] as $element)
         		    {
         		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         		    }
-        		    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        		    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         		    {
-        		        foreach($object->linkedObjects['propal'] as $element)
+        		        foreach ($object->linkedObjects['propal'] as $element)
         		        {
-        		            $ret=$element->classifyBilled($user);
+        		            $ret = $element->classifyBilled($user);
         		        }
         		    }
         		}
@@ -181,25 +181,25 @@ 
         // classify billed order & billed propososal
         if ($action == 'BILL_SUPPLIER_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         	// First classify billed the order to allow the proposal classify process
-        	if (! empty($conf->fournisseur->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
+        	if (!empty($conf->fournisseur->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
         	{
-        		$object->fetchObjectLinked('','order_supplier',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['order_supplier'] as $element)
+        			$totalonlinkedelements = 0;
+        			foreach ($object->linkedObjects['order_supplier'] as $element)
         			{
         				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
         			}
-        			dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        			dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        			if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         			{
-        				foreach($object->linkedObjects['order_supplier'] as $element)
+        				foreach ($object->linkedObjects['order_supplier'] as $element)
         				{
-        					$ret=$element->classifyBilled($user);
+        					$ret = $element->classifyBilled($user);
         				}
         			}
         		}
@@ -207,22 +207,22 @@ 
         	}
 
         	// Second classify billed the proposal.
-        	if (! empty($conf->supplier_proposal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
+        	if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
         	{
-        		$object->fetchObjectLinked('','supplier_proposal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['supplier_proposal'] as $element)
+        			$totalonlinkedelements = 0;
+        			foreach ($object->linkedObjects['supplier_proposal'] as $element)
         			{
         				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         			}
-        			dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        			dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        			if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         			{
-        				foreach($object->linkedObjects['supplier_proposal'] as $element)
+        				foreach ($object->linkedObjects['supplier_proposal'] as $element)
         				{
-        					$ret=$element->classifyBilled($user);
+        					$ret = $element->classifyBilled($user);
         				}
         			}
         		}
@@ -233,24 +233,24 @@ 
         // Invoice classify billed order
         if ($action == 'BILL_PAYED')
         {
-            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
+            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
             {
-                $object->fetchObjectLinked('','commande',$object->id,$object->element);
-                if (! empty($object->linkedObjects))
+                $object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+                if (!empty($object->linkedObjects))
                 {
-                    $totalonlinkedelements=0;
-                    foreach($object->linkedObjects['commande'] as $element)
+                    $totalonlinkedelements = 0;
+                    foreach ($object->linkedObjects['commande'] as $element)
                     {
                         if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
                     }
-                    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+                    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
                     {
-                        foreach($object->linkedObjects['commande'] as $element)
+                        foreach ($object->linkedObjects['commande'] as $element)
                         {
-                            $ret=$element->classifyBilled($user);
+                            $ret = $element->classifyBilled($user);
                         }
                     }
                 }
@@ -258,36 +258,36 @@ 
             }
         }
 
-        if ($action=='SHIPPING_VALIDATE')
+        if ($action == 'SHIPPING_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	if (! empty($conf->commande->enabled) && ! empty($conf->expedition->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
+        	if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
         	{
-        		$qtyshipped=array();
-        		$qtyordred=array();
+        		$qtyshipped = array();
+        		$qtyordred = array();
         		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
         		//find all shippement on order origin
         		$order = new Commande($this->db);
-        		$ret=$order->fetch($object->origin_id);
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
+        		$ret = $order->fetch($object->origin_id);
+        		if ($ret < 0) {
+        			$this->error = $order->error; $this->errors = $order->errors;
         			return $ret;
         		}
-        		$ret=$order->fetchObjectLinked($order->id,'commande',null,'shipping');
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
+        		$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
+        		if ($ret < 0) {
+        			$this->error = $order->error; $this->errors = $order->errors;
         			return $ret;
         		}
         		//Build array of quantity shipped by product for an order
-        		if (is_array($order->linkedObjects) && count($order->linkedObjects)>0) {
-        			foreach($order->linkedObjects as $type=>$shipping_array) {
-        				if ($type=='shipping' && is_array($shipping_array) && count($shipping_array)>0) {
+        		if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
+        			foreach ($order->linkedObjects as $type=>$shipping_array) {
+        				if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
         					foreach ($shipping_array as $shipping) {
-		        				if (is_array($shipping->lines) && count($shipping->lines)>0) {
-		        					foreach($shipping->lines as $shippingline) {
-		        						$qtyshipped[$shippingline->fk_product]+=$shippingline->qty;
+		        				if (is_array($shipping->lines) && count($shipping->lines) > 0) {
+		        					foreach ($shipping->lines as $shippingline) {
+		        						$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
 		        					}
 		        				}
 	        				}
@@ -296,20 +296,20 @@ 
         		}
 
         		//Build array of quantity ordered by product
-        		if (is_array($order->lines) && count($order->lines)>0) {
-        			foreach($order->lines as $orderline) {
-        				$qtyordred[$orderline->fk_product]+=$orderline->qty;
+        		if (is_array($order->lines) && count($order->lines) > 0) {
+        			foreach ($order->lines as $orderline) {
+        				$qtyordred[$orderline->fk_product] += $orderline->qty;
         			}
         		}
         		//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
         		//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
         		//Compare array
-        		$diff_array=array_diff_assoc($qtyordred,$qtyshipped);
-        		if (count($diff_array)==0) {
+        		$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
+        		if (count($diff_array) == 0) {
         			//No diff => mean everythings is shipped
-        			$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
-        			if ($ret<0) {
-        				$this->error=$object->error; $this->errors=$object->errors;
+        			$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
+        			if ($ret < 0) {
+        				$this->error = $object->error; $this->errors = $object->errors;
         				return $ret;
         			}
         		}
@@ -320,22 +320,22 @@ 
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
 
-        	if (! empty($conf->reception->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
+        	if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
         	{
-        		$object->fetchObjectLinked('','reception',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['reception'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['reception'] as $element)
         		    {
         		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
         		    }
         		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
         		    if ($totalonlinkedelements == $object->total_ht)
         		    {
-        		        foreach($object->linkedObjects['reception'] as $element)
+        		        foreach ($object->linkedObjects['reception'] as $element)
         		        {
-        		            $ret=$element->set_billed();
+        		            $ret = $element->set_billed();
         		        }
         		    }
         		}

Braces +25 added lines, -8 removed lines

@@ -59,7 +59,10 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-        if (empty($conf->workflow->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->workflow->enabled)) {
+            return 0;
+        }
+        // Module not active, we do nothing
 
         // Proposals to order
         if ($action == 'PROPAL_CLOSE_SIGNED')
@@ -111,7 +114,9 @@ 
 				    $totalonlinkedelements=0;
 					foreach($object->linkedObjects['propal'] as $element)
 					{
-					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) {
+					        $totalonlinkedelements += $element->total_ht;
+					    }
 					}
 					dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
 					if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -140,7 +145,9 @@ 
         		    $totalonlinkedelements=0;
         		    foreach($object->linkedObjects['commande'] as $element)
         		    {
-        		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+        		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) {
+        		            $totalonlinkedelements += $element->total_ht;
+        		        }
         		    }
         		    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
         		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -163,7 +170,9 @@ 
         		    $totalonlinkedelements=0;
         		    foreach($object->linkedObjects['propal'] as $element)
         		    {
-        		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+        		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) {
+        		            $totalonlinkedelements += $element->total_ht;
+        		        }
         		    }
         		    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
         		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -192,7 +201,9 @@ 
         			$totalonlinkedelements=0;
         			foreach($object->linkedObjects['order_supplier'] as $element)
         			{
-        				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+        				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
+        				    $totalonlinkedelements += $element->total_ht;
+        				}
         			}
         			dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
         			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -215,7 +226,9 @@ 
         			$totalonlinkedelements=0;
         			foreach($object->linkedObjects['supplier_proposal'] as $element)
         			{
-        				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+        				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) {
+        				    $totalonlinkedelements += $element->total_ht;
+        				}
         			}
         			dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
         			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -243,7 +256,9 @@ 
                     $totalonlinkedelements=0;
                     foreach($object->linkedObjects['commande'] as $element)
                     {
-                        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+                        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) {
+                            $totalonlinkedelements += $element->total_ht;
+                        }
                     }
                     dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
                     if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
@@ -328,7 +343,9 @@ 
         		    $totalonlinkedelements=0;
         		    foreach($object->linkedObjects['reception'] as $element)
         		    {
-        		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+        		        if ($element->statut == Reception::STATUS_VALIDATED) {
+        		            $totalonlinkedelements += $element->total_ht;
+        		        }
         		    }
         		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
         		    if ($totalonlinkedelements == $object->total_ht)

dolibarr/htdocs/core/triggers/dolibarrtriggers.class.php

Indentation +122 added lines, -122 removed lines

@@ -21,129 +21,129 @@
 abstract class DolibarrTriggers
 {
 
-	/**
-	 * Database handler
-	 * @var DoliDB
-	 */
-	protected $db;
-
-	/**
-	 * Name of the trigger
-	 * @var mixed|string
-	 */
-	public $name = '';
-
-	/**
-	 * Description of the trigger
-	 * @var string
-	 */
-	public $description = '';
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DEVELOPMENT;
-
-	/**
-	 * Image of the trigger
-	 * @var string
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Category of the trigger
-	 * @var string
-	 */
-	public $family = '';
-
-	/**
-	 * Error reported by the trigger
-	 * @var string
-	 * @deprecated Use $this->errors
-	 * @see errors
-	 */
-	public $error = '';
-
-	/**
-	 * Errors reported by the trigger
-	 * @var array
-	 */
-	public $errors = array();
-
-	const VERSION_DEVELOPMENT = 'development';
-	const VERSION_EXPERIMENTAL = 'experimental';
-	const VERSION_DOLIBARR = 'dolibarr';
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handler
-	 */
+    /**
+     * Database handler
+     * @var DoliDB
+     */
+    protected $db;
+
+    /**
+     * Name of the trigger
+     * @var mixed|string
+     */
+    public $name = '';
+
+    /**
+     * Description of the trigger
+     * @var string
+     */
+    public $description = '';
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DEVELOPMENT;
+
+    /**
+     * Image of the trigger
+     * @var string
+     */
+    public $picto = 'technic';
+
+    /**
+     * Category of the trigger
+     * @var string
+     */
+    public $family = '';
+
+    /**
+     * Error reported by the trigger
+     * @var string
+     * @deprecated Use $this->errors
+     * @see errors
+     */
+    public $error = '';
+
+    /**
+     * Errors reported by the trigger
+     * @var array
+     */
+    public $errors = array();
+
+    const VERSION_DEVELOPMENT = 'development';
+    const VERSION_EXPERIMENTAL = 'experimental';
+    const VERSION_DOLIBARR = 'dolibarr';
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handler
+     */
     public function __construct(DoliDB $db)
     {
 
-		$this->db = $db;
-
-		if (empty($this->name))
-		{
-			$this->name = preg_replace('/^Interface/i', '', get_class($this));
-		}
-	}
-
-	/**
-	 * Returns the name of the trigger file
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Returns the description of trigger file
-	 *
-	 * @return string
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-	/**
-	 * Returns the version of the trigger file
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == self::VERSION_DEVELOPMENT) {
-			return $langs->trans("VersionDevelopment");
-		} elseif ($this->version == self::VERSION_EXPERIMENTAL) {
-			return $langs->trans("VersionExperimental");
-		} elseif ($this->version == self::VERSION_DOLIBARR) {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
-	}
-
-	/**
-	 * Function called when a Dolibarrr business event is done.
-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+        $this->db = $db;
+
+        if (empty($this->name))
+        {
+            $this->name = preg_replace('/^Interface/i', '', get_class($this));
+        }
+    }
+
+    /**
+     * Returns the name of the trigger file
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns the description of trigger file
+     *
+     * @return string
+     */
+    public function getDesc()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Returns the version of the trigger file
+     *
+     * @return string Version of trigger file
+     */
+    public function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == self::VERSION_DEVELOPMENT) {
+            return $langs->trans("VersionDevelopment");
+        } elseif ($this->version == self::VERSION_EXPERIMENTAL) {
+            return $langs->trans("VersionExperimental");
+        } elseif ($this->version == self::VERSION_DOLIBARR) {
+            return DOL_VERSION;
+        } elseif ($this->version) {
+            return $this->version;
+        } else {
+            return $langs->trans("Unknown");
+        }
+    }
+
+    /**
+     * Function called when a Dolibarrr business event is done.
+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }

dolibarr/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php

Indentation +219 added lines, -219 removed lines

@@ -107,233 +107,233 @@
      */
     public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-		$ok = 0;
-
-    	switch ($action) {
-    		case 'TICKET_ASSIGNED':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
-	            {
-	                $userstat = new User($this->db);
-	                $res = $userstat->fetch($object->fk_user_assign);
-	                if ($res > 0)
-	                {
-	                	if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
-	                	{
-	                		// Init to avoid errors
-	                		$filepath = array();
-	                		$filename = array();
-	                		$mimetype = array();
-
-	                		// Send email to assigned user
-		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
-		                    // Extrafields
-		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
-		                        foreach ($object->array_options as $key => $value) {
-	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
-		                        }
-		                    }
-
-		                    $message .= '</ul>';
-		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-		                    $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
-
-		                    $sendto = $userstat->email;
-		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
-
-	                        $message = dol_nl2br($message);
-
-	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-	                        }
-	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-		                    if ($mailfile->error) {
-	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-		                    } else {
-		                        $result = $mailfile->sendfile();
-		                    }
-	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-	                        }
-	                	}
+        $ok = 0;
+
+        switch ($action) {
+            case 'TICKET_ASSIGNED':
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+                if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
+                {
+                    $userstat = new User($this->db);
+                    $res = $userstat->fetch($object->fk_user_assign);
+                    if ($res > 0)
+                    {
+                        if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
+                        {
+                            // Init to avoid errors
+                            $filepath = array();
+                            $filename = array();
+                            $mimetype = array();
+
+                            // Send email to assigned user
+                            $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
+                            $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
+                            $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
+                            $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
+                            $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
+                            $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+                            // Extrafields
+                            if (is_array($object->array_options) && count($object->array_options) > 0) {
+                                foreach ($object->array_options as $key => $value) {
+                                    $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+                                }
+                            }
+
+                            $message .= '</ul>';
+                            $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
+                            $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+
+                            $sendto = $userstat->email;
+                            $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+
+                            $message = dol_nl2br($message);
+
+                            if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                                $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                                $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                            }
+                            include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+                            $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+                            if ($mailfile->error) {
+                                setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+                            } else {
+                                $result = $mailfile->sendfile();
+                            }
+                            if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                                $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                            }
+                        }
 
                         $ok = 1;
-	                }
-	                else
-	                {
-	                	$this->error = $userstat->error;
-	                	$this->errors = $userstat->errors;
-	                }
-	            }
-	            break;
-
-    		case 'TICKET_CREATE':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
-	            $langs->load('ticket');
-
-	            $object->fetch('', $object->track_id);	// Should be useless
-
-
-	            // Send email to notification email
-
-	            if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
-	            {
-		            $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-
-		            if ($sendto)
-					{
-						// Init to avoid errors
-						$filepath = array();
-						$filename = array();
-						$mimetype = array();
-
-						/* Send email to admin */
-			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
-			            // Extrafields
-			            if (is_array($object->array_options) && count($object->array_options) > 0) {
-			                foreach ($object->array_options as $key => $value) {
-			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
-			                }
-			            }
-			            $message_admin.='</ul>';
-
-			            if ($object->fk_soc > 0) {
-			                      $object->fetch_thirdparty();
-			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
-			            }
-
-			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-			            $replyto = $from;
-
-		                $message_admin = dol_nl2br($message_admin);
-
-		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-		                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-		                }
-		                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			            $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-			            if ($mailfile->error) {
-		                    dol_syslog($mailfile->error, LOG_DEBUG);
-			            } else {
-			                     $result=$mailfile->sendfile();
-			            }
-		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-		                }
-					}
-	            }
-
-				// Send email to customer
-
-				if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
-	            {
-		            $sendto = '';
-		            if (empty($user->socid) && empty($user->email)) {
-		                      $object->fetch_thirdparty();
-		                      $sendto = $object->thirdparty->email;
-		            } else {
-		                $sendto = $user->email;
-		            }
-
-		            if ($sendto) {
-		            	// Init to avoid errors
-		            	$filepath = array();
-		            	$filename = array();
-		            	$mimetype = array();
-
-		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-
-			            // Extrafields
-			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
-			            {
-			            	$enabled = 1;
-			            	if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
-			            	{
-			            		$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-			            	}
-			            	$perms = 1;
-			            	if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
-			            	{
-			            		$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-			            	}
-
-			            	$qualified = true;
-			            	if (empty($enabled)) $qualified = false;
-			            	if (empty($perms)) $qualified = false;
-
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
-			            }
-
-			            $message_customer.='</ul>';
-			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
-
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-			            $replyto = $from;
-
-	                    $message_customer = dol_nl2br($message_customer);
-
-	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                        $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-	                    }
-	                    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			            $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-			            if ($mailfile->error) {
-	                        dol_syslog($mailfile->error, LOG_DEBUG);
-			            } else {
-			                      $result=$mailfile->sendfile();
-			            }
-	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-	                    }
-	                }
-	            }
+                    }
+                    else
+                    {
+                        $this->error = $userstat->error;
+                        $this->errors = $userstat->errors;
+                    }
+                }
+                break;
+
+            case 'TICKET_CREATE':
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+
+                $langs->load('ticket');
+
+                $object->fetch('', $object->track_id);	// Should be useless
+
+
+                // Send email to notification email
+
+                if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
+                {
+                    $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+
+                    if ($sendto)
+                    {
+                        // Init to avoid errors
+                        $filepath = array();
+                        $filename = array();
+                        $mimetype = array();
+
+                        /* Send email to admin */
+                        $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
+                        $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+                        $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+                        $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+                        // Extrafields
+                        if (is_array($object->array_options) && count($object->array_options) > 0) {
+                            foreach ($object->array_options as $key => $value) {
+                                    $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+                            }
+                        }
+                        $message_admin.='</ul>';
+
+                        if ($object->fk_soc > 0) {
+                                    $object->fetch_thirdparty();
+                                    $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+                        }
+
+                        $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+                        $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+                        $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+                        $replyto = $from;
+
+                        $message_admin = dol_nl2br($message_admin);
+
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                        }
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                        $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+                        if ($mailfile->error) {
+                            dol_syslog($mailfile->error, LOG_DEBUG);
+                        } else {
+                                    $result=$mailfile->sendfile();
+                        }
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                        }
+                    }
+                }
+
+                // Send email to customer
+
+                if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
+                {
+                    $sendto = '';
+                    if (empty($user->socid) && empty($user->email)) {
+                                $object->fetch_thirdparty();
+                                $sendto = $object->thirdparty->email;
+                    } else {
+                        $sendto = $user->email;
+                    }
+
+                    if ($sendto) {
+                        // Init to avoid errors
+                        $filepath = array();
+                        $filename = array();
+                        $mimetype = array();
+
+                        $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
+                        $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+                        $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+                        $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+
+                        // Extrafields
+                        foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
+                        {
+                            $enabled = 1;
+                            if ($enabled && isset($this->attributes[$object->table_element]['list'][$key]))
+                            {
+                                $enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+                            }
+                            $perms = 1;
+                            if ($perms && isset($this->attributes[$object->table_element]['perms'][$key]))
+                            {
+                                $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+                            }
+
+                            $qualified = true;
+                            if (empty($enabled)) $qualified = false;
+                            if (empty($perms)) $qualified = false;
+
+                            if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+                        }
+
+                        $message_customer.='</ul>';
+                        $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+                        $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+                        $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+                        $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+
+                        $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+                        $replyto = $from;
+
+                        $message_customer = dol_nl2br($message_customer);
+
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+                        }
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                        $mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+                        if ($mailfile->error) {
+                            dol_syslog($mailfile->error, LOG_DEBUG);
+                        } else {
+                                    $result=$mailfile->sendfile();
+                        }
+                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+                        }
+                    }
+                }
                 $ok = 1;
-	            break;
+                break;
 
             case 'TICKET_DELETE':
-            	dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-            	break;
+                dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                break;
 
-           	case 'TICKET_MODIFY':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
+                case 'TICKET_MODIFY':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
 
-           	case 'TICKET_MARK_READ':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
+                case 'TICKET_MARK_READ':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
 
-           	case 'TICKET_CLOSE':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-           		break;
-    	}
+                case 'TICKET_CLOSE':
+                   dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+                    break;
+        }
 
 
         return $ok;

Spacing +42 added lines, -42 removed lines

@@ -111,7 +111,7 @@ 
 
     	switch ($action) {
     		case 'TICKET_ASSIGNED':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
 	            {
@@ -127,25 +127,25 @@ 
 	                		$mimetype = array();
 
 	                		// Send email to assigned user
-		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+		                    $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
+		                    $message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+		                    $message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		                    $message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 		                    // Extrafields
 		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
 		                        foreach ($object->array_options as $key => $value) {
-	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                                $message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 		                        }
 		                    }
 
 		                    $message .= '</ul>';
-		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-		                    $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+		                    $message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+		                    $message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 		                    $sendto = $userstat->email;
-		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+		                    $from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
 
 	                        $message = dol_nl2br($message);
 
@@ -153,7 +153,7 @@ 
 	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                        }
-	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+	                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
 		                    if ($mailfile->error) {
 	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -176,11 +176,11 @@ 
 	            break;
 
     		case 'TICKET_CREATE':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            $langs->load('ticket');
 
-	            $object->fetch('', $object->track_id);	// Should be useless
+	            $object->fetch('', $object->track_id); // Should be useless
 
 
 	            // Send email to notification email
@@ -198,27 +198,27 @@ 
 
 						/* Send email to admin */
 			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+			            $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+			            $message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
 			            // Extrafields
 			            if (is_array($object->array_options) && count($object->array_options) > 0) {
 			                foreach ($object->array_options as $key => $value) {
-			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			                      $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 			                }
 			            }
-			            $message_admin.='</ul>';
+			            $message_admin .= '</ul>';
 
 			            if ($object->fk_soc > 0) {
 			                      $object->fetch_thirdparty();
-			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+			                      $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
 			            }
 
-			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+			            $message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -234,7 +234,7 @@ 
 			            if ($mailfile->error) {
 		                    dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                     $result=$mailfile->sendfile();
+			                     $result = $mailfile->sendfile();
 			            }
 		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -261,11 +261,11 @@ 
 		            	$mimetype = array();
 
 		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+			            $message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 
 			            // Extrafields
 			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
@@ -285,14 +285,14 @@ 
 			            	if (empty($enabled)) $qualified = false;
 			            	if (empty($perms)) $qualified = false;
 
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	if ($qualified) $message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 			            }
 
-			            $message_customer.='</ul>';
-			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+			            $message_customer .= '</ul>';
+			            $message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+			            $message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+			            $message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -308,7 +308,7 @@ 
 			            if ($mailfile->error) {
 	                        dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                      $result=$mailfile->sendfile();
+			                      $result = $mailfile->sendfile();
 			            }
 	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -319,19 +319,19 @@ 
 	            break;
 
             case 'TICKET_DELETE':
-            	dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+            	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             	break;
 
            	case 'TICKET_MODIFY':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_MARK_READ':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_CLOSE':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
     	}
 

Braces +10 added lines, -5 removed lines

@@ -166,8 +166,7 @@ 
 	                	}
 
                         $ok = 1;
-	                }
-	                else
+	                } else
 	                {
 	                	$this->error = $userstat->error;
 	                	$this->errors = $userstat->errors;
@@ -282,10 +281,16 @@ 
 			            	}
 
 			            	$qualified = true;
-			            	if (empty($enabled)) $qualified = false;
-			            	if (empty($perms)) $qualified = false;
+			            	if (empty($enabled)) {
+			            	    $qualified = false;
+			            	}
+			            	if (empty($perms)) {
+			            	    $qualified = false;
+			            	}
 
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	if ($qualified) {
+			            	    $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	}
 			            }
 
 			            $message_customer.='</ul>';

dolibarr/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Indentation +111 added lines, -111 removed lines

@@ -30,121 +30,121 @@
  */
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
-	public $family = 'system';
-	public $description = "Triggers of this module add action for BlockedLog module.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Function called on Dolibarrr payment or invoice event.
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @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->blockedlog->enabled)) return 0;     // Module not active, we do nothing
-
-		// Test if event/record is qualified
-		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
-
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
-
-		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
-		{
-			return 0;
-		}
-
-		// Event/record is qualified
-		$qualified = 0;
-		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
-		)
-		{
-			$qualified++;
-
-			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
-			{
-				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
-		}
-		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+    public $family = 'system';
+    public $description = "Triggers of this module add action for BlockedLog module.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
+
+    /**
+     * Function called on Dolibarrr payment or invoice event.
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @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->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+
+        // Test if event/record is qualified
+        $listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
+        if (! in_array($object->element, $listofqualifiedelement)) return 1;
+
+        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+        $b=new BlockedLog($this->db);
+
+        // Tracked events
+        if (! in_array($action, array_keys($b->trackedevents)))
+        {
+            return 0;
+        }
+
+        // Event/record is qualified
+        $qualified = 0;
+        $amounts = 0;
+        if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+            || $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+            || $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
+            || $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
+            || $action==='CASHCONTROL_VALIDATE'
+            || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+        )
+        {
+            $qualified++;
+
+            if (in_array($action, array(
+                'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
+                'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+            elseif ($action == 'CASHCONTROL_VALIDATE')
+            {
+                $amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+            }
+            else $amounts = (double) $object->total_ttc;
+        }
+        /*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
 		{
 			$qualified++;
 			$amounts=  (double) $object->total_ttc;
 		}*/
-		if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
-			|| $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
-		{
-			$qualified++;
-			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
-					$amounts += price2num($amount);
-				}
-			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
-		{
-			$qualified++;
-			$amounts = (double) $object->amount;
-		}
-
-		// Another protection.
-		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
-		{
-			return 0; // not implemented action log
-		}
-
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
-
-		if ($result < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-
-		$res = $b->create($user);
-
-		if ($res < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-		else
-		{
-			return 1;
-		}
+        if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
+            || $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
+        {
+            $qualified++;
+            $amounts = 0;
+            if(!empty($object->amounts)) {
+                foreach($object->amounts as $amount) {
+                    $amounts += price2num($amount);
+                }
+            }
+        }
+        elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+        {
+            $qualified++;
+            $amounts = (double) $object->amount;
+        }
+
+        // Another protection.
+        // May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
+        if (! $qualified)
+        {
+            return 0; // not implemented action log
+        }
+
+        $result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+
+        if ($result < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+
+        $res = $b->create($user);
+
+        if ($res < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -56,19 +56,19 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (!in_array($object->element, $listofqualifiedelement)) return 1;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
+		$b = new BlockedLog($this->db);
 
 		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
+		if (!in_array($action, array_keys($b->trackedevents)))
 		{
 			return 0;
 		}
@@ -76,19 +76,19 @@ 
 		// Event/record is qualified
 		$qualified = 0;
 		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+		if ($action === 'BILL_VALIDATE' || $action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || $action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || $action === 'DON_MODIFY' || $action === 'DON_DELETE'
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_PREVIEW')
 		)
 		{
 			$qualified++;
 
 			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
+				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
@@ -106,13 +106,13 @@ 
 		{
 			$qualified++;
 			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
+			if (!empty($object->amounts)) {
+				foreach ($object->amounts as $amount) {
 					$amounts += price2num($amount);
 				}
 			}
 		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -120,12 +120,12 @@ 
 
 		// Another protection.
 		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
+		if (!$qualified)
 		{
 			return 0; // not implemented action log
 		}
 
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+		$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
 
 		if ($result < 0)
 		{

Braces +14 added lines, -9 removed lines

@@ -56,11 +56,16 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (! in_array($object->element, $listofqualifiedelement)) {
+		    return 1;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -88,12 +93,14 @@ 
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
+				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) {
+			    $amounts = (double) $object->amount;
+			} elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+			} else {
+			    $amounts = (double) $object->total_ttc;
 			}
-			else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -111,8 +118,7 @@ 
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -141,8 +147,7 @@ 
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
+		} else
 		{
 			return 1;
 		}