Dolibarr / dolibarr

htdocs/core/lib/ldap.lib.php

Braces +30 added lines, -10 removed lines

@@ -142,15 +142,28 @@ 
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1; // To stop loop
-	if (!is_array($result)) return -1;
+	if ($count == 0) {
+		return -1;
+	}
+	// To stop loop
+	if (!is_array($result)) {
+		return -1;
+	}
 
 	foreach ($result as $key => $val)
 	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
+		if ("$key" == "objectclass") {
+			continue;
+		}
+		if ("$key" == "count") {
+			continue;
+		}
+		if ("$key" == "dn") {
+			continue;
+		}
+		if ("$val" == "objectclass") {
+			continue;
+		}
 
 		$lastkey[$level] = $key;
 
@@ -163,18 +176,25 @@ 
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide = 1;
+				if (strtolower($key) == 'userpassword') {
+					$hide = 1;
+				}
 			}
 			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
 		} elseif ($subcount)
 		{
 			$subcount--;
 			$newstring = dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i', '*', $newstring);
-			else print $newstring;
+			if ($hide) {
+				print preg_replace('/./i', '*', $newstring);
+			} else {
+				print $newstring;
+			}
 			print '<br>';
 		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+		if ("$val" != $lastkey[$level] && !$subcount) {
+			print '</td></tr>';
+		}
 	}
 	return 1;
 }

htdocs/core/lib/signature.lib.php

Braces +16 added lines, -6 removed lines

@@ -59,15 +59,22 @@ 
 	if ($type == 'proposal')
 	{
 		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'proposal_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'proposal_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else {
+		if ($mode == 1) {
+			$out .= '&hashp=<font color="#666666">hash_of_file</font>';
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
-			if ($res <= 0) return 'FailedToGetProposal';
+			if ($res <= 0) {
+				return 'FailedToGetProposal';
+			}
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile = new EcmFiles($db);
@@ -86,7 +93,10 @@ 
 	}
 
 	// For multicompany
-	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out)) {
+		$out .= "&entity=".$conf->entity;
+	}
+	// Check the entity because He may be the same reference in several entities
 
 	return $out;
 }

htdocs/core/lib/doc.lib.php

Braces +31 added lines, -10 removed lines

@@ -48,8 +48,11 @@ 
 	$ref_supplier = (!empty($line->ref_supplier) ? $line->ref_supplier : (!empty($line->ref_fourn) ? $line->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
 	$note = (!empty($line->note) ? $line->note : '');
 
-	if ($issupplierline) $prodser = new ProductFournisseur($db);
-	else $prodser = new Product($db);
+	if ($issupplierline) {
+		$prodser = new ProductFournisseur($db);
+	} else {
+		$prodser = new Product($db);
+	}
 
 	if ($idprod)
 	{
@@ -57,9 +60,15 @@ 
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
 		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) {
+				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) {
+				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			}
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) {
+				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			}
 		}
 	}
 
@@ -82,7 +91,9 @@ 
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			}
 		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
@@ -96,7 +107,9 @@ 
 		} else {
 			if ($idprod)
 			{
-				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
+				if (empty($hidedesc)) {
+					$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
+				}
 			} else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
@@ -111,11 +124,13 @@ 
 		{
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {
+				// In standard mode, we do not show this
 			{
 				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
+			}
 				} else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
@@ -123,8 +138,14 @@ 
 
 			if (empty($hideref))
 			{
-				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
-				else $ref_prodserv = $prodser->ref; // Show local ref only
+				if ($issupplierline) {
+					$ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')';
+				}
+				// Show local ref and supplier ref
+				else {
+					$ref_prodserv = $prodser->ref;
+				}
+				// Show local ref only
 
 				$ref_prodserv .= " - ";
 			}

htdocs/core/lib/website2.lib.php

Braces +56 added lines, -27 removed lines

@@ -45,8 +45,9 @@ 
 	$mastercontent .= "}\n";
 	$mastercontent .= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -128,7 +129,10 @@ 
 	dol_delete_file($filetpl);
 
 	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en
+	if ($objectpage->lang) {
+		$shortlangcode = substr($objectpage->lang, 0, 2);
+	}
+	// en_US or en-US -> en
 
 	$tplcontent = '';
 	$tplcontent .= "<?php // BEGIN PHP\n";
@@ -174,7 +178,10 @@ 
 			$tmppage->fetch($translationof);
 			if ($tmppage->id > 0) {
 				$tmpshortlangcode = '';
-				if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
+				if ($tmppage->lang) {
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang);
+				}
+				// en_US or en-US -> en
 				if ($tmpshortlangcode != $shortlangcode) {
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 				}
@@ -191,7 +198,10 @@ 
 				while ($obj = $db->fetch_object($resql))
 				{
 					$tmpshortlangcode = '';
-					if ($obj->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+					if ($obj->lang) {
+						$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang);
+					}
+					// en_US or en-US -> en
 					if ($tmpshortlangcode != $shortlangcode) {
 						$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
 					}
@@ -224,8 +234,9 @@ 
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -302,8 +313,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -323,8 +335,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filecss, $csscontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -344,8 +357,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filejs, $jscontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -365,8 +379,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filerobot, $robotcontent);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -386,8 +401,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtaccess, $htaccess);
-	if (!empty($conf->global->MAIN_UMASK))
-		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -407,8 +423,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($file, $content);
-	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));
+	}
 
 	return $result;
 }
@@ -428,8 +445,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($file, $content);
-	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));
+	}
 
 		return $result;
 }
@@ -446,11 +464,13 @@ 
 	global $conf, $langs, $db, $form;
 
 	$dirthemes = array('/doctemplates/websites');
-	if (!empty($conf->modules_parts['websitetemplates']))		// Using this feature slow down application
+	if (!empty($conf->modules_parts['websitetemplates'])) {
+		// Using this feature slow down application
 	{
 		foreach ($conf->modules_parts['websitetemplates'] as $reldir)
 		{
 			$dirthemes = array_merge($dirthemes, (array) ($reldir.'doctemplates/websites'));
+	}
 		}
 	}
 	$dirthemes = array_unique($dirthemes);
@@ -495,15 +515,21 @@ 
 							$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
 
 							// Disable not stable themes (dir ends with _exp or _dev)
-							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-							if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+								continue;
+							}
+							if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+								continue;
+							}
 
 							print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
 							$file = $dirtheme."/".$subdirwithoutzip.".jpg";
 							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
 
-							if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+							if (!file_exists($file)) {
+								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+							}
 
 							$originalfile = basename($file);
 							$entity = $conf->entity;
@@ -513,8 +539,11 @@ 
 
 							$ret = '';
 							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
-							if (!empty($urladvanced)) $ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
-							else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+							if (!empty($urladvanced)) {
+								$ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
+							} else {
+								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+							}
 							print $ret;
 							print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
 							print '</a>';

htdocs/core/lib/xcal.lib.php

Braces +9 added lines, -5 removed lines

@@ -361,7 +361,9 @@ 
 
 		fwrite($fichier, "<channel>\n");
 		fwrite($fichier, "<title>".$title."</title>\n");
-		if ($langcode) fwrite($fichier, "<language>".$langcode."</language>\n");
+		if ($langcode) {
+			fwrite($fichier, "<language>".$langcode."</language>\n");
+		}
 
 		/*
         fwrite($fichier, "<description><![CDATA[".$desc.".]]></description>"."\n".
@@ -432,8 +434,9 @@ 
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
 
-				if ($description)
-					fwrite($fichier, $description);
+				if ($description) {
+									fwrite($fichier, $description);
+				}
 				// else
 				//     fwrite($fichier, "NoDesc");
 
@@ -586,8 +589,9 @@ 
 				$out .= $newpara."=\r\n";
 
 				// extra space for cal
-				if ($forcal)
-					$out .= " ";
+				if ($forcal) {
+									$out .= " ";
+				}
 
 				$newpara = "";
 			}

htdocs/core/lib/invoice2.lib.php

Braces +101 added lines, -40 removed lines

@@ -59,8 +59,11 @@ 
 	}
 	if (in_array('date', $filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND f.datef >= '".$db->idate($dateafterdate)."'";
 		$sqlwhere .= " AND f.datef <= '".$db->idate($datebeforedate)."'";
@@ -69,17 +72,25 @@ 
 	if (in_array('nopayment', $filter))
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND pf.fk_paiement IS NULL";
 	}
 	if (in_array('payments', $filter) || in_array('bank', $filter))
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		if (in_array('bank', $filter)) $sql .= ", ".MAIN_DB_PREFIX."bank as b";
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (in_array('bank', $filter)) {
+			$sql .= ", ".MAIN_DB_PREFIX."bank as b";
+		}
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND f.rowid = pf.fk_facture";
 		$sqlwhere .= " AND pf.fk_paiement = p.rowid";
@@ -97,41 +108,62 @@ 
 	}
 	if (in_array('nodeposit', $filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 3';
 	}
 	if (in_array('noreplacement', $filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 1';
 	}
 	if (in_array('nocreditnote', $filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 2';
 	}
 	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
 	}
 	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
 	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
 	}
-	if ($sqlwhere) $sql .= $sqlwhere;
-	if ($sqlorder) $sql .= $sqlorder;
+	if ($sqlwhere) {
+		$sql .= $sqlwhere;
+	}
+	if ($sqlorder) {
+		$sql .= $sqlorder;
+	}
 
 	//print $sql; exit;
 	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
-	if ($usestdout) print '--- start'."\n";
+	if ($usestdout) {
+		print '--- start'."\n";
+	}
 
 	// Start of transaction
 	//$db->begin();
@@ -174,10 +206,14 @@ 
 					$filename = $conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
 					if ($regenerate || !dol_is_file($filename))
 					{
-						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+						if ($usestdout) {
+							print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+						}
 						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
 					} else {
-						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+						if ($usestdout) {
+							print "PDF for invoice ".$obj->ref." already exists\n";
+						}
 					}
 
 					// Add file into files array
@@ -187,8 +223,11 @@ 
 				if ($result <= 0)
 				{
 					$error++;
-					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";
-					else dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);
+					if ($usestdout) {
+						print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";
+					} else {
+						dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);
+					}
 				}
 
 				$cpt++;
@@ -201,8 +240,11 @@ 
 			$page_hauteur = $formatarray['height'];
 			$format = array($page_largeur, $page_hauteur);
 
-			if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";
-			else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
+			if ($usestdout) {
+				print "Using output PDF format ".join('x', $format)."\n";
+			} else {
+				dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
+			}
 
 
 			// Now, build a merged files with all files in $files array
@@ -217,14 +259,19 @@ 
 			}
 			$pdf->SetFont(pdf_getPDFFont($langs));
 
-			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) {
+				$pdf->SetCompression(false);
+			}
 			//$pdf->SetCompression(false);
 
 			// Add all others
 			foreach ($files as $file)
 			{
-				if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-				else dol_syslog("Merge PDF file for invoice ".$file);
+				if ($usestdout) {
+					print "Merge PDF file for invoice ".$file."\n";
+				} else {
+					dol_syslog("Merge PDF file for invoice ".$file);
+				}
 
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
@@ -242,27 +289,38 @@ 
 
 			// Save merged file
 			$filename = $fileprefix;
-			if (empty($filename)) $filename = 'mergedpdf';
-			if (!empty($filesuffix)) $filename .= '_'.$filesuffix;
+			if (empty($filename)) {
+				$filename = 'mergedpdf';
+			}
+			if (!empty($filesuffix)) {
+				$filename .= '_'.$filesuffix;
+			}
 			$file = $diroutputpdf.'/'.$filename.'.pdf';
 
 			if (!$error && $pagecount)
 			{
 				$pdf->Output($file, 'F');
-				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));
+				}
 			}
 
 			if ($usestdout)
 			{
-				if (!$error) print "Merged PDF has been built in ".$file."\n";
-				else print "Can't build PDF ".$file."\n";
+				if (!$error) {
+					print "Merged PDF has been built in ".$file."\n";
+				} else {
+					print "Can't build PDF ".$file."\n";
+				}
 			}
 
 			$result = 1;
 		} else {
-			if ($usestdout) print "No invoices found for criteria.\n";
-			else dol_syslog("No invoices found for criteria");
+			if ($usestdout) {
+				print "No invoices found for criteria.\n";
+			} else {
+				dol_syslog("No invoices found for criteria");
+			}
 			$result = 0;
 		}
 	} else {
@@ -271,6 +329,9 @@ 
 		$error++;
 	}
 
-	if ($error) return -1;
-	else return $result;
-}
+	if ($error) {
+		return -1;
+	} else {
+		return $result;
+	}
+	}

htdocs/core/search_page.php

Braces +19 added lines, -6 removed lines

@@ -27,15 +27,24 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,9 +78,11 @@ 
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {
+	// select2 is ko with jmobile
 {
 	if (!is_object($form)) $form = new Form($db);
+}
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 } else {
@@ -105,7 +116,9 @@ 
 if (empty($reshook))
 {
 	$searchform .= $hookmanager->resPrint;
-} else $searchform = $hookmanager->resPrint;
+} else {
+	$searchform = $hookmanager->resPrint;
+}
 
 
 print "\n";

htdocs/core/filemanagerdol/connectors/php/commands.php

Braces +34 added lines, -19 removed lines

@@ -43,8 +43,9 @@ 
 	{
 		while ($sFile = readdir($oCurrentFolder))
 		{
-			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile))
-				$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile)) {
+							$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+			}
 		}
 		closedir($oCurrentFolder);
 	}
@@ -53,8 +54,9 @@ 
 	echo "<Folders>";
 
 	natcasesort($aFolders);
-	foreach ($aFolders as $sFolder)
-		echo $sFolder;
+	foreach ($aFolders as $sFolder) {
+			echo $sFolder;
+	}
 
 	// Close the "Folders" node.
 	echo "</Folders>";
@@ -84,9 +86,9 @@ 
 		{
 			if ($sFile != '.' && $sFile != '..')
 			{
-				if (is_dir($sServerDir.$sFile))
-					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				else {
+				if (is_dir($sServerDir.$sFile)) {
+									$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+				} else {
 					$iFileSize = @filesize($sServerDir.$sFile);
 					if (!$iFileSize) {
 						$iFileSize = 0;
@@ -94,8 +96,9 @@ 
 					if ($iFileSize > 0)
 					{
 						$iFileSize = round($iFileSize / 1024);
-						if ($iFileSize < 1)
-							$iFileSize = 1;
+						if ($iFileSize < 1) {
+													$iFileSize = 1;
+						}
 					}
 
 					$aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
@@ -109,8 +112,9 @@ 
 	natcasesort($aFolders);
 	echo '<Folders>';
 
-	foreach ($aFolders as $sFolder)
-		echo $sFolder;
+	foreach ($aFolders as $sFolder) {
+			echo $sFolder;
+	}
 
 	echo '</Folders>';
 
@@ -118,8 +122,9 @@ 
 	natcasesort($aFiles);
 	echo '<Files>';
 
-	foreach ($aFiles as $sFiles)
-		echo $sFiles;
+	foreach ($aFiles as $sFiles) {
+			echo $sFiles;
+	}
 
 	echo '</Files>';
 }
@@ -144,8 +149,10 @@ 
 		$sNewFolderName = $_GET['NewFolderName'];
 		$sNewFolderName = SanitizeFolderName($sNewFolderName);
 
-		if (strpos($sNewFolderName, '..') !== false)
-			$sErrorNumber = '102'; // Invalid folder name.
+		if (strpos($sNewFolderName, '..') !== false) {
+					$sErrorNumber = '102';
+		}
+		// Invalid folder name.
 		else {
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
@@ -169,9 +176,13 @@ 
 						$sErrorNumber = '110';
 						break;
 				}
-			} else $sErrorNumber = '103';
+			} else {
+				$sErrorNumber = '103';
+			}
 		}
-	} else $sErrorNumber = '102';
+	} else {
+		$sErrorNumber = '102';
+	}
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -287,8 +298,12 @@ 
 					$sErrorNumber = '202';
 				}
 			}
-		} else $sErrorNumber = '202';
-	} else $sErrorNumber = '202';
+		} else {
+			$sErrorNumber = '202';
+		}
+	} else {
+		$sErrorNumber = '202';
+	}
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);

htdocs/core/filemanagerdol/connectors/php/basexml.php

Braces +9 added lines, -6 removed lines

@@ -90,8 +90,9 @@ 
  */
 function SendError($number, $text)
 {
-	if ($_GET['Command'] == 'FileUpload')
-		SendUploadResults($number, "", "", $text);
+	if ($_GET['Command'] == 'FileUpload') {
+			SendUploadResults($number, "", "", $text);
+	}
 
 	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent'])
 	{
@@ -123,7 +124,9 @@ 
  */
 function SendErrorNode($number, $text)
 {
-	if ($text)
-		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	else echo '<Error number="'.$number.'" />';
-}
+	if ($text) {
+			echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
+	} else {
+		echo '<Error number="'.$number.'" />';
+	}
+	}