alxarafe / alixar

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

dolibarr/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

Braces +138 added lines, -70 removed lines

@@ -137,7 +137,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
@@ -156,9 +159,11 @@ 
 
 		$this->posxpicture=$this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
 
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 		    $this->posxweightvol-=20;
+		}
 		    $this->posxpicture-=20;
 		    $this->posxqtyordered-=20;
 		    $this->posxqtytoship-=20;
@@ -191,9 +196,13 @@ 
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
@@ -208,7 +217,9 @@ 
 
             for ($i = 0 ; $i < $nblignes ; $i++)
             {
-                if (empty($object->lines[$i]->fk_product)) continue;
+                if (empty($object->lines[$i]->fk_product)) {
+                    continue;
+                }
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -220,18 +231,18 @@ 
 
                 foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
                         {
-                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+                            if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+                                // If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
                             {
                                 if ($obj['photo_vignette'])
                                 {
                                     $filename= $obj['photo_vignette'];
-                                }
-                                else
+                            }
+                                } else
                                 {
                                     $filename=$obj['photo'];
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $filename=$obj['photo'];
                             }
@@ -240,11 +251,15 @@ 
                             break;
                 }
 
-                if ($realpath) $realpatharray[$i]=$realpath;
+                if ($realpath) {
+                    $realpatharray[$i]=$realpath;
+                }
             }
         }
 
-        if (count($realpatharray) == 0) $this->posxpicture=$this->posxweightvol;
+        if (count($realpatharray) == 0) {
+            $this->posxpicture=$this->posxweightvol;
+        }
 
 		if ($conf->expedition->dir_output)
 		{
@@ -253,8 +268,7 @@ 
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/" . $expref;
@@ -291,7 +305,9 @@ 
 				$heightforinfotot = 8;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+	                $heightforfooter+= 6;
+	            }
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -311,20 +327,26 @@ 
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -381,7 +403,9 @@ 
 								// Get code using getLabelFromKey
 								$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
 								$label='';
-								if ($object->tracking_url != $object->tracking_number) $label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+								    $label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
 								if ($object->tracking_url != $object->tracking_number)
@@ -413,8 +437,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -432,7 +455,9 @@ 
 
 					// Define size of image if we need it
 					$imglinesize=array();
-					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					if (! empty($realpatharray[$i])) {
+					    $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
@@ -443,11 +468,17 @@ 
 					$posYAfterDescription=0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+					    // If photo too high, we moved completely on new page
 					{
 						$pdf->AddPage('','',true);
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore+1);
 
 						$curY = $tab_top_newpage;
@@ -469,9 +500,11 @@ 
 					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 
 					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					if ($pageposafter > $pageposbefore) {
+					    // There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
+					}
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -480,23 +513,27 @@ 
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+						    // There is no space left for total+free text
 						{
 							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+								if (! empty($tplidx)) {
+								    $pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								    $this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter+1);
 							}
-						}
-						else
+						} else
 						{
 							// We found a page break
 							$showpricebeforepagebreak=0;
 						}
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -561,7 +598,9 @@ 
 					}
 
 					$nexY+=3;
-					if ($weighttxt && $voltxt) $nexY+=2;
+					if ($weighttxt && $voltxt) {
+					    $nexY+=2;
+					}
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -580,8 +619,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -589,24 +627,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -615,8 +658,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -627,7 +669,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -639,20 +683,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;	// No error
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
 			return 0;
@@ -689,8 +732,11 @@ 
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+		    $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+		    $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder=0;
 		$index = 0;
@@ -711,10 +757,18 @@ 
 		    $object->volume_units=$object->size_units * 3;
 		}
 
-		if ($totalWeight!='') $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume!='') $totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight!='') {
+		    $totalWeighttoshow=showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume!='') {
+		    $totalVolumetoshow=showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if ($object->trueWeight) {
+		    $totalWeighttoshow=showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if ($object->trueVolume) {
+		    $totalVolumetoshow=showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
     	$pdf->SetFillColor(255,255,255);
     	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -758,7 +812,9 @@ 
 
 			    $index++;
 			}
-			if (! $totalWeighttoshow && ! $totalVolumetoshow) $index++;
+			if (! $totalWeighttoshow && ! $totalVolumetoshow) {
+			    $index++;
+			}
 		}
 
 		$pdf->SetTextColor(0,0,0);
@@ -784,7 +840,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -898,16 +956,14 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -917,8 +973,7 @@ 
 		if (! empty($conf->barcode->enabled))
 		{
 			$posx=105;
-		}
-		else
+		} else
 		{
 			$posx=$this->marge_gauche+3;
 		}
@@ -982,9 +1037,11 @@ 
 		$origin_id 	= $object->origin_id;
 
 	    // TODO move to external function
-		if (! empty($conf->$origin->enabled))     // commonly $origin='commande'
+		if (! empty($conf->$origin->enabled)) {
+		    // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
+		}
 
 			$classname = ucfirst($origin);
 			$linkedobject = new $classname($this->db);
@@ -995,7 +1052,9 @@ 
 
 				$pdf->SetFont('','', $default_font_size - 2);
 				$text=$linkedobject->ref;
-				if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+				    $text.=' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff+8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w,$Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -1011,7 +1070,9 @@ 
 			$carac_emetteur='';
 		 	// Add internal contact of origin element if defined
 			$arrayidcontact=array();
-			if (! empty($origin) && is_object($object->$origin)) $arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
+			if (! empty($origin) && is_object($object->$origin)) {
+			    $arrayidcontact=$object->$origin->getIdContact('internal','SALESREPFOLL');
+			}
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user(reset($arrayidcontact));
@@ -1023,7 +1084,9 @@ 
 			// Show sender
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->page_largeur-$this->marge_droite-80;
+			}
 
 			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1074,10 +1137,15 @@ 
 
 			// Show recipient
 			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+			    $widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);

dolibarr/htdocs/core/modules/expedition/doc/pdf_merou.modules.php

Braces +41 added lines, -31 removed lines

@@ -138,7 +138,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -161,9 +164,13 @@ 
 
 		$object->fetch_thirdparty();
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
@@ -180,20 +187,23 @@ 
 			//Creation du destinataire
 			$idcontact = $object->$origin->getIdContact('external','SHIPPING');
             $this->destinataire = new Contact($this->db);
-			if (! empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
+			if (! empty($idcontact[0])) {
+			    $this->destinataire->fetch($idcontact[0]);
+			}
 
 			//Creation du livreur
 			$idcontact = $object->$origin->getIdContact('internal','LIVREUR');
 			$this->livreur = new User($this->db);
-			if (! empty($idcontact[0])) $this->livreur->fetch($idcontact[0]);
+			if (! empty($idcontact[0])) {
+			    $this->livreur->fetch($idcontact[0]);
+			}
 
 			// Definition de $dir et $file
 			if ($object->specimen)
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output . "/sending/" . $expref;
@@ -229,7 +239,9 @@ 
 				$heightforinfotot = 0;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+	                $heightforfooter+= 6;
+	            }
                 $pdf->SetAutoPageBreak(1,0);
 
 			    if (class_exists('TCPDF'))
@@ -249,14 +261,18 @@ 
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
 
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -287,8 +303,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -365,8 +380,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -380,8 +394,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -397,8 +410,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -406,7 +418,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -423,20 +437,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-                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));
+                }
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$outputlangs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$outputlangs->transnoentities("ErrorConstantNotDefined","EXP_OUTPUTDIR");
 			return 0;
@@ -556,16 +569,14 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo,10, 5, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -665,8 +676,7 @@ 
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
-		}
-		else
+		} else
 		{
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}

dolibarr/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

Braces +70 added lines, -62 removed lines

@@ -99,7 +99,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -137,11 +140,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -223,7 +229,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -247,7 +255,9 @@ 
 
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -273,10 +283,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -302,9 +313,9 @@ 
 				$contactobject = null;
 				if (! empty($usecontact)) {
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
-						$socobject = $object->contact;
-					else {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+											$socobject = $object->contact;
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
@@ -346,8 +357,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -363,8 +373,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -375,18 +384,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -397,18 +407,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -418,17 +429,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -439,17 +451,18 @@ 
 					foreach($tmparray as $key=>$value)
 					{
 						try {
-							if (preg_match('/logo$/',$key))	// Image
+							if (preg_match('/logo$/',$key)) {
+							    // Image
 							{
 								if (file_exists($value)) $odfHandler->setImage($key, $value);
-								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-							}
-							else	// Text
+							} else {
+								    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+								}
+							} else	// Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
-						}
-						catch(OdfException $e)
+						} catch(OdfException $e)
 						{
                             dol_syslog($e->getMessage(), LOG_INFO);
 						}
@@ -465,17 +478,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -486,8 +500,7 @@ 
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -507,12 +520,10 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -521,8 +532,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -535,8 +545,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -555,8 +564,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -568,16 +576,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

dolibarr/htdocs/core/modules/expedition/mod_expedition_safor.php

Braces +13 added lines, -6 removed lines

@@ -131,10 +131,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
@@ -143,8 +145,13 @@ 
 		$date=time();
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;