Dolibarr / dolibarr

htdocs/compta/deplacement/card.php

Braces +30 added lines, -12 removed lines

@@ -40,7 +40,9 @@ 
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 $action = GETPOST('action', 'aZ09');
@@ -181,20 +183,26 @@ 
 {
 	$object->fetch($id);
 	$result = $object->setProject(GETPOST('projectid', 'int'));
-	if ($result < 0) dol_print_error($db, $object->error);
-} // Set fields
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
+	} // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
 	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
 	$object->fetch($id);
 	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
-	if ($result < 0) dol_print_error($db, $object->error);
-} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
+	} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
 	$object->fetch($id);
 	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
-	if ($result < 0) dol_print_error($db, $object->error);
-}
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
+	}
 
 
 /*
@@ -392,7 +400,9 @@ 
 			}
 
 			$soc = new Societe($db);
-			if ($object->socid) $soc->fetch($object->socid);
+			if ($object->socid) {
+				$soc->fetch($object->socid);
+			}
 
 			print '<table class="border centpercent">';
 
@@ -436,7 +446,9 @@ 
 			// Where
 			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
 			print '<td>';
-			if ($soc->id) print $soc->getNomUrl(1);
+			if ($soc->id) {
+				print $soc->getNomUrl(1);
+			}
 			print '</td></tr>';
 
 			// Project
@@ -489,31 +501,37 @@ 
 
 			print '<div class="tabsAction">';
 
-			if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
+			if ($object->statut < Deplacement::STATUS_REFUNDED) {
+				// if not refunded
 			{
 				if ($user->rights->deplacement->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+			}
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 				}
 			}
 
-			if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
+			if ($object->statut == Deplacement::STATUS_DRAFT) {
+				// if draft
 			{
 				if ($user->rights->deplacement->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
+			}
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
 				}
 			}
 
-			if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
+			if ($object->statut == Deplacement::STATUS_VALIDATED) {
+				// if validated
 			{
 				if ($user->rights->deplacement->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+			}
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
 				}

htdocs/compta/bank/various_payment/card.php

Braces +30 added lines, -9 removed lines

@@ -57,7 +57,9 @@ 
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '', '');
 
 $object = new PaymentVarious($db);
@@ -72,7 +74,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $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');
+}
 
 if (empty($reshook))
 {
@@ -91,7 +95,9 @@ 
 			header("Location: ".$urltogo);
 			exit;
 		}
-		if ($id > 0 || !empty($ref)) $ret = $object->fetch($id, $ref);
+		if ($id > 0 || !empty($ref)) {
+			$ret = $object->fetch($id, $ref);
+		}
 		$action = '';
 	}
 
@@ -101,7 +107,9 @@ 
 
 		$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
 		$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
-		if (empty($datev)) $datev = $datep;
+		if (empty($datev)) {
+			$datev = $datep;
+		}
 
 		$object->ref = ''; // TODO
 		$object->accountid = GETPOST("accountid", 'int') > 0 ? GETPOST("accountid", "int") : 0;
@@ -189,7 +197,10 @@ 
 				{
 					$accountline = new AccountLine($db);
 					$result = $accountline->fetch($object->fk_bank);
-					if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+					if ($result > 0) {
+						$result = $accountline->delete($user);
+					}
+					// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
 				}
 
 				if ($result >= 0)
@@ -249,7 +260,9 @@ 
 
 		$newdatepayment = dol_mktime(0, 0, 0, GETPOST('clone_date_paymentmonth', 'int'), GETPOST('clone_date_paymentday', 'int'), GETPOST('clone_date_paymentyear', 'int'));
 		$newdatevalue = dol_mktime(0, 0, 0, GETPOST('clone_date_valuemonth', 'int'), GETPOST('clone_date_valueday', 'int'), GETPOST('clone_date_valueyear', 'int'));
-		if ($newdatepayment) $object->datep = $newdatepayment;
+		if ($newdatepayment) {
+			$object->datep = $newdatepayment;
+		}
 		if (!empty($newdatevalue)) {
 			$object->datev = $newdatevalue;
 		} else {
@@ -292,8 +305,12 @@ 
 llxHeader("", $langs->trans("VariousPayment"));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 if ($id)
 {
@@ -550,7 +567,11 @@ 
 	print '</td></tr>';
 
 	// Debit / Credit
-	if ($object->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+	if ($object->sens == '1') {
+		$sens = $langs->trans("Credit");
+	} else {
+		$sens = $langs->trans("Debit");
+	}
 	print '<tr><td>'.$langs->trans("Sens").'</td><td>'.$sens.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';

htdocs/accountancy/admin/journals_list.php

Braces +127 added lines, -45 removed lines

@@ -22,7 +22,10 @@ 
  * \brief		Setup page to configure journals
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');
+}
+// Force use of CSRF protection with tokens even for GET
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -64,8 +67,12 @@ 
 $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (empty($sortfield)) $sortfield = 'code';
-if (empty($sortorder)) $sortorder = 'ASC';
+if (empty($sortfield)) {
+	$sortfield = 'code';
+}
+if (empty($sortorder)) {
+	$sortorder = 'ASC';
+}
 
 $error = 0;
 
@@ -162,9 +169,15 @@ 
 	$ok = 1;
 	foreach ($listfield as $f => $value)
 	{
-		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-		if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-		if ($fieldnamekey == 'nature') $fieldnamekey = 'NatureOfJournal';
+		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+			$fieldnamekey = 'Label';
+		}
+		if ($fieldnamekey == 'code') {
+			$fieldnamekey = 'Code';
+		}
+		if ($fieldnamekey == 'nature') {
+			$fieldnamekey = 'NatureOfJournal';
+		}
 	}
 	// Other checks
 	if (GETPOSTISSET("code"))
@@ -187,9 +200,18 @@ 
 	}
 
 	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	if ($_POST["accountancy_code"] <= 0) {
+		$_POST["accountancy_code"] = '';
+	}
+	// If empty, we force to null
+	if ($_POST["accountancy_code_sell"] <= 0) {
+		$_POST["accountancy_code_sell"] = '';
+	}
+	// If empty, we force to null
+	if ($_POST["accountancy_code_buy"] <= 0) {
+		$_POST["accountancy_code_buy"] = '';
+	}
+	// If empty, we force to null
 
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha'))
@@ -212,33 +234,44 @@ 
 		// Add new entry
 		$sql = "INSERT INTO ".$tabname[$id]." (";
 		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-			$sql .= $tabrowid[$id].",";
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+					$sql .= $tabrowid[$id].",";
+		}
 		$sql .= $tabfieldinsert[$id];
 		$sql .= ",active,entity)";
 		$sql .= " VALUES(";
 
 		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-			$sql .= $newid.",";
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+					$sql .= $newid.",";
+		}
 		$i = 0;
 		foreach ($listfieldinsert as $f => $value)
 		{
 			if ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null"; // For vat, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($i) {
+				$sql .= ",";
+			}
+			if ($_POST[$listfieldvalue[$i]] == '') {
+				$sql .= "null";
+			}
+			// For vat, we want/accept code = ''
+			else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= ",1,".$conf->entity.")";
 
 		dol_syslog("actionadd", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)	// Add is ok
+		if ($result) {
+			// Add is ok
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+		}
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -270,10 +303,17 @@ 
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
+			if ($i) {
+				$sql .= ",";
+			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+				$sql .= "null";
+			}
+			// For vat, we want/accept code = ''
+			else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
@@ -295,9 +335,12 @@ 
 //	$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 //}
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+if ($action == 'confirm_delete' && $confirm == 'yes') {
+	// delete
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id];
+}
+} else { $rowidcol = "rowid"; }
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 	$sql .= " AND entity = ".$conf->entity;
@@ -391,7 +434,9 @@ 
 	$sql .= " WHERE a.entity = ".$conf->entity;
 
 	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield = 'country_code';
+	if ($sortfield == 'country') {
+		$sortfield = 'country_code';
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($listlimit + 1, $offset);
 
@@ -432,12 +477,18 @@ 
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-				else print $valuetoshow;
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif (!empty($tabhelp[$id][$value])) {
+					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				} else {
+					print $valuetoshow;
+				}
 				print '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+				$alabelisused = 1;
+			}
 		}
 
 		print '<td>';
@@ -457,8 +508,9 @@ 
 		{
 			foreach ($fieldlist as $key=>$val)
 			{
-				if (GETPOST($val) != '')
-					$obj->$val = GETPOST($val);
+				if (GETPOST($val) != '') {
+									$obj->$val = GETPOST($val);
+				}
 			}
 		}
 
@@ -491,11 +543,19 @@ 
 		$i = 0;
 
 		$param = '&id='.$id;
-		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		if ($search_country_id > 0) {
+			$param .= '&search_country_id='.$search_country_id;
+		}
 		$paramwithsearch = $param;
-		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
-		if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		if ($sortorder) {
+			$paramwithsearch .= '&sortorder='.$sortorder;
+		}
+		if ($sortfield) {
+			$paramwithsearch .= '&sortfield='.$sortfield;
+		}
+		if (GETPOST('from', 'alpha')) {
+			$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		}
 
 		// There is several pages
 		if ($num > $listlimit)
@@ -576,7 +636,9 @@ 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
 					// Show fields
-					if (empty($reshook)) fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) {
+						fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
 					print '<td class="center" colspan="4">';
 					print '<input type="hidden" name="page" value="'.$page.'">';
@@ -611,7 +673,9 @@ 
 
 							$class = 'tddict';
 							// Show value for field
-							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							if ($showfield) {
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							}
 						}
 					}
 
@@ -633,27 +697,39 @@ 
 					$canbemodified = $iserasable;
 
 					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-					if ($param) $url .= '&'.$param;
+					if ($param) {
+						$url .= '&'.$param;
+					}
 					$url .= '&';
 
 					// Active
 					print '<td class="nowrap center">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
-					else print $langs->trans("AlwaysActive");
+					if ($canbedisabled) {
+						print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
+					} else {
+						print $langs->trans("AlwaysActive");
+					}
 					print "</td>";
 
 					// Modify link
-					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-					else print '<td>&nbsp;</td>';
+					if ($canbemodified) {
+						print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					// Delete link
 					if ($iserasable)
 					{
 						print '<td class="center">';
-						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						if ($user->admin) {
+							print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						}
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					} else print '<td>&nbsp;</td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					print '<td></td>';
 
@@ -713,9 +789,15 @@ 
 		} else {
 			print '<td>';
 			$size = ''; $class = '';
-			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
-			if ($fieldlist[$field] == 'label') $class = 'quatrevingtpercent';
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') $size = 'size="2" ';
+			if ($fieldlist[$field] == 'code') {
+				$class = 'maxwidth100';
+			}
+			if ($fieldlist[$field] == 'label') {
+				$class = 'quatrevingtpercent';
+			}
+			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+				$size = 'size="2" ';
+			}
 			print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}

htdocs/api/class/api_setup.class.php

Braces +51 added lines, -17 removed lines

@@ -653,8 +653,12 @@ 
 		$sql = "SELECT id, code, type, libelle as label, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($type) {
+			$sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		}
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -717,7 +721,9 @@ 
 		$sql = "SELECT id, code, label, accountancy_code, active, module, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -781,8 +787,12 @@ 
 		$sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($type) {
+			$sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+		}
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -844,7 +854,9 @@ 
 		$sql = "SELECT rowid, code, label, module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
 		$sql .= " WHERE t.active = ".$active;
-		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		if ($module) {
+			$sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -903,7 +915,9 @@ 
 	{
 		$list = array();
 		$sql = "SELECT t.code_iso, t.label, t.unicode";
-		if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+		if (!empty($multicurrency)) {
+			$sql .= " , cr.date_sync, cr.rate ";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
 		if (!empty($multicurrency)) {
 			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
@@ -976,13 +990,19 @@ 
 			throw new RestException(401, 'Only an admin user can get list of extrafields');
 		}
 
-		if ($type == 'thirdparty') $type = 'societe';
-		if ($type == 'contact') $type = 'socpeople';
+		if ($type == 'thirdparty') {
+			$type = 'societe';
+		}
+		if ($type == 'contact') {
+			$type = 'socpeople';
+		}
 
 		$sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
 		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
 		$sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
-		if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		if (!empty($type)) {
+			$sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -1056,8 +1076,12 @@ 
 		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
 		$sql .= " AND t.active = ".$active;
-		if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
-		if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		if ($zipcode) {
+			$sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+		}
+		if ($town) {
+			$sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		}
 		// Add sql filters
 		if ($sqlfilters)
 		{
@@ -1617,10 +1641,16 @@ 
 		$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
 		// Remote file to compare to
 		$xmlremote = ($target == 'default' ? '' : $target);
-		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) {
+			$xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		}
 		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+		if (empty($xmlremote) && !empty($conf->global->$param)) {
+			$xmlremote = $conf->global->$param;
+		}
+		if (empty($xmlremote)) {
+			$xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+		}
 
 		if ($target == 'local')
 		{
@@ -1668,14 +1698,18 @@ 
 				$out .= '</tr>'."\n";
 
 				$i = 0;
-				foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+				foreach ($xml->dolibarr_constants[0]->constant as $constant) {
+					// $constant is a simpleXMLElement
 				{
 					$constname = $constant['name'];
+				}
 					$constvalue = (string) $constant;
 					$constvalue = (empty($constvalue) ? '0' : $constvalue);
 					// Value found
 					$value = '';
-					if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+					if ($constname && $conf->global->$constname != '') {
+						$value = $conf->global->$constname;
+					}
 					$valueforchecksum = (empty($value) ? '0' : $value);
 
 					$checksumconcat[] = $valueforchecksum;

Indentation +64 added lines, -64 removed lines

@@ -111,70 +111,70 @@
 		return $list;
 	}
 
-    /**
-     * Get the list of ordering origins.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
-     *
-     * @url     GET dictionary/ordering_origins
-     *
-     * @return array [List of ordering reasons]
-     *
-     * @throws RestException 400
-     */
-    public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-            throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid, code, label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
+	/**
+	 * Get the list of ordering origins.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+	 *
+	 * @url     GET dictionary/ordering_origins
+	 *
+	 * @return array [List of ordering reasons]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
 
 	/**
 	 * Get the list of payments types.

htdocs/resource/list.php

Braces +60 added lines, -20 removed lines

@@ -51,7 +51,9 @@ 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-if (!is_array($search_array_options)) $search_array_options = array();
+if (!is_array($search_array_options)) {
+	$search_array_options = array();
+}
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
 
@@ -62,8 +64,12 @@ 
 $filter = array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 
 if ($search_ref != '') {
 	$param .= '&search_ref='.urlencode($search_ref);
@@ -84,21 +90,35 @@ 
 		$param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 	$mode_search = 0;
-	if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
-	if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
+	if (in_array($typ, array('int', 'double', 'real'))) {
+		$mode_search = 1;
+	}
+	// Search on a numeric
+	if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') {
+		$mode_search = 2;
+	}
+	// Search on a foreign key int
 	if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 	{
 		$filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
 
 
 $hookmanager->initHooks(array('resourcelist'));
 
-if (empty($sortorder)) $sortorder = "ASC";
-if (empty($sortfield)) $sortfield = "t.ref";
-if (empty($arch)) $arch = 0;
+if (empty($sortorder)) {
+	$sortorder = "ASC";
+}
+if (empty($sortfield)) {
+	$sortfield = "t.ref";
+}
+if (empty($arch)) {
+	$arch = 0;
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -125,8 +145,9 @@ 
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+					$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -136,9 +157,11 @@ 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// Both test are required to be compatible with all browsers
 {
 	$search_ref = "";
+}
 	$search_type = "";
 	$search_array_options = array();
 	$filter = array();
@@ -151,7 +174,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $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');
+}
 
 
 /*
@@ -173,7 +198,9 @@ 
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -235,8 +262,12 @@ 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['ty.label']['checked'])) {
+	print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -254,7 +285,9 @@ 
 			print '<td>';
 			print $resource->getNomUrl(5);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		if (!empty($arrayfields['ty.label']['checked']))
@@ -262,7 +295,9 @@ 
 			print '<td>';
 			print $resource->type_label;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Extra fields
 		$obj = (Object) $resource->array_options;
@@ -277,13 +312,18 @@ 
 		print img_delete('', 'class="marginleftonly"');
 		print '</a>';
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print '</tr>';
 	}
 } else {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
+		$colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

htdocs/website/websiteaccount_card.php

Braces +30 added lines, -11 removed lines

@@ -55,10 +55,14 @@ 
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
-}
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	}
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -80,7 +84,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $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');
+}
 
 if (empty($reshook))
 {
@@ -196,7 +202,9 @@ 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-	if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
+	if ($object->fk_soc > 0 && empty($socid)) {
+		$socid = $object->fk_soc;
+	}
 
 	$res = $object->fetch_optionals();
 
@@ -213,8 +221,11 @@ 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -223,8 +234,12 @@ 
 	// Object card
 	// ------------------------------------------------------------
 	$linkback = '';
-	if ($socid) $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
-	if ($fk_website) $linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	if ($socid) {
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
+	}
+	if ($fk_website) {
+		$linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	}
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -270,7 +285,9 @@ 
 	*/
 	$morehtmlref .= '</div>';
 
-	if ($socid > 0) $object->next_prev_filter = 'te.fk_soc = '.$socid;
+	if ($socid > 0) {
+		$object->next_prev_filter = 'te.fk_soc = '.$socid;
+	}
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
 
@@ -301,7 +318,9 @@ 
 		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
 		if (empty($reshook))
 		{

htdocs/categories/traduction.php

Braces +23 added lines, -8 removed lines

@@ -60,7 +60,10 @@ 
 	dol_print_error($db, $object->error); exit;
 }
 
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type];
+}
+// For backward compatibility
 
 /*
  * Actions
@@ -110,7 +113,9 @@ 
 
 			// sauvegarde en base
 			$res = $object->setMultiLangs($user);
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 	}
 
@@ -130,9 +135,11 @@ 
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
+	foreach ($object->multilangs as $key => $value) {
+		// enregistrement des nouvelles valeurs dans l'objet
 	{
 		$libelle = GETPOST('libelle-'.$key, 'alpha');
+	}
 		$desc = GETPOST('desc-'.$key);
 
 		if (empty($libelle)) {
@@ -151,7 +158,9 @@ 
 
 	if (!$error) {
 		$res = $object->setMultiLangs($user);
-		if ($res < 0)   $error++;
+		if ($res < 0) {
+			$error++;
+		}
 	}
 
 	if ($error) {
@@ -241,7 +250,9 @@ 
 	if ($user->rights->produit->creer || $user->rights->service->creer)
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
-		if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+		if ($cnt_trans > 0) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+		}
 	}
 }
 
@@ -293,7 +304,9 @@ 
 	print '</form>';
 } elseif ($action != 'add')
 {
-	if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+	if ($cnt_trans) {
+		print '<div class="underbanner clearboth"></div>';
+	}
 
 	if (!empty($object->multilangs))
 	{
@@ -311,8 +324,10 @@ 
 			print '</table>';
 		}
 	}
-	if (!$cnt_trans && $action != 'add') print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
-}
+	if (!$cnt_trans && $action != 'add') {
+		print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
+	}
+	}
 
 
 /*

htdocs/categories/photos.php

Braces +16 added lines, -5 removed lines

@@ -62,7 +62,10 @@ 
 }
 $upload_dir = $conf->categorie->multidir_output[$object->entity];
 
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type];
+}
+// For backward compatibility
 
 /*
  * Actions
@@ -220,8 +223,12 @@ 
 			{
 				$nbphoto++;
 
-				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
-				if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) {
+					print '<tr align=center valign=middle border=1>';
+				}
+				if ($nbbyrow) {
+					print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				}
 
 				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
 
@@ -257,8 +264,12 @@ 
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
 					print img_delete().'</a>';
 				}
-				if ($nbbyrow) print '</td>';
-				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
+				if ($nbbyrow) {
+					print '</td>';
+				}
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) {
+					print '</tr>';
+				}
 			}
 
 			// Ferme tableau

htdocs/zapier/hook_card.php

Braces +23 added lines, -9 removed lines

@@ -56,10 +56,14 @@ 
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
-}
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	}
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
@@ -79,7 +83,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $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');
+}
 
 if (empty($reshook)) {
 	$error = 0;
@@ -88,8 +94,11 @@ 
 	$permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
 	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
 	if (empty($backtopage)) {
-		if (empty($id)) $backtopage = $backurlforlist;
-		else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+		if (empty($id)) {
+			$backtopage = $backurlforlist;
+		} else {
+			$backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+		}
 	}
 	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
@@ -242,8 +251,11 @@ 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -323,7 +335,9 @@ 
 		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
 		if (empty($reshook)) {
 			// Modify