Dolibarr / dolibarr

htdocs/accountancy/class/accountingjournal.class.php

Braces +48 added lines, -21 removed lines

@@ -226,18 +226,25 @@ 
 	{
 		global $langs, $conf, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 
 		$url = DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35';
 
 		$label = '<u>'.$langs->trans("ShowAccountingJournal").'</u>';
-		if (!empty($this->code))
-			$label .= '<br><b>'.$langs->trans('Code').':</b> '.$this->code;
-		if (!empty($this->label))
-			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$langs->transnoentities($this->label);
-		if ($moretitle) $label .= ' - '.$moretitle;
+		if (!empty($this->code)) {
+					$label .= '<br><b>'.$langs->trans('Code').':</b> '.$this->code;
+		}
+		if (!empty($this->label)) {
+					$label .= '<br><b>'.$langs->trans('Label').':</b> '.$langs->transnoentities($this->label);
+		}
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$linkclose = '';
 		if (empty($notooltip))
@@ -263,11 +270,17 @@ 
 		}
 
 		$label_link = $this->code;
-		if ($withlabel) $label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
+		if ($withlabel) {
+			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
+		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $label_link;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $label_link;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -302,20 +315,34 @@ 
 		if ($mode == 0)
 		{
 			$prefix = '';
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
-			elseif ($nature == 4) return $langs->trans('AccountingJournalType4');
-			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
-			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
-			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
+			if ($nature == 9) {
+				return $langs->trans('AccountingJournalType9');
+			} elseif ($nature == 5) {
+				return $langs->trans('AccountingJournalType5');
+			} elseif ($nature == 4) {
+				return $langs->trans('AccountingJournalType4');
+			} elseif ($nature == 3) {
+				return $langs->trans('AccountingJournalType3');
+			} elseif ($nature == 2) {
+				return $langs->trans('AccountingJournalType2');
+			} elseif ($nature == 1) {
+				return $langs->trans('AccountingJournalType1');
+			}
 		} elseif ($mode == 1)
 		{
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
-			elseif ($nature == 4) return $langs->trans('AccountingJournalType4');
-			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
-			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
-			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
+			if ($nature == 9) {
+				return $langs->trans('AccountingJournalType9');
+			} elseif ($nature == 5) {
+				return $langs->trans('AccountingJournalType5');
+			} elseif ($nature == 4) {
+				return $langs->trans('AccountingJournalType4');
+			} elseif ($nature == 3) {
+				return $langs->trans('AccountingJournalType3');
+			} elseif ($nature == 2) {
+				return $langs->trans('AccountingJournalType2');
+			} elseif ($nature == 1) {
+				return $langs->trans('AccountingJournalType1');
+			}
 		}
 	}
 }

htdocs/don/stats/index.php

Braces +9 added lines, -3 removed lines

@@ -192,7 +192,9 @@ 
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -229,8 +231,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+	if (!in_array($year, $arrayyears)) {
+		$arrayyears[$year] = $year;
+	}
+	if (!in_array($nowyear, $arrayyears)) {
+		$arrayyears[$nowyear] = $nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';

htdocs/don/document.php

Braces +9 added lines, -3 removed lines

@@ -50,7 +50,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 
@@ -63,8 +65,12 @@ 
 $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 Don($db);

htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php

Braces +6 added lines, -2 removed lines

@@ -112,7 +112,9 @@ 
 		$sql = " select rowid as id, email, firstname, lastname, plan, partner";
 		$sql .= " from ".MAIN_DB_PREFIX."myobject";
 		$sql .= " where email IS NOT NULL AND email != ''";
-		if (GETPOSTISSET('filter') && GETPOST('filter', 'alphanohtml') != 'none') $sql .= " AND status = '".$this->db->escape(GETPOST('filter', 'alphanohtml'))."'";
+		if (GETPOSTISSET('filter') && GETPOST('filter', 'alphanohtml') != 'none') {
+			$sql .= " AND status = '".$this->db->escape(GETPOST('filter', 'alphanohtml'))."'";
+		}
 		$sql .= " ORDER BY email";
 
 		// Stocke destinataires dans target
@@ -197,7 +199,9 @@ 
 	{
 		$a = parent::getNbOfRecipients("select count(distinct(email)) as nb from ".MAIN_DB_PREFIX."myobject as p where email IS NOT NULL AND email != ''");
 
-		if ($a < 0) return -1;
+		if ($a < 0) {
+			return -1;
+		}
 		return $a;
 	}
 }

htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php

Braces +12 added lines, -4 removed lines

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

htdocs/modulebuilder/template/class/actions_mymodule.class.php

Braces +12 added lines, -4 removed lines

@@ -99,7 +99,8 @@ 
 		$error = 0; // Error counter
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 			// Do what you want here...
 			// You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
@@ -107,6 +108,7 @@ 
 
 		if (!$error) {
 			$this->results = array('myreturn' => 999);
+		}
 			$this->resprints = 'A text to show';
 			return 0; // or return 1 to replace standard code
 		} else {
@@ -132,7 +134,8 @@ 
 		$error = 0; // Error counter
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 			foreach ($parameters['toselect'] as $objectid)
 			{
@@ -142,6 +145,7 @@ 
 
 		if (!$error) {
 			$this->results = array('myreturn' => 999);
+		}
 			$this->resprints = 'A text to show';
 			return 0; // or return 1 to replace standard code
 		} else {
@@ -168,10 +172,12 @@ 
 		$disabled = 1;
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 			$this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("MyModuleMassAction").'</option>';
 		}
+		}
 
 		if (!$error) {
 			return 0; // or return 1 to replace standard code
@@ -204,11 +210,13 @@ 
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 		}
 
 		return $ret;
+		}
 	}
 
 	/**

htdocs/install/step5.php

Braces +85 added lines, -27 removed lines

@@ -27,7 +27,9 @@ 
  */
 
 include_once 'inc.php';
-if (file_exists($conffile)) include_once $conffile;
+if (file_exists($conffile)) {
+	include_once $conffile;
+}
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; // for dol_hash
 
@@ -42,13 +44,21 @@ 
 // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install
 // or MAIN_VERSION_LAST_UPGRADE for upgrade.
 $targetversion = DOL_VERSION; // If it's latest upgrade
-if (!empty($action) && preg_match('/upgrade/i', $action))	// If it's an old upgrade
+if (!empty($action) && preg_match('/upgrade/i', $action)) {
+	// If it's an old upgrade
 {
 	$tmp = explode('_', $action, 2);
+}
 	if ($tmp[0] == 'upgrade')
 	{
-		if (!empty($tmp[1])) $targetversion = $tmp[1]; // if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'
-		else $targetversion = DOL_VERSION; // if $action = 'upgrade', we use DOL_VERSION
+		if (!empty($tmp[1])) {
+			$targetversion = $tmp[1];
+		}
+		// if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'
+		else {
+			$targetversion = DOL_VERSION;
+		}
+		// if $action = 'upgrade', we use DOL_VERSION
 	}
 }
 
@@ -63,7 +73,9 @@ 
 
 $useforcedwizard = false;
 $forcedfile = "./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") {
+	$forcedfile = "/etc/dolibarr/install.forced.php";
+}
 if (@file_exists($forcedfile)) {
 	$useforcedwizard = true;
 	include_once $forcedfile;
@@ -130,7 +142,9 @@ 
 			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		} else {
+			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		}
 	}
 
 	$conf->db->type = $dolibarr_main_db_type;
@@ -160,13 +174,17 @@ 
 		include_once DOL_DOCUMENT_ROOT."/core/modules/".$file;
 		$objMod = new $modName($db);
 		$result = $objMod->init();
-		if (!$result) print 'ERROR in activating module file='.$file;
+		if (!$result) {
+			print 'ERROR in activating module file='.$file;
+		}
 
 		if ($db->connected)
 		{
 			$conf->setValues($db);
 			// Reset forced setup after the setValues
-			if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+			if (defined('SYSLOG_FILE')) {
+				$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+			}
 			$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
 			// Create admin user
@@ -184,9 +202,14 @@ 
 					// Define default setup for password encryption
 					dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
 					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0); // All entities
-					if (function_exists('password_hash'))
-						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0); // All entities
-					else dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
+					if (function_exists('password_hash')) {
+											dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);
+					}
+					// All entities
+					else {
+						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);
+					}
+					// All entities
 				}
 
 				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
@@ -243,25 +266,35 @@ 
 
 				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
 				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
-				if (!$resql) dol_print_error($db, 'Error in setup program');
+				if (!$resql) {
+					dol_print_error($db, 'Error in setup program');
+				}
 				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when last install',0)");
-				if (!$resql) dol_print_error($db, 'Error in setup program');
+				if (!$resql) {
+					dol_print_error($db, 'Error in setup program');
+				}
 				$conf->global->MAIN_VERSION_LAST_INSTALL = $targetversion;
 
 				if ($useforcedwizard)
 				{
 					dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
 					$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
-					if (!$resql) dol_print_error($db, 'Error in setup program');
+					if (!$resql) {
+						dol_print_error($db, 'Error in setup program');
+					}
 					$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1).",".$db->encrypt(1, 1).",'chaine',1,'Disable install warnings',0)");
-					if (!$resql) dol_print_error($db, 'Error in setup program');
+					if (!$resql) {
+						dol_print_error($db, 'Error in setup program');
+					}
 					$conf->global->MAIN_REMOVE_INSTALL_WARNING = 1;
 				}
 
 				// If we ask to force some modules to be enabled
 				if (!empty($force_install_module))
 				{
-					if (!defined('DOL_DOCUMENT_ROOT') && !empty($dolibarr_main_document_root)) define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);
+					if (!defined('DOL_DOCUMENT_ROOT') && !empty($dolibarr_main_document_root)) {
+						define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);
+					}
 
 					$tmparray = explode(',', $force_install_module);
 					foreach ($tmparray as $modtoactivate)
@@ -274,13 +307,17 @@ 
 						$res = dol_include_once("/core/modules/".$file);
 
 						$res = activateModule($modtoactivatenew, 1);
-						if (!empty($res['errors'])) print 'ERROR in activating module file='.$file;
+						if (!empty($res['errors'])) {
+							print 'ERROR in activating module file='.$file;
+						}
 					}
 				}
 
 				dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
 				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
-				if (!$resql) dol_print_error($db, 'Error in setup program');
+				if (!$resql) {
+					dol_print_error($db, 'Error in setup program');
+				}
 
 				$db->commit();
 			}
@@ -295,25 +332,36 @@ 
 		{
 			$conf->setValues($db);
 			// Reset forced setup after the setValues
-			if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+			if (defined('SYSLOG_FILE')) {
+				$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+			}
 			$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
 			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
 			$tagdatabase = false;
-			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
+			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
+				$tagdatabase = true;
+			}
+			// We don't know what it was before, so now we consider we are version choosed.
 			else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
 				$targetversionarray = preg_split('/[.-]/', $targetversion);
-				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase = true;
+				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) {
+					$tagdatabase = true;
+				}
 			}
 
 			if ($tagdatabase)
 			{
 				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion);
 				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
-				if (!$resql) dol_print_error($db, 'Error in setup program');
+				if (!$resql) {
+					dol_print_error($db, 'Error in setup program');
+				}
 				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
-				if (!$resql) dol_print_error($db, 'Error in setup program');
+				if (!$resql) {
+					dol_print_error($db, 'Error in setup program');
+				}
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
 			} else {
 				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
@@ -353,7 +401,10 @@ 
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
-				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall = 444; // For backward compatibility
+				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
+					$force_install_lockinstall = 444;
+				}
+				// For backward compatibility
 				fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
 				fclose($fp);
 				@chmod($lockfile, octdec($force_install_lockinstall));
@@ -401,7 +452,10 @@ 
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
-				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall = 444; // For backward compatibility
+				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
+					$force_install_lockinstall = 444;
+				}
+				// For backward compatibility
 				fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
 				fclose($fp);
 				@chmod($lockfile, octdec($force_install_lockinstall));
@@ -437,7 +491,9 @@ 
 clearstatcache();
 
 $ret = 0;
-if ($error && isset($argv[1])) $ret = 1;
+if ($error && isset($argv[1])) {
+	$ret = 1;
+}
 dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("- step5: Dolibarr setup finished");
@@ -445,4 +501,6 @@ 
 pFooter(1, $setuplang);
 
 // Return code if ran from command line
-if ($ret) exit($ret);
+if ($ret) {
+	exit($ret);
+}

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

Braces +13 added lines, -4 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" > */
 
 /*
@@ -198,10 +201,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');
+}
 
 ?>
 .info-box-icon {

htdocs/core/modules/mailings/thirdparties.modules.php

Braces +18 added lines, -6 removed lines

@@ -250,10 +250,16 @@ 
 		{
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num = 0; // Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) {
+				$num = 0;
+			}
+			// Force empty list if category module is not enabled
 
-			if ($num) $s .= '<option value="0">&nbsp;</option>';
-			else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+				$s .= '<option value="0">&nbsp;</option>';
+			} else {
+				$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 
 			$i = 0;
 			while ($i < $num)
@@ -261,10 +267,16 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				$type = '';
-				if ($obj->type == 1) $type = $langs->trans("Supplier");
-				if ($obj->type == 2) $type = $langs->trans("Customer");
+				if ($obj->type == 1) {
+					$type = $langs->trans("Supplier");
+				}
+				if ($obj->type == 2) {
+					$type = $langs->trans("Customer");
+				}
 				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-				if ($type) $s .= ' ('.$type.')';
+				if ($type) {
+					$s .= ' ('.$type.')';
+				}
 				$s .= '</option>';
 				$i++;
 			}