Dolibarr / dolibarr

htdocs/admin/tools/dolibarr_export.php

Braces +27 added lines, -10 removed lines

@@ -34,14 +34,19 @@ 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "date";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "date";
+}
 if (empty($page) || $page == -1) { $page = 0; }
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 
 /*
@@ -54,13 +59,19 @@ 
 	{
 		$file = $conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
 	} else {
 		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
 	}
 	$action = '';
 }
@@ -453,7 +464,9 @@ 
 	if (!$val['function'] || function_exists($val['function'])) {
 		// Enabled export format
 		$checked = '';
-		if ($key == 'gz') $checked = ' checked';
+		if ($key == 'gz') {
+			$checked = ' checked';
+		}
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
 	} else {
@@ -568,10 +581,14 @@ 
 $i = 0;
 foreach ($filecompression as $key => $val)
 {
-	if (!$val['function'] || function_exists($val['function']))	// Enabled export format
+	if (!$val['function'] || function_exists($val['function'])) {
+		// Enabled export format
 	{
 		$checked = '';
-		if ($key == 'gz') $checked = ' checked';
+	}
+		if ($key == 'gz') {
+			$checked = ' checked';
+		}
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
 	} else // Disabled export format

htdocs/admin/ecm_files_extrafields.php

Braces +2 added lines, -1 removed lines

@@ -33,8 +33,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'ecm'));

htdocs/expensereport/card.php

Braces +239 added lines, -84 removed lines

@@ -69,7 +69,9 @@ 
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
@@ -118,8 +120,12 @@ 
 {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+		$canread = 1;
+	}
 	if (!$canread)
 	{
 		accessforbidden();
@@ -133,7 +139,9 @@ 
 
 $parameters = array('socid' => $socid);
 $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))
 {
@@ -160,10 +168,16 @@ 
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-	if (GETPOSTISSET('sendit'))    // If we just submit a file
+	if (GETPOSTISSET('sendit')) {
+		// If we just submit a file
 	{
-		if ($action == 'updateline') $action = 'editline'; // To avoid to make the updateline now
-		else $action = ''; // To avoid to make the addline now
+		if ($action == 'updateline') $action = 'editline';
+	}
+	// To avoid to make the updateline now
+		else {
+			$action = '';
+		}
+		// To avoid to make the addline now
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
@@ -222,7 +236,9 @@ 
 		$object->date_fin = $date_end;
 
 		$object->fk_user_author = GETPOST('fk_user_author', 'int');
-		if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
+		if (!($object->fk_user_author > 0)) {
+			$object->fk_user_author = $user->id;
+		}
 
 		// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
@@ -249,7 +265,9 @@ 
 		if (!$error)
 		{
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin))
@@ -316,7 +334,9 @@ 
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		if (!$error)
 		{
@@ -329,8 +349,9 @@ 
 			}
 		}
 
-		if ($error)
-			$action = 'edit_extras';
+		if ($error) {
+					$action = 'edit_extras';
+		}
 	}
 
 	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
@@ -351,8 +372,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -387,7 +412,9 @@ 
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForApproval");
 
@@ -464,8 +491,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -497,7 +528,9 @@ 
 
    				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForReApproval");
 
@@ -576,8 +609,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -600,7 +637,9 @@ 
 
    			// CC
    			$emailCC = $conf->global->NDF_CC_EMAILS;
-			if (empty($emailTo)) $emailTo = $emailCC;
+			if (empty($emailTo)) {
+				$emailTo = $emailCC;
+			}
 
 			// FROM
    			$expediteur = new User($db);
@@ -613,7 +652,9 @@ 
 
    				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportApproved");
 
@@ -690,8 +731,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -723,7 +768,9 @@ 
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportRefused");
 
@@ -808,8 +855,12 @@ 
 					{
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -841,7 +892,9 @@ 
 
 						// SUBJECT
 						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						}
 
 						$subject = $societeName." - ".$langs->transnoentities("ExpenseReportCanceled");
 
@@ -923,8 +976,12 @@ 
 				{
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -962,8 +1019,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -990,8 +1051,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1018,8 +1083,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1051,7 +1120,9 @@ 
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportPaid");
 
@@ -1123,7 +1194,9 @@ 
 		}
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-		if (empty($vatrate)) $vatrate = "0.000";
+		if (empty($vatrate)) {
+			$vatrate = "0.000";
+		}
 		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
 		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
@@ -1136,7 +1209,9 @@ 
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
 
 		$qty = GETPOST('qty', 'int');
-		if (empty($qty)) $qty = 1;
+		if (empty($qty)) {
+			$qty = 1;
+		}
 
 		if (!($fk_c_type_fees > 0))
 		{
@@ -1185,8 +1260,9 @@ 
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = GETPOST('lang_id', 'alpha');
-					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-						$newlang = $object->thirdparty->default_lang;
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
+											$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1232,8 +1308,12 @@ 
 				{
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1282,7 +1362,9 @@ 
 		$vatrate = GETPOST('vatrate', 'alpha');
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-		if (empty($vatrate)) $vatrate = "0.000";
+		if (empty($vatrate)) {
+			$vatrate = "0.000";
+		}
 		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
 		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
@@ -1324,8 +1406,12 @@ 
 					{
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -1416,9 +1502,13 @@ 
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
 	$defaultselectuser = $user->id;
-	if (GETPOST('fk_user_author', 'int') > 0) $defaultselectuser = GETPOST('fk_user_author', 'int');
+	if (GETPOST('fk_user_author', 'int') > 0) {
+		$defaultselectuser = GETPOST('fk_user_author', 'int');
+	}
 	$include_users = 'hierarchyme';
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) $include_users = array();
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) {
+		$include_users = array();
+	}
 	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
 	print $s;
 	print '</td>';
@@ -1430,11 +1520,17 @@ 
 	print '<td>';
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
-	if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
-	else {
+	if (empty($include_users)) {
+		print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
+	} else {
 		$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
-		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
-		if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
+		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) {
+			$defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR;
+		}
+		// Can force default approver
+		if (GETPOST('fk_user_validator', 'int') > 0) {
+			$defaultselectuser = GETPOST('fk_user_validator', 'int');
+		}
 		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE)) ? 0 : 1), $include_users);
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	}
@@ -1631,7 +1727,9 @@ 
 				if ($action == 'clone') {
 					// Create an array for form
 					$criteriaforfilter = 'hierarchyme';
-					if (!empty($user->rights->expensereport->readall)) $criteriaforfilter = '';
+					if (!empty($user->rights->expensereport->readall)) {
+						$criteriaforfilter = '';
+					}
 					$formquestion = array(
 						'text' => '',
 						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
@@ -1676,9 +1774,11 @@ 
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
 				}
 
-				if ($action == 'refuse')		// Deny
+				if ($action == 'refuse') {
+					// Deny
 				{
 					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
+				}
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 				}
 
@@ -1750,8 +1850,11 @@ 
 				{
 					$userauthor = new User($db);
 					$result = $userauthor->fetch($object->fk_user_author);
-					if ($result < 0) dol_print_error('', $userauthor->error);
-					elseif ($result > 0) print $userauthor->getNomUrl(-1);
+					if ($result < 0) {
+						dol_print_error('', $userauthor->error);
+					} elseif ($result > 0) {
+						print $userauthor->getNomUrl(-1);
+					}
 				}
 				print '</td></tr>';
 
@@ -1773,22 +1876,30 @@ 
 				print '<tr>';
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
 				print '<td>'.dol_print_date($object->date_valid, 'dayhour');
-				if ($object->status == 2 && $object->hasDelay('toapprove')) print ' '.img_warning($langs->trans("Late"));
-				if ($object->status == 5 && $object->hasDelay('topay')) print ' '.img_warning($langs->trans("Late"));
+				if ($object->status == 2 && $object->hasDelay('toapprove')) {
+					print ' '.img_warning($langs->trans("Late"));
+				}
+				if ($object->status == 5 && $object->hasDelay('topay')) {
+					print ' '.img_warning($langs->trans("Late"));
+				}
 				print '</td></tr>';
 				print '</tr>';
 
 				// User to inform for approval
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED)	// informed
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
+					// informed
 				{
 					print '<tr>';
+				}
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
 					print '<td>';
 					if ($object->fk_user_validator > 0)
 					{
 						$userfee = new User($db);
 						$result = $userfee->fetch($object->fk_user_validator);
-						if ($result > 0) print $userfee->getNomUrl(-1);
+						if ($result > 0) {
+							print $userfee->getNomUrl(-1);
+						}
 						if (empty($userfee->email) || !isValidEmail($userfee->email))
 						{
 							$langs->load("errors");
@@ -1805,7 +1916,9 @@ 
 					{
 						$userfee = new User($db);
 						$result = $userfee->fetch($object->fk_user_cancel);
-						if ($result > 0) print $userfee->getNomUrl(-1);
+						if ($result > 0) {
+							print $userfee->getNomUrl(-1);
+						}
 					}
 					print '</td></tr>';
 
@@ -1825,7 +1938,9 @@ 
 					{
 						$userapp = new User($db);
 						$result = $userapp->fetch($object->fk_user_approve);
-						if ($result > 0) print $userapp->getNomUrl(-1);
+						if ($result > 0) {
+							print $userapp->getNomUrl(-1);
+						}
 					}
 					print '</td></tr>';
 
@@ -1842,13 +1957,17 @@ 
 					print '<td>';
 					$userfee = new User($db);
 					$result = $userfee->fetch($object->fk_user_refuse);
-					if ($result > 0) print $userfee->getNomUrl(-1);
+					if ($result > 0) {
+						print $userfee->getNomUrl(-1);
+					}
 					print '</td></tr>';
 
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
 					print '<td>'.dol_print_date($object->date_refuse, 'dayhour');
-					if ($object->detail_refuse) print ' - '.$object->detail_refuse;
+					if ($object->detail_refuse) {
+						print ' - '.$object->detail_refuse;
+					}
 					print '</td>';
 					print '</tr>';
 				}
@@ -1888,11 +2007,19 @@ 
 				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
 				$rowspan = 5;
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
-				elseif ($object->status == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
-				else $rowspan += 2;
-				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
-				if ($object->status == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
+					$rowspan++;
+				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+					$rowspan += 2;
+				} else {
+					$rowspan += 2;
+				}
+				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
+					$rowspan += 2;
+				}
+				if ($object->status == ExpenseReport::STATUS_CLOSED) {
+					$rowspan += 2;
+				}
 				print "</td>";
 				print '</tr>';
 
@@ -1977,8 +2104,9 @@ 
 							}
 
 							print '<td class="right">';
-							if ($bankaccountstatic->id)
-								print $bankaccountstatic->getNomUrl(1, 'transactions');
+							if ($bankaccountstatic->id) {
+															print $bankaccountstatic->getNomUrl(1, 'transactions');
+							}
 							print '</td>';
 						}
 						print '<td class="right">'.price($objp->amount)."</td>";
@@ -2026,7 +2154,9 @@ 
 				print '<div style="clear: both;"></div>';
 
 				$actiontouse = 'updateline';
-				if (($object->status == 0 || $object->status == 99) && $action != 'editline') $actiontouse = 'addline';
+				if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
+					$actiontouse = 'addline';
+				}
 
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2045,9 +2175,13 @@ 
 					print '<td class="center">'.$langs->trans('LineNb').'</td>';
 					//print '<td class="center">'.$langs->trans('Piece').'</td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+					if (!empty($conf->projet->enabled)) {
+						print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+					}
 					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						print '<td>'.$langs->trans('CarCategory').'</td>';
+					}
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
@@ -2153,7 +2287,10 @@ 
 									if (image_format_supported($fileinfo['basename']) > 0)
 									{
 										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) $minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
+											$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png');
+										}
+										// For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 										//print $file['path'].'/'.$minifile.'<br>';
 										$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 										if (empty($urlforhref)) {
@@ -2179,11 +2316,15 @@ 
 												// Conversion du PDF en image png si fichier png non existant
 												if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
 												{
-													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {
+														// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 													{
 														include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+													}
 														$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-														if ($ret < 0) $error++;
+														if ($ret < 0) {
+															$error++;
+														}
 													}
 												}
 											}
@@ -2191,7 +2332,9 @@ 
 											if ($pdfexists && !$error)
 											{
 												$heightforphotref = 70;
-												if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+												if (!empty($conf->dol_optimize_smallscreen)) {
+													$heightforphotref = 60;
+												}
 												// If the preview file is found
 												if (file_exists($fileimage))
 												{
@@ -2232,8 +2375,12 @@ 
 						{
 							// Add line with link to add new file or attach line to an existing file
 							$colspan = 10;
-							if (!empty($conf->projet->enabled)) $colspan++;
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
+							if (!empty($conf->projet->enabled)) {
+								$colspan++;
+							}
+							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+								$colspan++;
+							}
 
 							print '<tr class="tredited">';
 
@@ -2370,9 +2517,15 @@ 
 					&& $user->rights->expensereport->creer)
 				{
 					$colspan = 11;
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
-					if (!empty($conf->projet->enabled)) $colspan++;
-					if ($action != 'editline') $colspan++;
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						$colspan++;
+					}
+					if (!empty($conf->projet->enabled)) {
+						$colspan++;
+					}
+					if ($action != 'editline') {
+						$colspan++;
+					}
 
 					$nbFiles = $nbLinks = 0;
 					$arrayoffiles = array();
@@ -2485,7 +2638,9 @@ 
 					// Select VAT
 					print '<td class="right">';
 					$defaultvat = -1;
-					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+						$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+					}
 					print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
 					print '</td>';
 

htdocs/modulebuilder/template/myobject_agenda.php

Braces +52 added lines, -18 removed lines

@@ -45,17 +45,31 @@ 
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
 // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
 $tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
 while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
 // Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -76,8 +90,10 @@ 
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
-} else {
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+	} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -90,8 +106,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical objects
 $object = new MyObject($db);
@@ -103,7 +123,9 @@ 
 
 // 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
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -119,7 +141,9 @@ 
 
 $parameters = array('id'=>$id);
 $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))
 {
@@ -131,9 +155,11 @@ 
 	}
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 	{
 		$actioncode = '';
+	}
 		$search_agenda_label = '';
 	}
 }
@@ -153,7 +179,9 @@ 
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = myobjectPrepareHead($object);
 
 
@@ -230,7 +258,9 @@ 
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -255,8 +285,12 @@ 
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
 		$param = '&id='.$object->id.'&socid='.$socid;
-		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);
+		}
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');

htdocs/don/payment/payment.php

Braces +3 added lines, -2 removed lines

@@ -270,8 +270,9 @@
 		if ($sumpaid < $objp->amount)
 		{
 			$namef = "amount_".$objp->id;
-			if (!empty($conf->use_javascript_ajax))
-				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".price($objp->amount - $sumpaid)."'");
+			if (!empty($conf->use_javascript_ajax)) {
+							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".price($objp->amount - $sumpaid)."'");
+			}
 			print '<input type="text" size="8" name="'.$namef.'">';
 		} else {
 			print '-';

htdocs/takepos/admin/orderprinters.php

Braces +40 added lines, -11 removed lines

@@ -34,7 +34,9 @@ 
 
 $langs->loadLangs(array("main"), "categories", "takepos", "printing");
 
-if (!$user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) {
+	accessforbidden();
+}
 
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
@@ -44,32 +46,41 @@ 
 $printer2 = GETPOST('printer2', 'alpha');
 $printer3 = GETPOST('printer3', 'alpha');
 
-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
  */
 if ($action == "SavePrinter1") {
 	$printedcategories = ";";
-	if (is_array($printer1)) foreach ($printer1 as $cat) {
+	if (is_array($printer1)) {
+		foreach ($printer1 as $cat) {
 		$printedcategories = $printedcategories.$cat.";";
 	}
+	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == "SavePrinter2") {
 	$printedcategories = ";";
-	if (is_array($printer2)) foreach ($printer2 as $cat) {
+	if (is_array($printer2)) {
+		foreach ($printer2 as $cat) {
 		$printedcategories = $printedcategories.$cat.";";
 	}
+	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == "SavePrinter3") {
 	$printedcategories = ";";
-	if (is_array($printer3)) foreach ($printer3 as $cat) {
+	if (is_array($printer3)) {
+		foreach ($printer3 as $cat) {
 		$printedcategories = $printedcategories.$cat.";";
 	}
+	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_3", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
@@ -173,8 +184,14 @@ 
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter1">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {
@@ -201,8 +218,14 @@ 
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter2">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {
@@ -227,8 +250,14 @@ 
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter3">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {

htdocs/projet/ajax/projects.php

Braces +25 added lines, -8 removed lines

@@ -23,13 +23,28 @@ 
  *       \brief      File to return Ajax response on product list request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+// Disables token renewal
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
 
 require '../../main.inc.php';
 
@@ -49,7 +64,9 @@ 
 
 top_httphead();
 
-if (empty($htmlname) && !GETPOST('mode', 'aZ09')) return;
+if (empty($htmlname) && !GETPOST('mode', 'aZ09')) {
+	return;
+}
 
 // Mode to get list of projects
 if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {

htdocs/compta/bank/bankentries_list.php

Braces +410 added lines, -144 removed lines

@@ -66,10 +66,14 @@ 
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 if ($fielvalue)
 {
-	if ($user->socid) $socid = $user->socid;
+	if ($user->socid) {
+		$socid = $user->socid;
+	}
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
 } else {
-	if ($user->socid) $socid = $user->socid;
+	if ($user->socid) {
+		$socid = $user->socid;
+	}
 	$result = restrictedArea($user, 'banque');
 }
 
@@ -91,20 +95,28 @@ 
 $search_num_releve = GETPOST("search_num_releve", 'alpha');
 $search_conciliated = GETPOST("search_conciliated", 'int');
 $num_releve = GETPOST("num_releve", "alpha");
-if (empty($dateop)) $dateop = -1;
+if (empty($dateop)) {
+	$dateop = -1;
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
-if ($pageplusone) $page = $pageplusone - 1;
+if ($pageplusone) {
+	$page = $pageplusone - 1;
+}
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = 'desc,desc,desc';
-if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
+if (!$sortorder) {
+	$sortorder = 'desc,desc,desc';
+}
+if (!$sortfield) {
+	$sortfield = 'b.datev,b.dateo,b.rowid';
+}
 
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
@@ -125,8 +137,10 @@ 
 if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))
 {
 	$sortfield = 'b.datev,b.dateo,b.rowid';
-	if ($id > 0 || !empty($ref) || $search_account > 0) $mode_balance_ok = true;
-}
+	if ($id > 0 || !empty($ref) || $search_account > 0) {
+		$mode_balance_ok = true;
+	}
+	}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));
@@ -157,8 +171,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');
@@ -175,13 +190,17 @@ 
 
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// All tests are required to be compatible with all browsers
 {
 	$search_dt_start = '';
+}
 	$search_dt_end = '';
 	$search_dv_start = '';
 	$search_dv_end = '';
@@ -198,8 +217,10 @@ 
 	$thirdparty = '';
 
 	$search_account = "";
-	if ($id > 0 || !empty($ref)) $search_account = $object->id;
-}
+	if ($id > 0 || !empty($ref)) {
+		$search_account = $object->id;
+	}
+	}
 
 if (empty($reshook))
 {
@@ -255,18 +276,42 @@ 
 	{
 		$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
 		$param .= '&search_conciliated='.urlencode($search_conciliated);
-		if ($page) $param .= '&page='.urlencode($page);
-		if ($offset) $param .= '&offset='.urlencode($offset);
-		if ($search_thirdparty) $param .= '&search_thirdparty='.urlencode($search_thirdparty);
-		if ($search_num_releve) $param .= '&search_num_releve='.urlencode($search_num_releve);
-		if ($search_description) $param .= '&search_description='.urlencode($search_description);
-		if ($search_start_dt) $param .= '&search_start_dt='.urlencode($search_start_dt);
-		if ($search_end_dt) $param .= '&search_end_dt='.urlencode($search_end_dt);
-		if ($search_start_dv) $param .= '&search_start_dv='.urlencode($search_start_dv);
-		if ($search_end_dv) $param .= '&search_end_dv='.urlencode($search_end_dv);
-		if ($search_type) $param .= '&search_type='.urlencode($search_type);
-		if ($search_debit) $param .= '&search_debit='.urlencode($search_debit);
-		if ($search_credit) $param .= '&search_credit='.urlencode($search_credit);
+		if ($page) {
+			$param .= '&page='.urlencode($page);
+		}
+		if ($offset) {
+			$param .= '&offset='.urlencode($offset);
+		}
+		if ($search_thirdparty) {
+			$param .= '&search_thirdparty='.urlencode($search_thirdparty);
+		}
+		if ($search_num_releve) {
+			$param .= '&search_num_releve='.urlencode($search_num_releve);
+		}
+		if ($search_description) {
+			$param .= '&search_description='.urlencode($search_description);
+		}
+		if ($search_start_dt) {
+			$param .= '&search_start_dt='.urlencode($search_start_dt);
+		}
+		if ($search_end_dt) {
+			$param .= '&search_end_dt='.urlencode($search_end_dt);
+		}
+		if ($search_start_dv) {
+			$param .= '&search_start_dv='.urlencode($search_start_dv);
+		}
+		if ($search_end_dv) {
+			$param .= '&search_end_dv='.urlencode($search_end_dv);
+		}
+		if ($search_type) {
+			$param .= '&search_type='.urlencode($search_type);
+		}
+		if ($search_debit) {
+			$param .= '&search_debit='.urlencode($search_debit);
+		}
+		if ($search_credit) {
+			$param .= '&search_credit='.urlencode($search_credit);
+		}
 		$param .= '&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder);
 		header('Location: '.$_SERVER["PHP_SELF"].'?'.$param); // To avoid to submit twice and allow the back button
 		exit;
@@ -291,7 +336,9 @@ 
 	$cat1      = GETPOST("cat1", 'alpha');
 
 	$bankaccountid = $id;
-	if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
+	if (GETPOST('add_account', 'int') > 0) {
+		$bankaccountid = GETPOST('add_account', 'int');
+	}
 
 	if (!$dateop) {
 		$error++;
@@ -384,28 +431,72 @@ 
 
 // Must be before button action
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($id > 0) $param .= '&id='.urlencode($id);
-if (!empty($ref)) $param .= '&ref='.urlencode($ref);
-if (!empty($search_ref)) $param .= '&search_ref='.urlencode($search_ref);
-if (!empty($search_description)) $param .= '&search_description='.urlencode($search_description);
-if (!empty($search_type)) $param .= '&type='.urlencode($search_type);
-if (!empty($search_thirdparty)) $param .= '&search_thirdparty='.urlencode($search_thirdparty);
-if (!empty($search_debit)) $param .= '&search_debit='.urlencode($search_debit);
-if (!empty($search_credit)) $param .= '&search_credit='.urlencode($search_credit);
-if (!empty($search_account)) $param .= '&search_account='.urlencode($search_account);
-if (!empty($search_num_releve)) $param .= '&search_num_releve='.urlencode($search_num_releve);
-if ($search_conciliated != '' && $search_conciliated != '-1')  $param .= '&search_conciliated='.urlencode($search_conciliated);
-if ($search_bid > 0)  $param .= '&search_bid='.urlencode($search_bid);
-if (dol_strlen($search_dt_start) > 0) $param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
-if (dol_strlen($search_dt_end) > 0)   $param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
-if (dol_strlen($search_dv_start) > 0) $param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
-if (dol_strlen($search_dv_end) > 0)   $param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
-if ($search_req_nb) $param .= '&req_nb='.urlencode($search_req_nb);
-if (GETPOST("search_thirdparty", 'int')) $param .= '&thirdparty='.urlencode(GETPOST("search_thirdparty", 'int'));
-if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-if ($action == 'reconcile') $param .= '&action=reconcile';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
+if (!empty($ref)) {
+	$param .= '&ref='.urlencode($ref);
+}
+if (!empty($search_ref)) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if (!empty($search_description)) {
+	$param .= '&search_description='.urlencode($search_description);
+}
+if (!empty($search_type)) {
+	$param .= '&type='.urlencode($search_type);
+}
+if (!empty($search_thirdparty)) {
+	$param .= '&search_thirdparty='.urlencode($search_thirdparty);
+}
+if (!empty($search_debit)) {
+	$param .= '&search_debit='.urlencode($search_debit);
+}
+if (!empty($search_credit)) {
+	$param .= '&search_credit='.urlencode($search_credit);
+}
+if (!empty($search_account)) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if (!empty($search_num_releve)) {
+	$param .= '&search_num_releve='.urlencode($search_num_releve);
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$param .= '&search_conciliated='.urlencode($search_conciliated);
+}
+if ($search_bid > 0) {
+	$param .= '&search_bid='.urlencode($search_bid);
+}
+if (dol_strlen($search_dt_start) > 0) {
+	$param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
+}
+if (dol_strlen($search_dt_end) > 0) {
+	$param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
+}
+if (dol_strlen($search_dv_start) > 0) {
+	$param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
+}
+if (dol_strlen($search_dv_end) > 0) {
+	$param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
+}
+if ($search_req_nb) {
+	$param .= '&req_nb='.urlencode($search_req_nb);
+}
+if (GETPOST("search_thirdparty", 'int')) {
+	$param .= '&thirdparty='.urlencode(GETPOST("search_thirdparty", 'int'));
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($action == 'reconcile') {
+	$param .= '&action=reconcile';
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -468,33 +559,59 @@ 
 $sql .= " s.nom, s.name_alias, s.client, s.fournisseur, s.email, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
-}
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	}
+	}
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ";
-if ($search_bid > 0) $sql .= MAIN_DB_PREFIX."bank_class as l,";
+if ($search_bid > 0) {
+	$sql .= MAIN_DB_PREFIX."bank_class as l,";
+}
 $sql .= " ".MAIN_DB_PREFIX."bank_account as ba,";
 $sql .= " ".MAIN_DB_PREFIX."bank as b";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (b.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (b.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND type = 'company'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu.url_id = s.rowid";
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-if ($search_account > 0) $sql .= " AND b.fk_account = ".$search_account;
+if ($search_account > 0) {
+	$sql .= " AND b.fk_account = ".$search_account;
+}
 // Search period criteria
-if (dol_strlen($search_dt_start) > 0) $sql .= " AND b.dateo >= '".$db->idate($search_dt_start)."'";
-if (dol_strlen($search_dt_end) > 0) $sql .= " AND b.dateo <= '".$db->idate($search_dt_end)."'";
+if (dol_strlen($search_dt_start) > 0) {
+	$sql .= " AND b.dateo >= '".$db->idate($search_dt_start)."'";
+}
+if (dol_strlen($search_dt_end) > 0) {
+	$sql .= " AND b.dateo <= '".$db->idate($search_dt_end)."'";
+}
 // Search period criteria
-if (dol_strlen($search_dv_start) > 0) $sql .= " AND b.datev >= '".$db->idate($search_dv_start)."'";
-if (dol_strlen($search_dv_end) > 0) $sql .= " AND b.datev <= '".$db->idate($search_dv_end)."'";
-if ($search_ref) $sql .= natural_search("b.rowid", $search_ref, 1);
-if ($search_req_nb) $sql .= natural_search("b.num_chq", $search_req_nb);
-if ($search_num_releve) $sql .= natural_search("b.num_releve", $search_num_releve);
-if ($search_conciliated != '' && $search_conciliated != '-1') $sql .= " AND b.rappro = ".$search_conciliated;
-if ($search_thirdparty) $sql .= natural_search("s.nom", $search_thirdparty);
+if (dol_strlen($search_dv_start) > 0) {
+	$sql .= " AND b.datev >= '".$db->idate($search_dv_start)."'";
+}
+if (dol_strlen($search_dv_end) > 0) {
+	$sql .= " AND b.datev <= '".$db->idate($search_dv_end)."'";
+}
+if ($search_ref) {
+	$sql .= natural_search("b.rowid", $search_ref, 1);
+}
+if ($search_req_nb) {
+	$sql .= natural_search("b.num_chq", $search_req_nb);
+}
+if ($search_num_releve) {
+	$sql .= natural_search("b.num_releve", $search_num_releve);
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$sql .= " AND b.rappro = ".$search_conciliated;
+}
+if ($search_thirdparty) {
+	$sql .= natural_search("s.nom", $search_thirdparty);
+}
 if ($search_description)
 {
 	$search_description_to_use = $search_description;
@@ -518,13 +635,21 @@ 
 	}
 	$sql .= natural_search("b.label", $search_description_to_use); // Warning some text are just translation keys, not translated strings
 }
-if ($search_bid > 0) $sql .= " AND b.rowid=l.lineid AND l.fk_categ=".$search_bid;
-if (!empty($search_type)) $sql .= " AND b.fk_type = '".$db->escape($search_type)."' ";
+if ($search_bid > 0) {
+	$sql .= " AND b.rowid=l.lineid AND l.fk_categ=".$search_bid;
+}
+if (!empty($search_type)) {
+	$sql .= " AND b.fk_type = '".$db->escape($search_type)."' ";
+}
 // Search criteria amount
 $search_debit = price2num(str_replace('-', '', $search_debit));
 $search_credit = price2num(str_replace('-', '', $search_credit));
-if ($search_debit) $sql .= natural_search('- b.amount', $search_debit, 1);
-if ($search_credit) $sql .= natural_search('b.amount', $search_credit, 1);
+if ($search_debit) {
+	$sql .= natural_search('- b.amount', $search_debit, 1);
+}
+if ($search_credit) {
+	$sql .= natural_search('b.amount', $search_credit, 1);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
@@ -550,28 +675,50 @@ 
 	// We force on last page.
 	$page = ($nbtotalofpages - 1);
 	$offset = $limit * $page;
-	if ($page < 0) $page = 0;
-}
+	if ($page < 0) {
+		$page = 0;
+	}
+	}
 if ($page >= $nbtotalofpages)
 {
 	// If we made a search and result has low page than the page number we were on
 	$page = ($nbtotalofpages - 1);
 	$offset = $limit * $page;
-	if ($page < 0) $page = 0;
-}
+	if ($page < 0) {
+		$page = 0;
+	}
+	}
 
 
 // If not account defined $mode_balance_ok=false
-if (empty($search_account)) $mode_balance_ok = false;
+if (empty($search_account)) {
+	$mode_balance_ok = false;
+}
 // If a search is done $mode_balance_ok=false
-if (!empty($search_ref)) $mode_balance_ok = false;
-if (!empty($search_description)) $mode_balance_ok = false;
-if (!empty($search_type)) $mode_balance_ok = false;
-if (!empty($search_debit)) $mode_balance_ok = false;
-if (!empty($search_credit)) $mode_balance_ok = false;
-if (!empty($search_thirdparty)) $mode_balance_ok = false;
-if ($search_conciliated != '' && $search_conciliated != '-1') $mode_balance_ok = false;
-if (!empty($search_num_releve)) $mode_balance_ok = false;
+if (!empty($search_ref)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_description)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_type)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_debit)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_credit)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_thirdparty)) {
+	$mode_balance_ok = false;
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$mode_balance_ok = false;
+}
+if (!empty($search_num_releve)) {
+	$mode_balance_ok = false;
+}
 
 $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
@@ -589,7 +736,9 @@ 
 		//'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Confirmation delete
@@ -601,7 +750,9 @@ 
 
 	// Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
-	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="'.($action ? $action : 'search').'">';
@@ -611,7 +762,9 @@ 
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
-	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
+	if (GETPOST('bid')) {
+		print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
+	}
 
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
@@ -658,9 +811,13 @@ 
 				$i++;
 				$liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
 			}
-			if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
+			if ($numr >= $nbmax) {
+				$liste = "... &nbsp; ".$liste;
+			}
 			print $liste;
-			if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
+			if ($numr <= 0) {
+				print '<b>'.$langs->trans("None").'</b>';
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -774,9 +931,11 @@ 
 	{
 		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
 		{
-			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// Default is to record miscellaneous direct entries using miscellaneous payments
+			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+				// Default is to record miscellaneous direct entries using miscellaneous payments
 			{
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
+			}
 			} else // If direct entries is not done using miscellaneous payments
 			{
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
@@ -801,12 +960,16 @@ 
 	$morehtml .= '<!-- Add New button -->'.$newcardbutton;
 
 	$picto = 'bank_account';
-	if ($id > 0 || !empty($ref)) $picto = '';
+	if ($id > 0 || !empty($ref)) {
+		$picto = '';
+	}
 
 	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
-	if ($page != '') $param .= '&page='.urlencode($page);
+	if ($page != '') {
+		$param .= '&page='.urlencode($page);
+	}
 
 	$moreforfilter = '';
 
@@ -846,8 +1009,11 @@ 
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-	else $moreforfilter = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
 
 	if ($moreforfilter)
 	{
@@ -953,20 +1119,48 @@ 
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.label']['checked']))            print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER['PHP_SELF'], 'b.label', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.dateo']['checked']))            print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['b.datev']['checked']))            print_liste_field_titre($arrayfields['b.datev']['label'], $_SERVER['PHP_SELF'], 'b.datev,b.dateo,b.rowid', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['type']['checked']))               print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.num_chq']['checked']))          print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['bu.label']['checked']))           print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['ba.ref']['checked']))             print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.debit']['checked']))            print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['b.credit']['checked']))           print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['balancebefore']['checked']))      print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['balance']['checked']))            print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['b.num_releve']['checked']))       print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['b.conciliated']['checked']))      print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
+	if (!empty($arrayfields['b.rowid']['checked'])) {
+		print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.label']['checked'])) {
+		print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER['PHP_SELF'], 'b.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.dateo']['checked'])) {
+		print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['b.datev']['checked'])) {
+		print_liste_field_titre($arrayfields['b.datev']['label'], $_SERVER['PHP_SELF'], 'b.datev,b.dateo,b.rowid', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['type']['checked'])) {
+		print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.num_chq']['checked'])) {
+		print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['bu.label']['checked'])) {
+		print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['ba.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.debit']['checked'])) {
+		print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['b.credit']['checked'])) {
+		print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['balancebefore']['checked'])) {
+		print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['balance']['checked'])) {
+		print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['b.num_releve']['checked'])) {
+		print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['b.conciliated']['checked'])) {
+		print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1027,7 +1221,9 @@ 
 						$balance = $objforbalance->previoustotal;
 					}
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 
 			$balancecalculated = true;
 
@@ -1046,8 +1242,11 @@ 
 					}
 		   			if (!empty($arrayfields[$key]['checked']))
 		   			{
-		   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-		   				else $tmpnbfieldafterbalance++;
+		   				if (!$balancefieldfound) {
+		   					$tmpnbfieldbeforebalance++;
+		   				} else {
+		   					$tmpnbfieldafterbalance++;
+		   				}
 		   			}
 				}
 				// Extra fields
@@ -1060,8 +1259,11 @@ 
 						{
 				   			if (!empty($arrayfields[$key]['checked']))
 				   			{
-				   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-				   				else $tmpnbfieldafterbalance++;
+				   				if (!$balancefieldfound) {
+				   					$tmpnbfieldbeforebalance++;
+				   				} else {
+				   					$tmpnbfieldafterbalance++;
+				   				}
 				   			}
 						}
 					}
@@ -1155,7 +1357,9 @@ 
 				print '<td class="nowrap left">';
 				print $banklinestatic->getNomUrl(1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 		}
 
 		// Description
@@ -1166,8 +1370,9 @@ 
 			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-			else {
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
+				print $langs->trans($reg[1]);
+			} else {
 				if ($objp->label == '(payment_salary)') {
 					print dol_trunc($langs->trans("SalaryPayment", 40));
 				} else {
@@ -1271,12 +1476,16 @@ 
 				{
 				} else {
 					// Show link with label $links[$key]['label']
-					if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
+					if (!empty($objp->label) && !empty($links[$key]['label'])) {
+						print ' - ';
+					}
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
 					{
 						// Label generique car entre parentheses. On l'affiche en le traduisant
-						if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+						if ($reg[1] == 'paiement') {
+							$reg[1] = 'Payment';
+						}
 						print ' '.$langs->trans($reg[1]);
 					} else {
 						print ' '.$links[$key]['label'];
@@ -1285,7 +1494,9 @@ 
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date ope
@@ -1301,7 +1512,9 @@ 
 			print img_edit_add()."</a>";
 			print '</span>';
 			print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 		}
 
 		// Date value
@@ -1317,7 +1530,9 @@ 
 			print img_edit_add()."</a>";
 			print '</span>';
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Payment type
@@ -1325,17 +1540,26 @@ 
 		{
 			print '<td align="center" class="nowrap">';
 			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
-			if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
-			else print $labeltype;
+			if ($labeltype == 'SOLD') {
+				print '&nbsp;';
+			}
+			//$langs->trans("InitialBankBalance");
+			else {
+				print $labeltype;
+			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Num cheque
 		if (!empty($arrayfields['b.num_chq']['checked']))
 		{
 			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
@@ -1359,7 +1583,9 @@ 
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Bank account
@@ -1368,7 +1594,9 @@ 
 			print '<td class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Debit
@@ -1381,8 +1609,12 @@ 
 				$totalarray['totaldeb'] += $objp->amount;
 			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totaldebfield'] = $totalarray['nbfield'];
+			}
 		}
 
 		// Credit
@@ -1395,8 +1627,12 @@ 
 				$totalarray['totalcred'] += $objp->amount;
 			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totalcredfield'] = $totalarray['nbfield'];
+			}
 		}
 
 		// Balance before
@@ -1413,7 +1649,9 @@ 
 			} else {
 				print '<td class="right">-</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Balance
 		if (!empty($arrayfields['balance']['checked']))
@@ -1429,7 +1667,9 @@ 
 			} else {
 				print '<td class="right">-</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		if (!empty($arrayfields['b.num_releve']['checked']))
@@ -1444,7 +1684,9 @@ 
 				}
 				if (!$objp->conciliated && $action == 'reconcile')
 				{
-					if ($objp->num_releve) print '&nbsp;';
+					if ($objp->num_releve) {
+						print '&nbsp;';
+					}
 					print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
 				}
 			}
@@ -1461,15 +1703,19 @@ 
 			print '<td class="nowraponall" align="center">';
 			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Action edit/delete
 		print '<td class="nowraponall" align="center">';
 		// Transaction reconciliated or edit link
-		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
+		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) {
+			// If line not conciliated and account can be conciliated
 		{
 			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+		}
 			print img_edit();
 			print '</a>';
 		} else {
@@ -1498,18 +1744,26 @@ 
 			}
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Action column
 		print '<td class="nowrap" align="center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		if ($massactionbutton || $massaction) {
+			// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		{
 			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		}
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>";
 
@@ -1526,16 +1780,25 @@ 
 			$i++;
 			if ($i == 1)
 			{
-				if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-				else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-			} elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
-			elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
-			elseif ($i == $posconciliatecol)
+				if ($num < $limit && empty($offset)) {
+					print '<td class="left">'.$langs->trans("Total").'</td>';
+				} else {
+					print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} elseif ($totalarray['totaldebfield'] == $i) {
+				print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+			} elseif ($totalarray['totalcredfield'] == $i) {
+				print '<td class="right">'.price($totalarray['totalcred']).'</td>';
+			} elseif ($i == $posconciliatecol)
 			{
 				print '<td class="center">';
-				if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				if ($user->rights->banque->consolidate && $action == 'reconcile') {
+					print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				}
 				print '</td>';
-			} else print '<td></td>';
+			} else {
+				print '<td></td>';
+			}
 		}
 		print '</tr>';
 	}
@@ -1544,7 +1807,10 @@ 
 	if ($num == 0)
 	{
 		$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 + 1).'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 

htdocs/mrp/mo_card.php

Braces +57 added lines, -21 removed lines

@@ -63,10 +63,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';
+}
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
@@ -103,7 +107,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))
 {
@@ -113,8 +119,11 @@ 
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-			else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
+			}
 		}
 	}
 	if ($cancel && !empty($backtopageforcancel)) {
@@ -161,8 +170,12 @@ 
 			{
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -215,8 +228,12 @@ 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -320,8 +337,12 @@ 
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -396,7 +417,10 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
-			if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+			if ($conf->browser->name == 'ie') {
+				$forcecombo = 1;
+			}
+			// There is a bug in IE10 that make combo inside popup crazy
 			$formquestion = array(
 			// 'text' => $langs->trans("ConfirmClone"),
 			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
@@ -417,8 +441,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;
@@ -443,8 +470,9 @@ 
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
-			if ($action != 'classify')
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action != 'classify') {
+							$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -534,7 +562,9 @@ 
 				$i = 0;
 				foreach ($object->lines as $line) {
 					if ($line->role == 'toconsume') {
-						if ($i) print ', ';
+						if ($i) {
+							print ', ';
+						}
 						$tmpproduct = new Product($db);
 						$tmpproduct->fetch($line->fk_product);
 						print $tmpproduct->getNomUrl(1);
@@ -553,7 +583,9 @@ 
 				$i = 0;
 				foreach ($object->lines as $line) {
 					if ($line->role == 'toproduce') {
-						if ($i) print ', ';
+						if ($i) {
+							print ', ';
+						}
 						$tmpproduct = new Product($db);
 						$tmpproduct->fetch($line->fk_product);
 						print $tmpproduct->getNomUrl(1);
@@ -578,7 +610,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))
 		{
@@ -706,7 +740,9 @@ 
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
 	// Presend form
 	$modelmail = 'mo';