alxarafe / alixar

dolibarr/htdocs/core/ajax/extraparams.php

Braces +20 added lines, -16 removed lines

@@ -20,11 +20,22 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 include '../../main.inc.php';
 
@@ -51,20 +62,13 @@ 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; } else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; } else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; } else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; } else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; } else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; } else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; } else {
+	    $classname = ucfirst($subelement);
+	}
 
 	$object	= new $classname($db);
 	$object->fetch($id);

dolibarr/htdocs/core/actions_printing.inc.php

Braces +4 added lines, -3 removed lines

@@ -75,15 +75,16 @@
                         setEventMessages($printer->error, $printer->errors);
                         setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
                     }
-                }
-                catch(Exception $e)
+                } catch(Exception $e)
                 {
                     $ret = 1;
                     setEventMessages($e->getMessage(), null, 'errors');
                 }
             }
         }
-        if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+        if ($printerfound==0) {
+            setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+        }
     } else {
         setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
     }

dolibarr/htdocs/core/antispamimage.php

Braces +18 added lines, -6 removed lines

@@ -23,12 +23,24 @@
 
 define('NOLOGIN',1);
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER',1);
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB',1);
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER',1);
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB',1);
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN',1);
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 
 require_once '../main.inc.php';
 

dolibarr/htdocs/core/extrafieldsinexport.inc.php

Braces +6 added lines, -2 removed lines

@@ -11,11 +11,13 @@ 
 $sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
 $resql=$this->db->query($sql);
-if ($resql)    // This can fail when class is used on old database (during migration for example)
+if ($resql) {
+    // This can fail when class is used on old database (during migration for example)
 {
 	while ($obj=$this->db->fetch_object($resql))
 	{
 		$fieldname=$keyforaliasextra.'.'.$obj->name;
+}
 		$fieldlabel=ucfirst($obj->label);
 		$typeFilter="Text";
 		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
@@ -41,7 +43,9 @@ 
 					$tmpkeys=array_keys($tmpparam['options']);
 					$tmp=array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+				    $typeFilter="List:".$tmp;
+				}
 				break;
 		}
 		if ($obj->type!='separate')

dolibarr/htdocs/core/actions_massactions.inc.php

Braces +372 added lines, -189 removed lines

@@ -54,10 +54,12 @@ 
 	$error++;
 }
 
-if (! $error && $massaction == 'confirm_presend' && ! GETPOST('sendmail'))  // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
+if (! $error && $massaction == 'confirm_presend' && ! GETPOST('sendmail')) {
+    // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
 {
 	$massaction='presend';
 }
+}
 if (! $error && $massaction == 'confirm_presend')
 {
 	$resaction = '';
@@ -73,8 +75,12 @@ 
 	if (! $error)
 	{
 		$thirdparty=new Societe($db);
-		if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
-		if ($objecttmp->element == 'holiday')       $thirdparty=new User($db);
+		if ($objecttmp->element == 'expensereport') {
+		    $thirdparty=new User($db);
+		}
+		if ($objecttmp->element == 'holiday') {
+		    $thirdparty=new User($db);
+		}
 
 		$objecttmp=new $objectclass($db);
 		foreach($toselect as $toselectid)
@@ -85,9 +91,15 @@ 
 			{
 				$listofobjectid[$toselectid]=$toselectid;
 				$thirdpartyid=($objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid);
-				if ($objecttmp->element == 'societe')       $thirdpartyid=$objecttmp->id;
-				if ($objecttmp->element == 'expensereport') $thirdpartyid=$objecttmp->fk_user_author;
-				if ($objecttmp->element == 'holiday')       $thirdpartyid=$objecttmp->fk_user;
+				if ($objecttmp->element == 'societe') {
+				    $thirdpartyid=$objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+				    $thirdpartyid=$objecttmp->fk_user_author;
+				}
+				if ($objecttmp->element == 'holiday') {
+				    $thirdpartyid=$objecttmp->fk_user;
+				}
 				$listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
 				$listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
 			}
@@ -105,12 +117,17 @@ 
 	$receiver=$_POST['receiver'];
 	if (! is_array($receiver))
 	{
-		if (empty($receiver) || $receiver == '-1') $receiver=array();
-		else $receiver=array($receiver);
+		if (empty($receiver) || $receiver == '-1') {
+		    $receiver=array();
+		} else {
+		    $receiver=array($receiver);
+		}
 	}
-	if (! trim($_POST['sendto']) && count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
+	if (! trim($_POST['sendto']) && count($receiver) == 0 && count($listofobjectthirdparties) == 1) {
+	    // if only one recipient, receiver is mandatory
 	{
 	 	$error++;
+	}
 	   	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
 	   	$massaction='presend';
 	}
@@ -151,13 +168,16 @@ 
 				foreach($receiver as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party or user
+					if ($val == 'thirdparty') {
+					    // Id of third party or user
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 					}
-					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property')) {
+					    // Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					}
 						$sendtoid[] = $val;
 					}
 				}
@@ -168,8 +188,11 @@ 
 			$receivercc=$_POST['receivercc'];
 			if (! is_array($receivercc))
 			{
-				if ($receivercc == '-1') $receivercc=array();
-				else $receivercc=array($receivercc);
+				if ($receivercc == '-1') {
+				    $receivercc=array();
+				} else {
+				    $receivercc=array($receivercc);
+				}
 			}
 			$tmparray=array();
 			if (trim($_POST['sendtocc']))
@@ -181,13 +204,16 @@ 
 				foreach($receivercc as $key=>$val)
 				{
 					// Recipient was provided from combo list
-					if ($val == 'thirdparty') // Id of third party
+					if ($val == 'thirdparty') {
+					    // Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
 					}
-					elseif ($val)	// Id du contact
+					} elseif ($val) {
+					    // Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					}
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 					}
 				}
@@ -226,15 +252,16 @@ 
 				}
 
 				// Test recipient
-				if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+				if (empty($sendto)) {
+				    // For the case, no recipient were set (multi thirdparties send)
 				{
 					if ($objectobj->element == 'expensereport')
 					{
 						$fuser = new User($db);
+				}
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					}
-					else
+					} else
 					{
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
@@ -271,8 +298,7 @@ 
 							'names'=>array_merge($attachedfiles['names'],array($filename)),
 							'mimes'=>array_merge($attachedfiles['mimes'],array($mime))
 							);
-					}
-					else
+					} else
 					{
 							$nbignored++;
 							$langs->load("errors");
@@ -298,19 +324,15 @@ 
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
 					$from = $user->getFullName($langs) .' <'.$user->email.'>';
-				}
-				elseif ($fromtype === 'company') {
+				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-				}
-				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp=explode(',', $user->email_aliases);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 					$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
@@ -318,8 +340,7 @@ 
 					{
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
-				}
-				else {
+				} else {
 					$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
 				}
 
@@ -328,12 +349,24 @@ 
 				$message = GETPOST('message','none');
 
 				$sendtobcc = GETPOST('sendtoccc');
-				if ($objectclass == 'Propal') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
-				if ($objectclass == 'Commande') 			$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
-				if ($objectclass == 'Facture') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
-				if ($objectclass == 'Supplier_Proposal') 	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
-				if ($objectclass == 'CommandeFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
-				if ($objectclass == 'FactureFournisseur')	$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+				if ($objectclass == 'Propal') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+				}
+				if ($objectclass == 'Commande') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+				}
+				if ($objectclass == 'Facture') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+				}
+				if ($objectclass == 'Supplier_Proposal') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
+				}
+				if ($objectclass == 'CommandeFournisseur') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
+				}
+				if ($objectclass == 'FactureFournisseur') {
+				    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+				}
 
 				// $listofqualifiedobj is array with key = object id and value is instance of qualified objects, for the current thirdparty (but thirdparty property is not loaded yet)
 				$oneemailperrecipient=(GETPOST('oneemailperrecipient')=='on'?1:0);
@@ -345,8 +378,7 @@ 
 					{
 						$looparray[$key]->thirdparty = $thirdparty;
 					}
-				}
-				else
+				} else
 				{
 					$objectforloop=new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty;
@@ -354,10 +386,12 @@ 
 				}
 				//var_dump($looparray);exit;
 
-				foreach ($looparray as $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
+				foreach ($looparray as $objecttmp) {
+				    // $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per record
 				{
 					// Make substitution in email content
 					$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
+				}
 					$substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ',array_keys($listofqualifiedobj)) : $objecttmp->id);
 					$substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ',$listofqualifiedref) : $objecttmp->ref);
 					$substitutionarray['__EMAIL__'] = $thirdparty->email;
@@ -385,19 +419,36 @@ 
 					if ($oneemailperrecipient)
 					{
 						$trackid='thi'.$thirdparty->id;
-						if ($objecttmp->element == 'expensereport') $trackid='use'.$thirdparty->id;
-						if ($objecttmp->element == 'holiday') $trackid='use'.$thirdparty->id;
-					}
-					else
+						if ($objecttmp->element == 'expensereport') {
+						    $trackid='use'.$thirdparty->id;
+						}
+						if ($objecttmp->element == 'holiday') {
+						    $trackid='use'.$thirdparty->id;
+						}
+					} else
 					{
 						$trackid=strtolower(get_class($objecttmp));
-						if (get_class($objecttmp)=='Contrat')  $trackid='con';
-						if (get_class($objecttmp)=='Propal')   $trackid='pro';
-						if (get_class($objecttmp)=='Commande') $trackid='ord';
-						if (get_class($objecttmp)=='Facture')  $trackid='inv';
-						if (get_class($objecttmp)=='Supplier_Proposal')   $trackid='spr';
-						if (get_class($objecttmp)=='CommandeFournisseur') $trackid='sor';
-						if (get_class($objecttmp)=='FactureFournisseur')  $trackid='sin';
+						if (get_class($objecttmp)=='Contrat') {
+						    $trackid='con';
+						}
+						if (get_class($objecttmp)=='Propal') {
+						    $trackid='pro';
+						}
+						if (get_class($objecttmp)=='Commande') {
+						    $trackid='ord';
+						}
+						if (get_class($objecttmp)=='Facture') {
+						    $trackid='inv';
+						}
+						if (get_class($objecttmp)=='Supplier_Proposal') {
+						    $trackid='spr';
+						}
+						if (get_class($objecttmp)=='CommandeFournisseur') {
+						    $trackid='sor';
+						}
+						if (get_class($objecttmp)=='FactureFournisseur') {
+						    $trackid='sin';
+						}
 
 						$trackid.=$objecttmp->id;
 					}
@@ -410,8 +461,7 @@ 
 					if ($mailfile->error)
 					{
 						$resaction.='<div class="error">'.$mailfile->error.'</div>';
-					}
-					else
+					} else
 					{
 						$result=$mailfile->sendfile();
 						if ($result)
@@ -433,7 +483,9 @@ 
 								$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 								if ($message)
 								{
-									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+									if ($sendtocc) {
+									    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+									}
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
 									$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -448,14 +500,30 @@ 
 								$objectobj->elementtype	= $objectobj->element;
 
 								$triggername = strtoupper(get_class($objectobj)) .'_SENTBYMAIL';
-								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
-								if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
-								if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
-								if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYMAIL';
-								if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
-								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
-								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
-								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+								if ($triggername == 'SOCIETE_SENTBYMAIL') {
+								    $triggername = 'COMPANY_SENTBYEMAIL';
+								}
+								if ($triggername == 'CONTRAT_SENTBYMAIL') {
+								    $triggername = 'CONTRACT_SENTBYEMAIL';
+								}
+								if ($triggername == 'COMMANDE_SENTBYMAIL') {
+								    $triggername = 'ORDER_SENTBYEMAIL';
+								}
+								if ($triggername == 'FACTURE_SENTBYMAIL') {
+								    $triggername = 'BILL_SENTBYMAIL';
+								}
+								if ($triggername == 'EXPEDITION_SENTBYMAIL') {
+								    $triggername = 'SHIPPING_SENTBYEMAIL';
+								}
+								if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') {
+								    $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+								}
+								if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') {
+								    $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+								}
+								if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') {
+								    $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
+								}
 
 								if (! empty($triggername))
 								{
@@ -475,16 +543,14 @@ 
 
 								$nbsent++;
 							}
-						}
-						else
+						} else
 						{
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
 								$resaction.='<br><div class="error">'.$mailfile->error.'</div>';
-							}
-							else
+							} else
 							{
 								$resaction.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
@@ -506,8 +572,7 @@ 
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
-		}
-		else
+		} else
 		{
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
@@ -534,10 +599,15 @@ 
 	foreach($orders as $id_order)
 	{
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0) continue;
+		if ($cmd->fetch($id_order) <= 0) {
+		    continue;
+		}
 
 		$objecttmp = new Facture($db);
-		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+		    $objecttmp = $TFactThird[$cmd->socid];
+		}
+		// If option "one bill per third" is set, we use already created order.
 		else {
 
 			$objecttmp->socid = $cmd->socid;
@@ -558,7 +628,9 @@ 
 
 			$res = $objecttmp->create($user);
 
-			if($res > 0) $nb_bills_created++;
+			if($res > 0) {
+			    $nb_bills_created++;
+			}
 		}
 
 		if ($objecttmp->id > 0)
@@ -611,28 +683,38 @@ 
 						{
 							$result=$objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
-						}
-						else
+						} else
 						{
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// Positive line
 						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
 						// Date start
 						$date_start=false;
-						if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-						if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-						if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+						if ($lines[$i]->date_debut_prevue) {
+						    $date_start=$lines[$i]->date_debut_prevue;
+						}
+						if ($lines[$i]->date_debut_reel) {
+						    $date_start=$lines[$i]->date_debut_reel;
+						}
+						if ($lines[$i]->date_start) {
+						    $date_start=$lines[$i]->date_start;
+						}
 						//Date end
 						$date_end=false;
-						if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-						if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-						if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+						if ($lines[$i]->date_fin_prevue) {
+						    $date_end=$lines[$i]->date_fin_prevue;
+						}
+						if ($lines[$i]->date_fin_reel) {
+						    $date_end=$lines[$i]->date_fin_reel;
+						}
+						if ($lines[$i]->date_end) {
+						    $date_end=$lines[$i]->date_end;
+						}
 						// Reset fk_parent_line for no child products and special product
 						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
 						{
@@ -675,8 +757,7 @@ 
 						if ($result > 0)
 						{
 							$lineid=$result;
-						}
-						else
+						} else
 						{
 							$lineid=0;
 							$error++;
@@ -694,8 +775,11 @@ 
 
 		//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
-		else $TFact[$objecttmp->id] = $objecttmp;
+		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
+		    $TFactThird[$cmd->socid] = $objecttmp;
+		} else {
+		    $TFact[$objecttmp->id] = $objecttmp;
+		}
 	}
 
 	// Build doc with all invoices
@@ -734,34 +818,79 @@ 
 
 		// Make a redirect to avoid to bill twice if we make a refresh or back
 		$param='';
-		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-		if ($sall)					$param.='&sall='.urlencode($sall);
-		if ($socid > 0)             $param.='&socid='.urlencode($socid);
-		if ($viewstatut != '')      $param.='&viewstatut='.urlencode($viewstatut);
-		if ($search_orderday)      		$param.='&search_orderday='.urlencode($search_orderday);
-		if ($search_ordermonth)      		$param.='&search_ordermonth='.urlencode($search_ordermonth);
-		if ($search_orderyear)       		$param.='&search_orderyear='.urlencode($search_orderyear);
-		if ($search_deliveryday)   		$param.='&search_deliveryday='.urlencode($search_deliveryday);
-		if ($search_deliverymonth)   		$param.='&search_deliverymonth='.urlencode($search_deliverymonth);
-		if ($search_deliveryyear)    		$param.='&search_deliveryyear='.urlencode($search_deliveryyear);
-		if ($search_ref)      		$param.='&search_ref='.urlencode($search_ref);
-		if ($search_company)  		$param.='&search_company='.urlencode($search_company);
-		if ($search_ref_customer)	$param.='&search_ref_customer='.urlencode($search_ref_customer);
-		if ($search_user > 0) 		$param.='&search_user='.urlencode($search_user);
-		if ($search_sale > 0) 		$param.='&search_sale='.urlencode($search_sale);
-		if ($search_total_ht != '') $param.='&search_total_ht='.urlencode($search_total_ht);
-		if ($search_total_vat != '') $param.='&search_total_vat='.urlencode($search_total_vat);
-		if ($search_total_ttc != '') $param.='&search_total_ttc='.urlencode($search_total_ttc);
-		if ($search_project_ref >= 0)  	$param.="&search_project_ref=".urlencode($search_project_ref);
-		if ($show_files)            $param.='&show_files=' .urlencode($show_files);
-		if ($optioncss != '')       $param.='&optioncss='.urlencode($optioncss);
-		if ($billed != '')			$param.='&billed='.urlencode($billed);
+		if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		    $param.='&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+		    $param.='&limit='.urlencode($limit);
+		}
+		if ($sall) {
+		    $param.='&sall='.urlencode($sall);
+		}
+		if ($socid > 0) {
+		    $param.='&socid='.urlencode($socid);
+		}
+		if ($viewstatut != '') {
+		    $param.='&viewstatut='.urlencode($viewstatut);
+		}
+		if ($search_orderday) {
+		    $param.='&search_orderday='.urlencode($search_orderday);
+		}
+		if ($search_ordermonth) {
+		    $param.='&search_ordermonth='.urlencode($search_ordermonth);
+		}
+		if ($search_orderyear) {
+		    $param.='&search_orderyear='.urlencode($search_orderyear);
+		}
+		if ($search_deliveryday) {
+		    $param.='&search_deliveryday='.urlencode($search_deliveryday);
+		}
+		if ($search_deliverymonth) {
+		    $param.='&search_deliverymonth='.urlencode($search_deliverymonth);
+		}
+		if ($search_deliveryyear) {
+		    $param.='&search_deliveryyear='.urlencode($search_deliveryyear);
+		}
+		if ($search_ref) {
+		    $param.='&search_ref='.urlencode($search_ref);
+		}
+		if ($search_company) {
+		    $param.='&search_company='.urlencode($search_company);
+		}
+		if ($search_ref_customer) {
+		    $param.='&search_ref_customer='.urlencode($search_ref_customer);
+		}
+		if ($search_user > 0) {
+		    $param.='&search_user='.urlencode($search_user);
+		}
+		if ($search_sale > 0) {
+		    $param.='&search_sale='.urlencode($search_sale);
+		}
+		if ($search_total_ht != '') {
+		    $param.='&search_total_ht='.urlencode($search_total_ht);
+		}
+		if ($search_total_vat != '') {
+		    $param.='&search_total_vat='.urlencode($search_total_vat);
+		}
+		if ($search_total_ttc != '') {
+		    $param.='&search_total_ttc='.urlencode($search_total_ttc);
+		}
+		if ($search_project_ref >= 0) {
+		    $param.="&search_project_ref=".urlencode($search_project_ref);
+		}
+		if ($show_files) {
+		    $param.='&show_files=' .urlencode($show_files);
+		}
+		if ($optioncss != '') {
+		    $param.='&optioncss='.urlencode($optioncss);
+		}
+		if ($billed != '') {
+		    $param.='&billed='.urlencode($billed);
+		}
 
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
-	}
-	else
+	} else
 	{
 		$db->rollback();
 		$action='create';
@@ -785,8 +914,9 @@ 
 	{
 
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0)
-			continue;
+		if ($cmd->fetch($id_order) <= 0) {
+					continue;
+		}
 
 		if ($cmd->statut != Commande::STATUS_VALIDATED)
 		{
@@ -794,28 +924,28 @@ 
 			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
 			$error++;
 			break;
+		} else {
+					$result = $cmd->cancel();
 		}
-		else
-			$result = $cmd->cancel();
 
 		if ($result < 0)
 		{
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
+		} else {
+					$nbok++;
 		}
-		else
-			$nbok++;
 	}
 	if (!$error)
 	{
-		if ($nbok > 1)
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		} else {
+					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -852,8 +982,13 @@ 
 	}
 
 	$arrayofinclusion=array();
-	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'\.pdf$';
-	foreach($listofobjectref as $tmppdf) $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'_[a-zA-Z0-9-_]+\.pdf$';	// To include PDF generated from ODX files
+	foreach($listofobjectref as $tmppdf) {
+	    $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'\.pdf$';
+	}
+	foreach($listofobjectref as $tmppdf) {
+	    $arrayofinclusion[]='^'.preg_quote(dol_sanitizeFileName($tmppdf),'/').'_[a-zA-Z0-9-_]+\.pdf$';
+	}
+	// To include PDF generated from ODX files
 	$listoffiles = dol_dir_list($uploaddir,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
 
 	// build list of files with full path
@@ -874,8 +1009,12 @@ 
 	// Define output language (Here it is not used because we do only merging existing PDF)
 	$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)) $newlang=$objecttmp->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+	    $newlang=GETPOST('lang_id','aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+	    $newlang=$objecttmp->thirdparty->default_lang;
+	}
 	if (! empty($newlang))
 	{
 		$outputlangs = new Translate("",$conf);
@@ -894,11 +1033,18 @@ 
 		// Save merged file
 		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
 		{
-			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			if ($option=='late') {
+			    $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			} else {
+			    $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			}
+		}
+		if ($year) {
+		    $filename.='_'.$year;
+		}
+		if ($month) {
+		    $filename.='_'.$month;
 		}
-		if ($year) $filename.='_'.$year;
-		if ($month) $filename.='_'.$month;
 
 		if (count($files)>0)
 		{
@@ -913,18 +1059,17 @@ 
 			$cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
 			exec($cmd);
 
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+							@chmod($file, octdec($conf->global->MAIN_UMASK));
+			}
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		// Create empty PDF
 		$formatarray=pdf_getFormat();
 		$page_largeur = $formatarray['width'];
@@ -940,7 +1085,9 @@ 
 		}
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+		    $pdf->SetCompression(false);
+		}
 
 		// Add all others
 		foreach($files as $file)
@@ -966,23 +1113,30 @@ 
 		// Save merged file
 		if (in_array($objecttmp->element, array('facture', 'facture_fournisseur')) && $search_status == Facture::STATUS_VALIDATED)
 		{
-			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			if ($option=='late') {
+			    $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
+			} else {
+			    $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
+			}
+		}
+		if ($year) {
+		    $filename.='_'.$year;
+		}
+		if ($month) {
+		    $filename.='_'.$month;
 		}
-		if ($year) $filename.='_'.$year;
-		if ($month) $filename.='_'.$month;
 		if ($pagecount)
 		{
 			$now=dol_now();
 			$file=$diroutputmassaction.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
 			$pdf->Output($file,'F');
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+							@chmod($file, octdec($conf->global->MAIN_UMASK));
+			}
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-		}
-		else
+		} else
 		{
 		setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
@@ -998,8 +1152,11 @@ 
 	$upload_dir = $diroutputmassaction;
 	$file = $upload_dir . '/' . GETPOST('file');
 	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	if ($ret) {
+	    setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	} else {
+	    setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	}
 	$action='';
 }
 
@@ -1039,16 +1196,15 @@ 
 					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
 					$error++;
 					break;
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
+				} else {
+				    $nbok++;
 				}
-				else $nbok++;
-			}
-			else
+			} else
 			{
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
@@ -1058,11 +1214,13 @@ 
 
 		if (! $error)
 		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			if ($nbok > 1) {
+			    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			} else {
+			    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 		}
@@ -1083,10 +1241,10 @@ 
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            } else
-                $nbok++;
-        }
-        else {
+            } else {
+                            $nbok++;
+            }
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1094,13 +1252,13 @@ 
     }
 
     if (!$error) {
-        if ($nbok > 1)
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        if ($nbok > 1) {
+                    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        } else {
+                    setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        }
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -1137,18 +1295,21 @@ 
 				}
 			}
 
-			if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-			else $result = $objecttmp->delete($user);
+			if (in_array($objecttmp->element, array('societe', 'member'))) {
+			    $result = $objecttmp->delete($objecttmp->id, $user, 1);
+			} else {
+			    $result = $objecttmp->delete($user);
+			}
 
 			if ($result <= 0)
 			{
 			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			    $error++;
 			    break;
+			} else {
+			    $nbok++;
 			}
-			else $nbok++;
-		}
-		else
+		} else
 		{
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1158,11 +1319,13 @@ 
 
 	if (! $error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+		    setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} else {
+		    setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1185,9 +1348,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($objecttmp->thirdparty->default_lang)) $newlang=$objecttmp->thirdparty->default_lang;  // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang=$objecttmp->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($objecttmp->thirdparty->default_lang)) {
+			    $newlang=$objecttmp->thirdparty->default_lang;
+			}
+			// for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) {
+			    $newlang=$objecttmp->default_lang;
+			}
+			// for thirdparty
 			if (! empty($newlang))
 			{
 				$outputlangs = new Translate("",$conf);
@@ -1195,10 +1366,18 @@ 
 			}
 	
 			// 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= $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
@@ -1207,10 +1386,10 @@ 
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
+			} else {
+			    $nbok++;
 			}
-			else $nbok++;
-		}
-		else
+		} else
 		{
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1220,11 +1399,13 @@ 
 
 	if (! $error)
 	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		if ($nbok > 1) {
+		    setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		} else {
+		    setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		}
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1234,7 +1415,9 @@ 
 $parameters['uploaddir']=$uploaddir;
 
 $reshook=$hookmanager->executeHooks('doMassActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 

dolibarr/htdocs/core/js/lib_notification.js.php

Braces +21 added lines, -7 removed lines

@@ -18,13 +18,27 @@
  * Library javascript to enable Browser notifications
  */
 
-if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN')) define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+    define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML', 1);
+}
 
 require_once '../../main.inc.php';
 

dolibarr/htdocs/core/js/lib_gravatar.js.php

Braces +26 added lines, -9 removed lines

@@ -24,14 +24,28 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+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('NOLOGIN'))         define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+if (! defined('NOLOGIN')) {
+    define('NOLOGIN',1);
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML',1);
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 session_cache_limiter('public');
 
@@ -40,8 +54,11 @@ 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+    header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+    header('Cache-Control: no-cache');
+}
 
 ?>
 

dolibarr/htdocs/core/js/timepicker.js.php

Braces +29 added lines, -10 removed lines

@@ -21,13 +21,27 @@ 
  * \brief      File that include javascript functions for timepicker
  */
 
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+if (! defined('NOLOGIN')) {
+    define('NOLOGIN',1);
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML',1);
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 session_cache_limiter('public');
 
@@ -36,8 +50,11 @@ 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+    header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+    header('Cache-Control: no-cache');
+}
 ?>
 
 // For JQuery Timepicker
@@ -61,4 +78,6 @@ 
 });
 
 <?php
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+    $db->close();
+}

dolibarr/htdocs/core/actions_linkedfiles.inc.php

Braces +44 added lines, -34 removed lines

@@ -31,8 +31,11 @@ 
 {
 	if (! empty($_FILES))
 	{
-		if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
-		else $userfiles=array($_FILES['userfile']['tmp_name']);
+		if (is_array($_FILES['userfile']['tmp_name'])) {
+		    $userfiles=$_FILES['userfile']['tmp_name'];
+		} else {
+		    $userfiles=array($_FILES['userfile']['tmp_name']);
+		}
 
 		foreach($userfiles as $key => $userfile)
 		{
@@ -41,8 +44,7 @@ 
 				$error++;
 				if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
 					setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 				}
 			}
@@ -52,20 +54,20 @@ 
 		{
 			// Define if we have to generate thumbs or not
 			$generatethumbs = 1;
-			if (GETPOST('section_dir')) $generatethumbs=0;
+			if (GETPOST('section_dir')) {
+			    $generatethumbs=0;
+			}
 
 			if (! empty($upload_dirold) && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
 				$result = dol_add_file_process($upload_dirold, 0, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
-			}
-			elseif (! empty($upload_dir))
+			} elseif (! empty($upload_dir))
 			{
 				$result = dol_add_file_process($upload_dir, 0, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
 			}
 		}
 	}
-}
-elseif (GETPOST('linkit','none') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+} elseif (GETPOST('linkit','none') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
     $link = GETPOST('link', 'alpha');
     if ($link)
@@ -82,25 +84,34 @@ 
 if ($action == 'confirm_deletefile' && $confirm == 'yes')
 {
         $urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1);				// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-        if (GETPOST('section', 'alpha')) 	// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
+        if (GETPOST('section', 'alpha')) {
+            // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
         {
         	$file = $upload_dir . (preg_match('/\/$/', $upload_dir) ? '' : '/') . $urlfile;
         }
-        else								// For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+        } else								// For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 		{
        		$urlfile=basename($urlfile);
        		$file = $upload_dir . (preg_match('/\/$/', $upload_dir) ? '' : '/') . $urlfile;
-			if (! empty($upload_dirold)) $fileold = $upload_dirold . "/" . $urlfile;
+			if (! empty($upload_dirold)) {
+			    $fileold = $upload_dirold . "/" . $urlfile;
+			}
 		}
         $linkid = GETPOST('linkid', 'int');
 
-        if ($urlfile)		// delete of a file
+        if ($urlfile) {
+            // delete of a file
         {
-	        $dir = dirname($file).'/';		// Chemin du dossier contenant l'image d'origine
+	        $dir = dirname($file).'/';
+        }
+        // Chemin du dossier contenant l'image d'origine
 	        $dirthumb = $dir.'/thumbs/';	// Chemin du dossier contenant la vignette (if file is an image)
 
 	        $ret = dol_delete_file($file, 0, 0, 0, (is_object($object)?$object:null));
-            if (! empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object)?$object:null));     // Delete file using old path
+            if (! empty($fileold)) {
+                dol_delete_file($fileold, 0, 0, 0, (is_object($object)?$object:null));
+            }
+            // Delete file using old path
 
 	        // Si elle existe, on efface la vignette
 	        if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i',$file,$regs))
@@ -118,12 +129,16 @@ 
 		        }
 	        }
 
-            if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
-            else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
-        }
-        elseif ($linkid)	// delete of external link
+            if ($ret) {
+                setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
+            } else {
+                setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
+            }
+        } elseif ($linkid) {
+            // delete of external link
         {
             require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        }
             $link = new Link($db);
             $link->id = $linkid;
             $link->fetch();
@@ -147,15 +162,13 @@ 
         	{
         		header('Location: ' . $backtopage);
         		exit;
-        	}
-        	else
+        	} else
         	{
         		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir','alpha')?'&section_dir='.urlencode(GETPOST('section_dir','alpha')):'').(!empty($withproject)?'&withproject=1':''));
         		exit;
         	}
         }
-}
-elseif ($action == 'confirm_updateline' && GETPOST('save','alpha') && GETPOST('link', 'alpha'))
+} elseif ($action == 'confirm_updateline' && GETPOST('save','alpha') && GETPOST('link', 'alpha'))
 {
     require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
     $langs->load('link');
@@ -175,13 +188,11 @@ 
         {
             setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
-    }
-    else
+    } else
     {
         //error fetching
     }
-}
-elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
 {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	if (! empty($upload_dir))
@@ -220,7 +231,9 @@ 
 			            	// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
 			            	// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
 			            	// but when we rename from a tab "Documents", we must regenerate thumbs
-			            	if (GETPOST('modulepart') == 'medias') $generatethumbs=0;
+			            	if (GETPOST('modulepart') == 'medias') {
+			            	    $generatethumbs=0;
+			            	}
 
 			            	if ($generatethumbs)
 			            	{
@@ -234,14 +247,12 @@ 
 			            	}
 
 			                setEventMessages($langs->trans("FileRenamed"), null);
-			            }
-			            else
+			            } else
 			            {
 			                $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
 			            }
-	            	}
-	            	else
+	            	} else
 	            	{
 	            		$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
@@ -268,8 +279,7 @@ 
 		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		    		$ecmfile->share = getRandomPassword(true);
 		    	}
-		    }
-		    else
+		    } else
 		    {
 		    	$ecmfile->share = '';
 		    }