Dolibarr / dolibarr

htdocs/commande/customer.php

Braces +30 added lines, -11 removed lines

@@ -39,8 +39,9 @@ 
 	$socid = $user->socid;
 }
 
-if (!$user->rights->facture->creer)
-accessforbidden();
+if (!$user->rights->facture->creer) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
@@ -53,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 
 /*
@@ -71,19 +76,31 @@ 
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user ";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 if (dol_strlen($stcomm))
 {
 	$sql .= " AND s.fk_stcomm=".$stcomm;
 }
-if (GETPOST("search_nom"))  $sql .= natural_search("s.nom", GETPOST("search_nom"));
-if (GETPOST("search_compta")) $sql .= natural_search("s.code_compta", GETPOST("search_compta"));
-if (GETPOST("search_code_client")) $sql .= natural_search("s.code_client", GETPOST("search_code_client"));
+if (GETPOST("search_nom")) {
+	$sql .= natural_search("s.nom", GETPOST("search_nom"));
+}
+if (GETPOST("search_compta")) {
+	$sql .= natural_search("s.code_compta", GETPOST("search_compta"));
+}
+if (GETPOST("search_code_client")) {
+	$sql .= natural_search("s.code_client", GETPOST("search_code_client"));
+}
 if (dol_strlen($begin))
 {
 	$sql .= " AND s.nom like '".$db->escape($begin)."'";
@@ -103,9 +120,11 @@ 
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }

htdocs/commande/document.php

Braces +6 added lines, -2 removed lines

@@ -64,8 +64,12 @@
 if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
 if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Commande($db);
 

htdocs/cashdesk/index.php

Braces +24 added lines, -6 removed lines

@@ -85,7 +85,10 @@ 
 <div class="contenu">
 <div class="inline-block" style="vertical-align: top">
 <div class="principal_login">
-<?php if ($err) print dol_escape_htmltag($err)."<br><br>\n"; ?>
+<?php if ($err) {
+	print dol_escape_htmltag($err)."<br><br>\n";
+}
+?>
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Identification"); ?></legend>
 <form id="frmLogin" method="POST" action="index_verif.php">
 	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
@@ -130,7 +133,10 @@ 
 print '<td>';
 $disabled = 0;
 $langs->load("companies");
-if (!empty($conf->global->CASHDESK_ID_THIRDPARTY)) $disabled = 1; // If a particular third party is defined, we disable choice
+if (!empty($conf->global->CASHDESK_ID_THIRDPARTY)) {
+	$disabled = 1;
+}
+// If a particular third party is defined, we disable choice
 print $form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : $conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client IN (1,3) AND s.status = 1)', !$disabled, $disabled, 0, array(), 0, 'maxwidth300');
 //print '<input name="warehouse_id" class="texte_login" type="warehouse_id" value="" />';
 print '</td>';
@@ -143,7 +149,10 @@ 
 	print '<td class="label1">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
 	$disabled = 0;
-	if ($conf->global->CASHDESK_ID_WAREHOUSE > 0) $disabled = 1; // If a particular stock is defined, we disable choice
+	if ($conf->global->CASHDESK_ID_WAREHOUSE > 0) {
+		$disabled = 1;
+	}
+	// If a particular stock is defined, we disable choice
 	print $formproduct->selectWarehouses((GETPOST('warehouseid') ?GETPOST('warehouseid', 'int') : (empty($conf->global->CASHDESK_ID_WAREHOUSE) ? 'ifone' : $conf->global->CASHDESK_ID_WAREHOUSE)), 'warehouseid', '', !$disabled, $disabled);
 	print '</td>';
 	print "</tr>\n";
@@ -153,7 +162,10 @@ 
 print '<td class="label1">'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 print '<td>';
 $defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && $conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0) $defaultknown = 1; // If a particular stock is defined, we disable choice
+if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && $conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0) {
+	$defaultknown = 1;
+}
+// If a particular stock is defined, we disable choice
 $form->select_comptes(((GETPOST('bankid_cash') > 0) ?GETPOST('bankid_cash') : $conf->global->CASHDESK_ID_BANKACCOUNT_CASH), 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", ($defaultknown ? 0 : 2));
 print '</td>';
 print "</tr>\n";
@@ -162,7 +174,10 @@ 
 print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 print '<td>';
 $defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE) && $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0) $defaultknown = 1; // If a particular stock is defined, we disable choice
+if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE) && $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0) {
+	$defaultknown = 1;
+}
+// If a particular stock is defined, we disable choice
 $form->select_comptes(((GETPOST('bankid_cheque') > 0) ?GETPOST('bankid_cheque') : $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE), 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", ($defaultknown ? 0 : 2));
 print '</td>';
 print "</tr>\n";
@@ -171,7 +186,10 @@ 
 print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 print '<td>';
 $defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB) && $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0) $defaultknown = 1; // If a particular stock is defined, we disable choice
+if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB) && $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0) {
+	$defaultknown = 1;
+}
+// If a particular stock is defined, we disable choice
 $form->select_comptes(((GETPOST('bankid_cb') > 0) ?GETPOST('bankid_cb') : $conf->global->CASHDESK_ID_BANKACCOUNT_CB), 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", ($defaultknown ? 0 : 2));
 print '</td>';
 print "</tr>\n";

htdocs/cashdesk/affContenu.php

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 print '<div class="principal">';
 
 $page = GETPOST('menutpl', 'alpha');
-if (empty($page)) $page = 'facturation';
+if (empty($page)) {
+	$page = 'facturation';
+}
 
 if (in_array(
 		$page,

htdocs/cashdesk/tpl/validation1.tpl.php

Braces +9 added lines, -6 removed lines

@@ -52,20 +52,23 @@
 			case 'ESP':
 				echo $langs->trans("Cash");
 				$filtre = 'courant=2';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]))
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"];
+				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) {
+									$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"];
+				}
 				break;
 			case 'CB':
 				echo $langs->trans("CreditCard");
 				$filtre = 'courant=1';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]))
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CB"];
+				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) {
+									$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CB"];
+				}
 				break;
 			case 'CHQ':
 				echo $langs->trans("Cheque");
 				$filtre = 'courant=1';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"]))
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"];
+				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"])) {
+									$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"];
+				}
 				break;
 			case 'DIF':
 				echo $langs->trans("Reported");

htdocs/loan/card.php

Braces +24 added lines, -11 removed lines

@@ -27,8 +27,12 @@ 
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
@@ -44,7 +48,9 @@ 
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 $object = new Loan($db);
@@ -57,7 +63,9 @@ 
  */
 
 $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))
 {
 	// Classify paid
@@ -208,16 +216,18 @@ 
 	{
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
-		if ($result < 0)
-			setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	if ($action == 'setlabel' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
 		$result = $object->setValueFrom('label', GETPOST('label'), '', '', 'text', '', $user, 'LOAN_MODIFY');
-		if ($result < 0)
-		setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 }
 
@@ -228,7 +238,9 @@ 
 
 $form = new Form($db);
 $formproject = new FormProjets($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
 
 $title = $langs->trans("Loan").' - '.$langs->trans("Card");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
@@ -425,8 +437,9 @@ 
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->loan->write)
 			{
-				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->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

htdocs/loan/payment/card.php

Braces +13 added lines, -5 removed lines

@@ -24,7 +24,9 @@ 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "banks", "companies", "loan"));
@@ -33,7 +35,9 @@ 
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
 
@@ -41,8 +45,10 @@ 
 if ($id > 0)
 {
 	$result = $payment->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
-}
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
+	}
 
 
 /*
@@ -238,10 +244,12 @@ 
 
 			print '<td class="right">'.price($amount_payed).'</td>';
 			print "</tr>\n";
-			if ($objp->paid == 1)	// If at least one invoice is paid, disable delete
+			if ($objp->paid == 1) {
+				// If at least one invoice is paid, disable delete
 			{
 				$disable_delete = 1;
 			}
+			}
 			$total = $total + $objp->amount_capital;
 			$i++;
 		}

htdocs/loan/document.php

Braces +12 added lines, -4 removed lines

@@ -40,7 +40,9 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
@@ -54,11 +56,17 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Loan($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $upload_dir = $conf->loan->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'loan';

htdocs/webservices/server_other.php

Braces +16 added lines, -7 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
+if (!defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK", '1');
+}
 
 require '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
@@ -149,7 +151,9 @@ 
 
 	dol_syslog("Function: getVersions login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
@@ -192,7 +196,9 @@ 
 
 	dol_syslog("Function: getDocument login=".$authentication['login'].' - modulepart='.$modulepart.' - file='.$file);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	$objectresp = array();
 	$errorcode = ''; $errorlabel = '';
@@ -208,7 +214,9 @@ 
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid = $fuser->societe_id;
+	}
 
 	// Check parameters
 	if (!$error && (!$file || !$modulepart))
@@ -225,7 +233,9 @@ 
 		$original_file = str_replace("../", "/", $original_file);
 
 		// find the subdirectory name as the reference
-		if (empty($refname)) $refname = basename(dirname($original_file)."/");
+		if (empty($refname)) {
+			$refname = basename(dirname($original_file)."/");
+		}
 
 		// Security check
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $conf->entity, $fuser, $refname);
@@ -303,8 +313,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'document'=>$objectret
 				);
-			}
-			else {
+			} else {
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode = 'NOT_FOUND';
 				$errorlabel = '';