Dolibarr / dolibarr

htdocs/theme/md/info-box.inc.php

Braces +19 added lines, -6 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
+?>
 /* <style type="text/css" > */
 
 
@@ -12,10 +15,16 @@ 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
+if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
+	$prefix = 'background-';
+}
 
-if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7;
-if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+if (!isset($conf->global->THEME_SATURATE_RATIO)) {
+	$conf->global->THEME_SATURATE_RATIO = 0.7;
+}
+if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
+	$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+}
 
 ?>
 
@@ -282,8 +291,12 @@ 
 }
 <?php
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7;
-if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+if (!isset($conf->global->THEME_SATURATE_RATIO)) {
+	$conf->global->THEME_SATURATE_RATIO = 0.7;
+}
+if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
+	$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+}
 ?>
 .bg-infobox-project i.fa{
 	color: #605ca8 !important;

htdocs/compta/prelevement/stats.php

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');

htdocs/fourn/facture/index.php

Braces +38 added lines, -16 removed lines

@@ -129,11 +129,17 @@ 
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($user->socid) {
+		$sql .= ' AND f.fk_soc = '.$user->socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " GROUP BY f.fk_statut";
 
 	$resql = $db->query($sql);
@@ -229,12 +235,18 @@ 
 	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
@@ -298,8 +310,7 @@ 
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
+	} elseif ($total > 0)
 	{
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
@@ -327,11 +338,17 @@ 
 	$sql .= " f.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
@@ -423,12 +440,18 @@ 
 	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY f.rowid DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
@@ -519,8 +542,7 @@ 
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
+	} elseif ($total > 0)
 	{
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';

htdocs/compta/facture/index.php

Braces +38 added lines, -16 removed lines

@@ -129,11 +129,17 @@ 
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($user->socid) {
+		$sql .= ' AND f.fk_soc = '.$user->socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " GROUP BY f.fk_statut";
 
 	$resql = $db->query($sql);
@@ -227,12 +233,18 @@ 
 	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total as total_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_DRAFT;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
@@ -296,8 +308,7 @@ 
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
+	} elseif ($total > 0)
 	{
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
@@ -325,11 +336,17 @@ 
 	$sql .= " f.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
@@ -421,12 +438,18 @@ 
 	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	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 f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY f.rowid DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
@@ -518,8 +541,7 @@ 
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
+	} elseif ($total > 0)
 	{
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';

htdocs/hrm/establishment/info.php

Braces +22 added lines, -8 removed lines

@@ -37,8 +37,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');
@@ -51,8 +53,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 Establishment($db);
@@ -64,7 +70,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->hrm->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -80,7 +88,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))
 {
@@ -92,9 +102,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 = '';
 	}
 }
@@ -114,7 +126,9 @@ 
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = establishment_prepare_head($object);
 
 

htdocs/core/lib/modulebuilder.lib.php

Braces +88 added lines, -31 removed lines

@@ -41,8 +41,12 @@ 
 {
 	global $db, $langs;
 
-	if (empty($objectname)) return -1;
-	if (empty($readdir)) $readdir = $destdir;
+	if (empty($objectname)) {
+		return -1;
+	}
+	if (empty($readdir)) {
+		$readdir = $destdir;
+	}
 
 	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
 	{
@@ -85,8 +89,11 @@ 
 
 	try {
 		include_once $pathoffiletoeditsrc;
-		if (class_exists($objectname)) $object = new $objectname($db);
-		else return -4;
+		if (class_exists($objectname)) {
+			$object = new $objectname($db);
+		} else {
+			return -4;
+		}
 
 		// Backup old file
 		dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
@@ -130,30 +137,56 @@ 
 				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";
 				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
 				$texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";
-				if ($val['noteditable'])    $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
-				if ($val['default'] || $val['default'] === '0')        $texttoinsert .= " 'default'=>'".$val['default']."',";
-				if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";
-				if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
-				if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
-				if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
-				if ($val['css'])            $texttoinsert .= " 'css'=>'".$val['css']."',";
-				if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-				if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
-				if ($val['disabled'])       $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
-				if ($val['autofocusoncreate']) $texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";
+				if ($val['noteditable']) {
+					$texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
+				}
+				if ($val['default'] || $val['default'] === '0') {
+					$texttoinsert .= " 'default'=>'".$val['default']."',";
+				}
+				if ($val['index']) {
+					$texttoinsert .= " 'index'=>".$val['index'].",";
+				}
+				if ($val['foreignkey']) {
+					$texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+				}
+				if ($val['searchall']) {
+					$texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+				}
+				if ($val['isameasure']) {
+					$texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+				}
+				if ($val['css']) {
+					$texttoinsert .= " 'css'=>'".$val['css']."',";
+				}
+				if ($val['help']) {
+					$texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+				}
+				if ($val['showoncombobox']) {
+					$texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+				}
+				if ($val['disabled']) {
+					$texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
+				}
+				if ($val['autofocusoncreate']) {
+					$texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";
+				}
 				if ($val['arrayofkeyval'])
 				{
 					$texttoinsert .= " 'arrayofkeyval'=>array(";
 					$i = 0;
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
-						if ($i) $texttoinsert .= ", ";
+						if ($i) {
+							$texttoinsert .= ", ";
+						}
 						$texttoinsert .= "'".$key2."'=>'".$val2."'";
 						$i++;
 					}
 					$texttoinsert .= "),";
 				}
-				if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+				if ($val['comment']) {
+					$texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+				}
 
 				$texttoinsert .= "),\n";
 			}
@@ -217,8 +250,12 @@ 
 
 	$error = 0;
 
-	if (empty($objectname)) return -1;
-	if (empty($readdir)) $readdir = $destdir;
+	if (empty($objectname)) {
+		return -1;
+	}
+	if (empty($readdir)) {
+		$readdir = $destdir;
+	}
 
 	$pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
@@ -237,8 +274,11 @@ 
 		if (!is_object($object))
 		{
 			include_once $pathoffiletoclasssrc;
-			if (class_exists($objectname)) $object = new $objectname($db);
-			else return -1;
+			if (class_exists($objectname)) {
+				$object = new $objectname($db);
+			} else {
+				return -1;
+			}
 		}
 	} catch (Exception $e)
 	{
@@ -261,22 +301,39 @@ 
 			$type = $val['type'];
 			$type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
 
-			if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
-			elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
-			elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';
+			if ($type == 'html') {
+				$type = 'text';
+			}
+			// html modulebuilder type is a text type in database
+			elseif ($type == 'price') {
+				$type = 'double';
+			}
+			// html modulebuilder type is a text type in database
+			elseif (in_array($type, array('link', 'sellist', 'duration'))) {
+				$type = 'integer';
+			}
 			$texttoinsert .= "\t".$key." ".$type;
-			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
-			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
-			else {
+			if ($key == 'rowid') {
+				$texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+			}
+			if ($key == 'entity') {
+				$texttoinsert .= ' DEFAULT 1';
+			} else {
 				if ($val['default'] != '')
 				{
-					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
-					elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
-					else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
+					if (preg_match('/^null$/i', $val['default'])) {
+						$texttoinsert .= " DEFAULT NULL";
+					} elseif (preg_match('/varchar/', $type)) {
+						$texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+					} else {
+						$texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
+					}
 				}
 			}
 			$texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
-			if ($i < count($object->fields)) $texttoinsert .= ", ";
+			if ($i < count($object->fields)) {
+				$texttoinsert .= ", ";
+			}
 			$texttoinsert .= "\n";
 		}
 	}

htdocs/takepos/genimg/qr.php

Braces +27 added lines, -10 removed lines

@@ -15,14 +15,32 @@ 
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
-if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-if (!defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1');
+}
+// If this page is public (can be called outside logged session)
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1');
+}
+// Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php'; // Load $user and permissions
 require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
@@ -34,8 +52,7 @@ 
 	$key = GETPOST('key');
 	$module = new modTcpdfbarcode();
 	$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".$key, 'QRCODE', 'Y');
-}
-else {
+} else {
 	$module = new modTcpdfbarcode();
 	$result = $module->buildBarCode($urlwithroot."/takepos/public/menu.php", 'QRCODE', 'Y');
 }

htdocs/theme/eldy/badges.inc.php

Braces +9 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
 ?>
 /* Badge style is based on boostrap framework */
 
@@ -217,8 +219,12 @@ 
 			$thisBadgeBackgroundColor = "#fff";
 		}
 
-		if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999';
-		if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777';
+		if (in_array((string) $statusName, array('0', '5', '9'))) {
+			$thisBadgeTextColor = '#999999';
+		}
+		if (in_array((string) $statusName, array('6'))) {
+			$thisBadgeTextColor = '#777777';
+		}
 
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";

htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php

Braces +12 added lines, -4 removed lines

@@ -44,11 +44,17 @@ 
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
 	{
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = dol_buildpath('/mymodule/myobject_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -60,7 +66,9 @@ 
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = dol_buildpath("/mymodule/myobject_document.php", 1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;