Dolibarr / dolibarr

htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php

Braces +12 added lines, -4 removed lines

@@ -134,8 +134,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(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -145,8 +148,13 @@ 
 		$date = $object->datepaye;
 		$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(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/bom/mod_bom_standard.php

Braces +12 added lines, -4 removed lines

@@ -127,8 +127,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_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
@@ -138,8 +141,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_bom_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/printsheet/modules_labels.php

Braces +12 added lines, -4 removed lines

@@ -103,7 +103,9 @@ 
 		} else {
 			$code = $modele;
 		}
-	} else $code = $modele;
+	} else {
+		$code = $modele;
+	}
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -111,14 +113,18 @@ 
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	} else $srctemplatepath = $code;
+	} else {
+		$srctemplatepath = $code;
+	}
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
 	foreach ($dirmodels as $reldir)
 	{
 		foreach (array('doc', 'pdf') as $prefix)
@@ -134,7 +140,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele

htdocs/core/modules/reception/mod_reception_beryl.php

Braces +12 added lines, -4 removed lines

@@ -111,8 +111,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_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
@@ -121,8 +124,13 @@ 
 		$date = time();
 		$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_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/commande/mod_commande_marbre.php

Braces +12 added lines, -4 removed lines

@@ -127,8 +127,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_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
@@ -138,8 +141,13 @@ 
 		$date = $object->date;
 		$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_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/fichinter/modules_fichinter.php

Braces +17 added lines, -7 removed lines

@@ -140,11 +140,17 @@ 
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
 
@@ -194,7 +200,9 @@ 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
 	foreach ($dirmodels as $reldir)
 	{
 		foreach (array('doc', 'pdf') as $prefix)
@@ -210,7 +218,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele

htdocs/core/modules/project/task/mod_task_simple.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_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -148,8 +151,13 @@ 
 		//$yymm = strftime("%y%m",time());
 		$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_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

Braces +57 added lines, -21 removed lines

@@ -38,16 +38,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (!empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (!empty($conf->deplacement->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (!empty($conf->agenda->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -114,7 +134,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		if (!$this->emetteur->pays_code) {
+			$this->emetteur->pays_code = substr($langs->defaultlang, -2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -376,10 +399,13 @@ 
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -450,7 +476,9 @@ 
 			return -1;
 		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
@@ -477,7 +505,9 @@ 
 
 			$dir = $conf->projet->dir_output."/".$project->ref."/";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
 			if (!file_exists($dir))
@@ -558,10 +588,13 @@ 
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/', $key)) // Image
+						if (preg_match('/logo$/', $key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -575,7 +608,9 @@ 
 				try {
 					// Security check
 					$socid = 0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+					if (!empty($project->fk_soc)) {
+						$socid = $project->fk_soc;
+					}
 
 					$tmparray = $this->get_substitutionarray_tasks($object, $outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -843,8 +878,9 @@ 
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$odfHandler = null; // Destroy object
 

htdocs/core/modules/project/mod_project_simple.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_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -148,8 +151,13 @@ 
 		//$yymm = strftime("%y%m",time());
 		$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_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;