alxarafe / alixar

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

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

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

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

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/interface_50_modTicket_TicketEmail.class.php

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

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;
 		}

dolibarr/htdocs/core/db/DoliDB.class.php

Braces +24 added lines, -17 removed lines

@@ -120,8 +120,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -146,13 +145,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -174,8 +171,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -192,10 +188,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+		    return "";
+		}
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT $offset,$limit ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -235,8 +238,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+				    $return.=' ORDER BY ';
+				} else {
+				    $return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
@@ -252,8 +258,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -281,7 +286,9 @@ 
 	function jdate($string, $gm=false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+		    return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

dolibarr/htdocs/core/actions_builddoc.inc.php

Braces +33 added lines, -14 removed lines

@@ -37,8 +37,7 @@ 
     if (is_numeric(GETPOST('model','alpha')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-    }
-    else
+    } else
     {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -68,9 +67,17 @@ 
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+            $newlang=GETPOST('lang_id','aZ09');
+        }
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) {
+            $newlang=$object->thirdparty->default_lang;
+        }
+        // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+            $newlang=$object->default_lang;
+        }
+        // for thirdparty
         if (! empty($newlang))
         {
             $outputlangs = new Translate("",$conf);
@@ -78,22 +85,31 @@ 
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) {
+            $hidedetails=0;
+        }
+        if (empty($hidedesc)) {
+            $hidedesc=0;
+        }
+        if (empty($hideref)) {
+            $hideref=0;
+        }
+        if (empty($moreparams)) {
+            $moreparams=null;
+        }
 
         $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action='';
-        }
-        else
+        } else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+        	if (empty($donotredirect)) {
+        	    // This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
+        	}
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
@@ -122,8 +138,11 @@ 
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    if ($ret) {
+        setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    }
 
     // Make a redirect to avoid to keep the remove_file into the url that create side effects
     $urltoredirect = $_SERVER['REQUEST_URI'];

dolibarr/htdocs/core/search_page.php

Braces +19 added lines, -8 removed lines

@@ -27,15 +27,24 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,13 +78,14 @@ 
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {
+    // select2 is ko with jmobile
 {
     if (! is_object($form)) $form=new Form($db);
+}
     $selected=-1;
     $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
+} else
 {
     $usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore','int');
@@ -104,8 +114,9 @@ 
 if (empty($reshook))
 {
 	$searchform.=$hookmanager->resPrint;
+} else {
+    $searchform=$hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
 
 
 print "\n";