Dolibarr / dolibarr

htdocs/core/lib/security.lib.php

Braces +184 added lines, -63 removed lines

@@ -37,9 +37,11 @@ 
  */
 function dol_encode($chain, $key = '1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+		// rule 1 is offset of 17 for char
 	{
 		$output_tab = array();
+	}
 		$strlength = dol_strlen($chain);
 		for ($i = 0; $i < $strlength; $i++)
 		{
@@ -74,9 +76,11 @@ 
 {
 	$chain = base64_decode($chain);
 
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+		// rule 1 is offset of 17 for char
 	{
 		$output_tab = array();
+	}
 		$strlength = dol_strlen($chain);
 		for ($i = 0; $i < $strlength; $i++)
 		{
@@ -121,15 +125,27 @@ 
 	}
 
 	// Salt value
-	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') {
+		$chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	}
 
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	elseif ($type == '3' || $type == 'md5') return md5($chain);
-	elseif ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	elseif ($type == '5') return hash('sha256', $chain);
-	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	if ($type == '1' || $type == 'sha1') {
+		return sha1($chain);
+	} elseif ($type == '2' || $type == 'sha1md5') {
+		return sha1(md5($chain));
+	} elseif ($type == '3' || $type == 'md5') {
+		return md5($chain);
+	} elseif ($type == '4' || $type == 'md5openldap') {
+		return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain));
+	}
+	// For OpenLdap with md5 (based on an unencrypted password in base)
+	elseif ($type == '5') {
+		return hash('sha256', $chain);
+	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
+		return sha1($chain);
+	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {
+		return sha1(md5($chain));
+	}
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -151,9 +167,16 @@ 
 	global $conf;
 
 	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		elseif (strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		elseif (strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		if ($hash[0] == '$') {
+			return password_verify($chain, $hash);
+		} elseif (strlen($hash) == 32) {
+			return dol_verifyHash($chain, $hash, '3');
+		}
+		// md5
+		elseif (strlen($hash) == 40) {
+			return dol_verifyHash($chain, $hash, '2');
+		}
+		// sha1md5
 
 		return false;
 	}
@@ -189,34 +212,54 @@ 
 
 	$parentfortableentity = '';
 
-	if ($features == 'facturerec') $features = 'facture';
-	if ($features == 'mo') $features = 'mrp';
-	if ($features == 'member') $features = 'adherent';
+	if ($features == 'facturerec') {
+		$features = 'facture';
+	}
+	if ($features == 'mo') {
+		$features = 'mrp';
+	}
+	if ($features == 'member') {
+		$features = 'adherent';
+	}
 	if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };
 	if ($features == 'websitepage') { $features = 'website'; $tableandshare = 'website_page'; $parentfortableentity = 'fk_website@website'; }
-	if ($features == 'project') $features = 'projet';
-	if ($features == 'product') $features = 'produit';
+	if ($features == 'project') {
+		$features = 'projet';
+	}
+	if ($features == 'product') {
+		$features = 'produit';
+	}
 
 	// Get more permissions checks from hooks
 	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
 	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
 
 	if (isset($hookmanager->resArray['result'])) {
-		if ($hookmanager->resArray['result'] == 0) accessforbidden(); // Module returns 0, so access forbidden
+		if ($hookmanager->resArray['result'] == 0) {
+			accessforbidden();
+		}
+		// Module returns 0, so access forbidden
 	}
 	if ($reshook > 0) {		// No other test done.
 		return 1;
 	}
 
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+		$objectid = "'".$objectid."'";
+	}
 
 	// Features/modules to check
 	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	elseif (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+	if (preg_match('/&/', $features)) {
+		$featuresarray = explode("&", $features);
+	} elseif (preg_match('/\|/', $features)) {
+		$featuresarray = explode("|", $features);
+	}
 
 	// More subfeatures to check
-	if (!empty($feature2)) $feature2 = explode("|", $feature2);
+	if (!empty($feature2)) {
+		$feature2 = explode("|", $feature2);
+	}
 
 	// More parameters
 	$params = explode('&', $tableandshare);
@@ -229,7 +272,9 @@ 
 	$readok = 1; $nbko = 0;
 	foreach ($featuresarray as $feature) {	// first we check nb of test ko
 		$featureforlistofmodule = $feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';
+		if ($featureforlistofmodule == 'produit') {
+			$featureforlistofmodule = 'product';
+		}
 		if (!empty($user->socid) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users
 			$readok = 0; $nbko++;
 			continue;
@@ -250,7 +295,10 @@ 
 		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature) {
-				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card
+				if ($subfeature == 'user' && $user->id == $objectid) {
+					continue;
+				}
+				// A user can always read its own card
 				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; } elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; } else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
 			if (!$tmpreadok) {	// We found a test on feature that is ko
@@ -265,9 +313,13 @@ 
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		$readok = 1;
+	}
 
-	if (!$readok) accessforbidden();
+	if (!$readok) {
+		accessforbidden();
+	}
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record or to upload files)
@@ -297,8 +349,14 @@ 
 				if (!$user->rights->ecm->upload) { $createok = 0; $nbko++; }
 			} elseif (!empty($feature2)) {														// This is for permissions on one level
 				foreach ($feature2 as $subfeature) {
-					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) continue; // User can edit its own card
-					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) continue; // User can edit its own password
+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) {
+						continue;
+					}
+					// User can edit its own card
+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) {
+						continue;
+					}
+					// User can edit its own password
 
 					if (empty($user->rights->$feature->$subfeature->creer)
 					&& empty($user->rights->$feature->$subfeature->write)
@@ -323,9 +381,13 @@ 
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+			$createok = 1;
+		}
 
-		if ($wemustcheckpermissionforcreate && !$createok) accessforbidden();
+		if ($wemustcheckpermissionforcreate && !$createok) {
+			accessforbidden();
+		}
 		//print "Write access is ok";
 	}
 
@@ -333,9 +395,13 @@ 
 	$createuserok = 1;
 	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes')
 	{
-		if (!$user->rights->user->user->creer) $createuserok = 0;
+		if (!$user->rights->user->user->creer) {
+			$createuserok = 0;
+		}
 
-		if (!$createuserok) accessforbidden();
+		if (!$createuserok) {
+			accessforbidden();
+		}
 		//print "Create user access is ok";
 	}
 
@@ -347,51 +413,76 @@ 
 		{
 			if ($feature == 'contact')
 			{
-				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
+				if (!$user->rights->societe->contact->supprimer) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'produit|service')
 			{
-				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
+				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'commande_fournisseur')
 			{
-				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
+				if (!$user->rights->fournisseur->commande->supprimer) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'banque')
 			{
-				if (!$user->rights->banque->modifier) $deleteok = 0;
+				if (!$user->rights->banque->modifier) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'cheque')
 			{
-				if (!$user->rights->banque->cheque) $deleteok = 0;
+				if (!$user->rights->banque->cheque) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'ecm')
 			{
-				if (!$user->rights->ecm->upload) $deleteok = 0;
+				if (!$user->rights->ecm->upload) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'ftp')
 			{
-				if (!$user->rights->ftp->write) $deleteok = 0;
+				if (!$user->rights->ftp->write) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'salaries')
 			{
-				if (!$user->rights->salaries->delete) $deleteok = 0;
+				if (!$user->rights->salaries->delete) {
+					$deleteok = 0;
+				}
 			} elseif ($feature == 'salaries')
 			{
-				if (!$user->rights->salaries->delete) $deleteok = 0;
-			} elseif (!empty($feature2))							// This is for permissions on 2 levels
+				if (!$user->rights->salaries->delete) {
+					$deleteok = 0;
+				}
+			} elseif (!empty($feature2)) {
+				// This is for permissions on 2 levels
 			{
 				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
-					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
+			} else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
-			} elseif (!empty($feature))							// This is used for permissions on 1 level
+			} elseif (!empty($feature)) {
+				// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
 					&& empty($user->rights->$feature->run)) $deleteok = 0;
 			}
+			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+			$deleteok = 1;
+		}
 
-		if (!$deleteok && !($isdraft && $createok)) accessforbidden();
+		if (!$deleteok && !($isdraft && $createok)) {
+			accessforbidden();
+		}
 		//print "Delete access is ok";
 	}
 
@@ -436,9 +527,15 @@ 
 		$sql = '';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature = 'adherent';
-		if ($feature == 'project') $feature = 'projet';
-		if ($feature == 'task')    $feature = 'projet_task';
+		if ($feature == 'member') {
+			$feature = 'adherent';
+		}
+		if ($feature == 'project') {
+			$feature = 'projet';
+		}
+		if ($feature == 'task') {
+			$feature = 'projet_task';
+		}
 
 		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'website'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for societe object
@@ -490,12 +587,14 @@ 
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
-		} elseif (in_array($feature, $checksoc))	// We check feature = checksoc
+		} elseif (in_array($feature, $checksoc)) {
+			// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
+		}
 			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
@@ -514,12 +613,14 @@ 
 				$sql .= " WHERE s.rowid IN (".$objectid.")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} elseif (in_array($feature, $checkother)) {
+			// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+		}
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.fk_soc = ".$user->socid;
@@ -540,10 +641,12 @@ 
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-			if ($feature == 'agenda')// Also check owner or attendee for users without allactions->read
+			if ($feature == 'agenda') {
+				// Also check owner or attendee for users without allactions->read
 			{
 				if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
 					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+			}
 					$action = new ActionComm($db);
 					$action->fetch($objectid);
 					if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
@@ -558,7 +661,9 @@ 
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
-				if (!in_array($objectid, $tmparray)) return false;
+				if (!in_array($objectid, $tmparray)) {
+					return false;
+				}
 			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
@@ -575,19 +680,23 @@ 
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
-				if (!in_array($task->fk_project, $tmparray)) return false;
+				if (!in_array($task->fk_project, $tmparray)) {
+					return false;
+				}
 			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} elseif (!in_array($feature, $nocheck)) {
+			// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
+		}
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
@@ -595,7 +704,9 @@ 
 			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) {
+					dol_print_error('', 'Param dbt_keyfield is required but not defined');
+				}
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -621,7 +732,9 @@ 
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+					return false;
+				}
 			} else {
 				return false;
 			}
@@ -656,12 +769,18 @@ 
 
 	if ($printheader)
 	{
-		if (function_exists("llxHeader")) llxHeader('');
-		elseif (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+		if (function_exists("llxHeader")) {
+			llxHeader('');
+		} elseif (function_exists("llxHeaderVierge")) {
+			llxHeaderVierge('');
+		}
 	}
 	print '<div class="error">';
-	if (!$message) print $langs->trans("ErrorForbidden");
-	else print $message;
+	if (!$message) {
+		print $langs->trans("ErrorForbidden");
+	} else {
+		print $message;
+	}
 	print '</div>';
 	print '<br>';
 	if (empty($showonlymessage))
@@ -687,6 +806,8 @@ 
 			}
 		}
 	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
+	if ($printfooter && function_exists("llxFooter")) {
+		llxFooter();
+	}
 	exit(0);
 }

htdocs/categories/class/api_categories.class.php

Braces +7 added lines, -5 removed lines

@@ -181,8 +181,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve category list : '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -238,7 +237,9 @@ 
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->category->$field = $value;
 		}
 
@@ -721,8 +722,9 @@ 
 	{
 		$category = array();
 		foreach (Categories::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$category[$field] = $data[$field];
 		}
 		return $category;

htdocs/cashdesk/facturation_dhtml.php

Braces +33 added lines, -11 removed lines

@@ -24,12 +24,24 @@ 
  */
 
 
-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('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');
+}
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 require '../main.inc.php';
@@ -40,12 +52,18 @@ 
 $search = GETPOST("code", "alpha");
 
 // Search from criteria
-if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
+if (dol_strlen($search) >= 0) {
+	// If search criteria is on char length at least
 {
 	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
+}
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= ", ps.reel";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	}
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
 	$sql .= " AND p.fk_product_type = 0";
@@ -53,11 +71,15 @@ 
 	if (!empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
 	{
 		$sql .= " AND (p.ref LIKE '".$db->escape($search)."%' OR p.label LIKE '".$db->escape($search)."%'";
-		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
+		if (!empty($conf->barcode->enabled)) {
+			$sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
+		}
 		$sql .= ")";
 	} else {
 		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
-		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
+		if (!empty($conf->barcode->enabled)) {
+			$sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
+		}
 		$sql .= ")";
 	}
 	$sql .= " ORDER BY label";

htdocs/cashdesk/facturation.php

Braces +18 added lines, -6 removed lines

@@ -40,12 +40,18 @@ 
 	$ret = array(); $i = 0;
 
 	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx, p.fk_product_type";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= ", ps.reel";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	}
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
-	if (!$conf->global->CASHDESK_SERVICES) $sql .= " AND p.fk_product_type = 0";
+	if (!$conf->global->CASHDESK_SERVICES) {
+		$sql .= " AND p.fk_product_type = 0";
+	}
 	$sql .= " AND (";
 	$sql .= "p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
 	if (!empty($conf->barcode->enabled))
@@ -90,12 +96,18 @@ 
 	$i = 0;
 
 	$sql = "SELECT p.rowid, ref, label, tva_tx, p.fk_product_type";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= ", ps.reel";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
+	}
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
-	if (!$conf->global->CASHDESK_SERVICES) $sql .= " AND p.fk_product_type = 0";
+	if (!$conf->global->CASHDESK_SERVICES) {
+		$sql .= " AND p.fk_product_type = 0";
+	}
 	$sql .= " ORDER BY p.label";
 
 	dol_syslog($sql);

htdocs/core/modules/DolibarrModules.class.php

Braces +29 added lines, -10 removed lines

@@ -624,9 +624,11 @@ 
 
 		$pathoffile = $this->getDescLongReadmeFound();
 
-		if ($pathoffile)     // Mostly for external modules
+		if ($pathoffile) {
+			// Mostly for external modules
 		{
 			$content = file_get_contents($pathoffile);
+		}
 
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -724,9 +726,11 @@ 
 			}
 		}
 
-		if ($filefound)     // Mostly for external modules
+		if ($filefound) {
+			// Mostly for external modules
 		{
 			$content = file_get_contents($pathoffile);
+		}
 
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1581,9 +1585,11 @@ 
 			if ($result) {
 				$row = $this->db->fetch_row($result);
 
-				if ($row[0] == 0)   // If not found
+				if ($row[0] == 0) {
+					// If not found
 				{
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+				}
 					$sql .= " VALUES (";
 					$sql .= $this->db->encrypt($name, 1);
 					$sql .= ",'".$this->db->escape($type)."'";
@@ -1762,10 +1768,12 @@ 
 					}
 				}
 
-				if ($reinitadminperms && !empty($user->admin))  // Reload permission for current user if defined
+				if ($reinitadminperms && !empty($user->admin)) {
+					// Reload permission for current user if defined
 				{
 					// We reload permissions
 					$user->clearrights();
+				}
 					$user->getrights();
 				}
 			}
@@ -1840,9 +1848,11 @@ 
 			} else {
 				$foundparent = 0;
 				$fk_parent = $this->menu[$key]['fk_menu'];
-				if (preg_match('/^r=/', $fk_parent))    // old deprecated method
+				if (preg_match('/^r=/', $fk_parent)) {
+					// old deprecated method
 				{
 					$fk_parent = str_replace('r=', '', $fk_parent);
+				}
 					if (isset($this->menu[$fk_parent]['rowid'])) {
 						$menu->fk_menu = $this->menu[$fk_parent]['rowid'];
 						$foundparent = 1;
@@ -2218,9 +2228,15 @@ 
 
 		$version = $this->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= 'warning';
-		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
+		if (preg_match('/development/i', $version)) {
+			$versiontrans .= 'warning';
+		}
+		if (preg_match('/experimental/i', $version)) {
+			$versiontrans .= 'warning';
+		}
+		if (preg_match('/deprecated/i', $version)) {
+			$versiontrans .= 'warning';
+		}
 
 		print '
     	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
@@ -2232,8 +2248,11 @@ 
 		//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
 		if (!empty($this->picto))
 		{
-			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
-			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
+			if (preg_match('/^\//i', $this->picto)) {
+				print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
+			} else {
+				print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
+			}
 		} else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}

Spacing +1 added lines, -1 removed lines

@@ -1285,7 +1285,7 @@
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);

htdocs/core/modules/movement/doc/pdf_standard.modules.php

Braces +148 added lines, -54 removed lines

@@ -144,7 +144,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		}
+		// By default if not defined
 
 		// Define position of columns
 		$this->wref = 15;
@@ -159,11 +162,15 @@ 
 		$this->posxdiscount = 167;
 		$this->postotalht = 180;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$this->posxpicture -= 20;
+		}
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
 			$this->posxqty -= 20;
@@ -196,9 +203,13 @@ 
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
@@ -235,8 +246,12 @@ 
 		$sortorder = GETPOST("sortorder", 'alpha');
 		if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 		$offset = $limit * $page;
-		if (!$sortfield) $sortfield = "m.datem";
-		if (!$sortorder) $sortorder = "DESC";
+		if (!$sortfield) {
+			$sortfield = "m.datem";
+		}
+		if (!$sortorder) {
+			$sortorder = "DESC";
+		}
 
 		$pdluoid = GETPOST('pdluoid', 'int');
 
@@ -264,7 +279,9 @@ 
 		$sql .= " u.login, u.photo, u.lastname, u.firstname";
 		// Add fields from extrafields
 		if (!empty($extrafields->attributes[$element]['label'])) {
-			foreach ($extrafields->attributes[$element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+			foreach ($extrafields->attributes[$element]['label'] as $key => $val) {
+				$sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+			}
 		}
 		// Add fields from hooks
 		$parameters = array();
@@ -273,35 +290,67 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 		$sql .= " ".MAIN_DB_PREFIX."product as p,";
 		$sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
-		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 (m.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 (m.rowid = ef.fk_object)";
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
 		$sql .= " WHERE m.fk_product = p.rowid";
-		if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
+		if ($msid > 0) {
+			$sql .= " AND m.rowid = ".$msid;
+		}
 		$sql .= " AND m.fk_entrepot = e.rowid";
 		$sql .= " AND e.entity IN (".getEntity('stock').")";
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
-		if ($id > 0) $sql .= " AND e.rowid ='".$id."'";
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$sql .= " AND p.fk_product_type = 0";
+		}
+		if ($id > 0) {
+			$sql .= " AND e.rowid ='".$id."'";
+		}
 		if ($month > 0)
 		{
-			if ($year > 0)
-				$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, $month, false))."' AND '".$this->db->idate(dol_get_last_day($year, $month, false))."'";
-			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
+			if ($year > 0) {
+							$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, $month, false))."' AND '".$this->db->idate(dol_get_last_day($year, $month, false))."'";
+			} else {
+				$sql .= " AND date_format(m.datem, '%m') = '$month'";
+			}
 		} elseif ($year > 0)
 		{
 			$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		}
-		if ($idproduct > 0) $sql .= " AND p.rowid = ".((int) $idproduct);
-		if (!empty($search_ref))			$sql .= natural_search('m.rowid', $search_ref, 1);
-		if (!empty($search_movement))      $sql .= natural_search('m.label', $search_movement);
-		if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
-		if (!empty($search_product_ref))   $sql .= natural_search('p.ref', $search_product_ref);
-		if (!empty($search_product))       $sql .= natural_search('p.label', $search_product);
-		if ($search_warehouse > 0)          $sql .= " AND e.rowid = ".((int) $this->db->escape($search_warehouse));
-		if (!empty($search_user))          $sql .= natural_search('u.login', $search_user);
-		if (!empty($search_batch))         $sql .= natural_search('m.batch', $search_batch);
-		if ($search_qty != '')				$sql .= natural_search('m.value', $search_qty, 1);
-		if ($search_type_mouvement > 0)		$sql .= " AND m.type_mouvement = '".$this->db->escape($search_type_mouvement)."'";
+		if ($idproduct > 0) {
+			$sql .= " AND p.rowid = ".((int) $idproduct);
+		}
+		if (!empty($search_ref)) {
+			$sql .= natural_search('m.rowid', $search_ref, 1);
+		}
+		if (!empty($search_movement)) {
+			$sql .= natural_search('m.label', $search_movement);
+		}
+		if (!empty($search_inventorycode)) {
+			$sql .= natural_search('m.inventorycode', $search_inventorycode);
+		}
+		if (!empty($search_product_ref)) {
+			$sql .= natural_search('p.ref', $search_product_ref);
+		}
+		if (!empty($search_product)) {
+			$sql .= natural_search('p.label', $search_product);
+		}
+		if ($search_warehouse > 0) {
+			$sql .= " AND e.rowid = ".((int) $this->db->escape($search_warehouse));
+		}
+		if (!empty($search_user)) {
+			$sql .= natural_search('u.login', $search_user);
+		}
+		if (!empty($search_batch)) {
+			$sql .= natural_search('m.batch', $search_batch);
+		}
+		if ($search_qty != '') {
+			$sql .= natural_search('m.value', $search_qty, 1);
+		}
+		if ($search_type_mouvement > 0) {
+			$sql .= " AND m.type_mouvement = '".$this->db->escape($search_type_mouvement)."'";
+		}
 		// Add where from extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 		// Add where from hooks
@@ -315,14 +364,18 @@ 
 		{
 			$result = $this->db->query($sql);
 			$nbtotalofrecords = $this->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;
 			}
 		}
 
-		if (empty($search_inventorycode)) $sql .= $this->db->plimit($limit + 1, $offset);
+		if (empty($search_inventorycode)) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
 
 		$resql = $this->db->query($sql);
@@ -360,10 +413,13 @@ 
 
 				$i = 0;
 				$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-				if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-				else {
+				if ($msid) {
+					$texte = $langs->trans('StockMovementForId', $msid);
+				} else {
 					$texte = $langs->trans("ListOfStockMovements");
-					if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+					if ($id) {
+						$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+					}
 				}
 			}
 
@@ -374,8 +430,12 @@ 
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
-				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
+				if (!empty($search_inventorycode)) {
+					$objectref .= "_".$id."_".$search_inventorycode;
+				}
+				if ($search_type_mouvement) {
+					$objectref .= "_".$search_type_mouvement;
+				}
 				$dir = $conf->stock->dir_output."/movement/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
@@ -439,14 +499,18 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->label));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -484,9 +548,11 @@ 
 						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
-						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+						if (!empty($conf->global->MAIN_MULTILANGS)) {
+							// si l'option est active
 						{
 							$sql = "SELECT label";
+						}
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
 							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
@@ -496,7 +562,9 @@ 
 							if ($result)
 							{
 								$objtp = $this->db->fetch_object($result);
-								if ($objtp->label != '') $objp->produit = $objtp->label;
+								if ($objtp->label != '') {
+									$objp->produit = $objtp->label;
+								}
 							}
 						}
 
@@ -516,31 +584,41 @@ 
 						$pdf->startTransaction();
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						if ($pageposafter > $pageposbefore) {
+							// There is a pagebreak
 						{
 							$pdf->rollbackTransaction(true);
+						}
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
+								// There is no space left for total+free text
 							{
 								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
 								{
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
-									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+																	$showpricebeforepagebreak = 1;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -664,7 +742,9 @@ 
 							$pagenb++;
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 						{
@@ -677,9 +757,13 @@ 
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 					}
 
@@ -760,7 +844,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -777,8 +863,9 @@ 
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -813,7 +900,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -829,7 +918,9 @@ 
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -943,8 +1034,11 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if ($object->type == 1) $titlekey = 'ServiceSheet';
-		else $titlekey = 'StockSheet';
+		if ($object->type == 1) {
+			$titlekey = 'ServiceSheet';
+		} else {
+			$titlekey = 'StockSheet';
+		}
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 

htdocs/core/modules/societe/mod_codeclient_monkey.php

Braces +20 added lines, -7 removed lines

@@ -142,8 +142,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 {
 			return -1;
 		}
@@ -151,8 +154,13 @@ 
 		$date	= dol_now();
 		$yymm	= strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 5) - 1)) $num = $max + 1; // If counter > 99999, we do not format on 5 chars, we take number as it is
-		else $num = sprintf("%05s", $max + 1);
+		if ($max >= (pow(10, 5) - 1)) {
+			$num = $max + 1;
+		}
+		// If counter > 99999, we do not format on 5 chars, we take number as it is
+		else {
+			$num = sprintf("%05s", $max + 1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 		return $prefix.$yymm."-".$num;
@@ -226,10 +234,15 @@ 
 		global $conf, $mc;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
-		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
+		if ($type == 1) {
+			$sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
+		} else {
+			$sql .= " WHERE code_client = '".$db->escape($code)."'";
+		}
 		$sql .= " AND entity IN (".getEntity('societe').")";
-		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
+		if ($soc->id > 0) {
+			$sql .= " AND rowid <> ".$soc->id;
+		}
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
 		$resql = $db->query($sql);

htdocs/core/modules/stock/doc/pdf_standard.modules.php

Braces +71 added lines, -26 removed lines

@@ -144,7 +144,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		}
+		// By default if not defined
 
 		// Define position of columns
 		$this->wref = 35;
@@ -157,11 +160,15 @@ 
 		$this->posxdiscount = 155;
 		$this->postotalht = 175;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$this->posxpicture -= 20;
+		}
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
 			$this->posxqty -= 20;
@@ -194,9 +201,13 @@ 
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
@@ -275,14 +286,18 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->label));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -333,9 +348,11 @@ 
 						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
-						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+						if (!empty($conf->global->MAIN_MULTILANGS)) {
+							// si l'option est active
 						{
 							$sql = "SELECT label";
+						}
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
 							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
@@ -345,7 +362,9 @@ 
 							if ($result)
 							{
 								$objtp = $this->db->fetch_object($result);
-								if ($objtp->label != '') $objp->produit = $objtp->label;
+								if ($objtp->label != '') {
+									$objp->produit = $objtp->label;
+								}
 							}
 						}
 
@@ -364,31 +383,41 @@ 
 						$pdf->startTransaction();
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						if ($pageposafter > $pageposbefore) {
+							// There is a pagebreak
 						{
 							$pdf->rollbackTransaction(true);
+						}
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
+								// There is no space left for total+free text
 							{
 								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
 								{
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
-									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+																	$showpricebeforepagebreak = 1;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -482,7 +511,9 @@ 
 							$pagenb++;
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 						{
@@ -495,9 +526,13 @@ 
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 					}
 
@@ -598,7 +633,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -615,8 +652,9 @@ 
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -651,7 +689,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -667,7 +707,9 @@ 
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -758,8 +800,11 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if ($object->type == 1) $titlekey = 'ServiceSheet';
-		else $titlekey = 'StockSheet';
+		if ($object->type == 1) {
+			$titlekey = 'ServiceSheet';
+		} else {
+			$titlekey = 'StockSheet';
+		}
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 

htdocs/core/extrafieldsinexport.inc.php

Braces +6 added lines, -2 removed lines

@@ -12,11 +12,13 @@ 
 $sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type != 'separate' AND entity IN (0, ".$conf->entity.') ORDER BY pos ASC';
 //print $sql;
 $resql = $this->db->query($sql);
-if ($resql)    // This can fail when class is used on old database (during migration for example)
+if ($resql) {
+	// This can fail when class is used on old database (during migration for example)
 {
 	while ($obj = $this->db->fetch_object($resql))
 	{
 		$fieldname = $keyforaliasextra.'.'.$obj->name;
+}
 		$fieldlabel = ucfirst($obj->label);
 		$typeFilter = "Text";
 		$typefield = preg_replace('/\(.*$/', '', $obj->type); // double(24,8) -> double
@@ -51,7 +53,9 @@ 
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+					$typeFilter = "List:".$tmp;
+				}
 				break;
 		}
 		if ($obj->type != 'separate')