alxarafe / alixar

dolibarr/htdocs/core/lib/ecm.lib.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 		$head[$h][1] = $langs->trans("Card");
 		$head[$h][2] = 'card';
 		$h++;
-	}
-	else
+	} else
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Card");

dolibarr/htdocs/core/lib/functionsnumtoword.lib.php

Braces +41 added lines, -29 removed lines

@@ -127,9 +127,13 @@ 
 
 	// If we need to write cents call again this function for cents
 	if(!empty($TNum[1])) {
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+		if(!empty($currency)) {
+		    $concatWords .= ' '.$langs->transnoentities('and');
+		}
 		$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+		if(!empty($currency)) {
+		    $concatWords .= ' '.$langs->transnoentities('centimes');
+		}
 	}
     return $concatWords;
 }
@@ -147,9 +151,12 @@ 
 function dolNumberToWord($numero, $langs, $numorcurrency='number')
 {
 	// If the number is negative convert to positive and return -1 if is too long
-	if ($numero < 0) $numero *= -1;
-	if ($numero >= 1000000000001)
-		return -1;
+	if ($numero < 0) {
+	    $numero *= -1;
+	}
+	if ($numero >= 1000000000001) {
+			return -1;
+	}
 	// Get 2 decimals to cents, another functions round or truncate
 	$strnumber = number_format ($numero,10);
 	$len=strlen($strnumber);
@@ -167,17 +174,13 @@ 
 	{
 		if ($numero>=1 && $numero<2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=0 && $numero<1){
+		} elseif ($numero>=0 && $numero<1){
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000 && $numero<1000001){
+		} elseif ($numero>=1000000 && $numero<1000001){
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000000000 && $numero<1000000000001){
+		} elseif ($numero>=1000000000000 && $numero<1000000000001){
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
+		} else {
 			$entexto ="";
 			$number = $numero;
 			if ($number >= 1000000000){
@@ -198,10 +201,11 @@ 
 				$udMILLON = (int) ($numero / 1000000);
 				$numero = $numero - $udMILLON * 1000000;
 				$entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
-					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
+				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1) {
+									$entexto .= " MILL&OacuteN ";
+				} else {
+									$entexto .= " MILLONES ";
+				}
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
@@ -211,16 +215,18 @@ 
 				$udm = (int) ($numero / 1000);
 				$numero = $numero - $udm * 1000;
 				$entexto .= hundreds2text ($cdm, $ddm, $udm);
-				if ($cdm || $ddm || $udm)
-					$entexto .= " MIL ";
+				if ($cdm || $ddm || $udm) {
+									$entexto .= " MIL ";
+				}
 			}
 			$c = (int) ($numero / 100);
 			$numero = $numero - $c * 100;
 			$d = (int) ($numero / 10);
 			$u = (int) $numero - $d * 10;
 			$entexto .= hundreds2text ($c, $d, $u);
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
-				$entexto .= " DE";
+			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000) {
+							$entexto .= " DE";
+			}
 			$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
 		}
 		return $entexto;
@@ -250,26 +256,32 @@ 
 		$entexto .= $centenas[$hundreds-1];
 	}
 	if ($tens>2){
-		if ($hundreds!=0) $entexto .= " ";
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $decenas[$tens-1];
 		if ($units!=0){
 			$entexto .= " Y ";
 			$entexto .= $unidades[$units-1];
 		}
 		return $entexto;
-	}
-	elseif ($tens==2){
-		if ($hundreds!=0) $entexto .= " ";
+	} elseif ($tens==2){
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
-	}
-	elseif ($tens==1){
-		if ($hundreds!=0) $entexto .= " ";
+	} elseif ($tens==1){
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $diecis[$units];
 		return $entexto;
 	}
 	if ($units!=0) {
-		if ($hundreds!=0 || $tens!=0) $entexto .= " ";
+		if ($hundreds!=0 || $tens!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $unidades[$units-1];
 	}
 	return $entexto;

dolibarr/htdocs/core/lib/files.lib.php

Braces +512 added lines, -266 removed lines

@@ -98,16 +98,21 @@ 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (! is_dir($newpath)) {
+		    return array();
+		}
 
 		if ($dir = opendir($newpath))
 		{
 			$filedate='';
 			$filesize='';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+			while (false !== ($file = readdir($dir))) {
+			    // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (! utf8_check($file)) $file=utf8_encode($file);
+			}
+			// To be sure data is stored in utf8 in memory
 				$fullpathfile=($newpath?$newpath.'/':'').$file;
 
 				$qualified=1;
@@ -117,8 +122,9 @@ 
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+				} else if ($excludefilter) {
+				    $excludefilterarray[]=$excludefilter;
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
 				// Check if file is qualified
 				foreach($excludefilterarray as $filt)
 				{
@@ -137,12 +143,18 @@ 
 						// Add entry into file_list array
 						if (($types=="directories") || ($types=="all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') {
+							    $filedate=dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+							    $filesize=dol_filesize($path."/".$file);
+							}
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+							    // We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							}
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
@@ -166,16 +178,21 @@ 
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					} else if (! $isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+						    $filedate=dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+						    $filesize=dol_filesize($path."/".$file);
+						}
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+						    // We do not search key $filter into $path, only into $file
 						{
 							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+						}
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
@@ -202,12 +219,16 @@ 
 					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 				}
 				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+				if ($sortorder) {
+				    array_multisort($myarray, $sortorder, $file_list);
+				}
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+	    $file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -232,7 +253,9 @@ 
 
 	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
 	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
+	if ($mode) {
+	    $sql.=", description";
+	}
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
 	$sql.=" AND entity = ".$conf->entity;
@@ -280,12 +303,13 @@ 
 				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 			}
 			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+			if ($sortorder) {
+			    array_multisort($myarray, $sortorder, $file_list);
+			}
 		}
 
 		return $file_list;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 		return array();
@@ -313,8 +337,11 @@ 
 		global $object;
 		if (! empty($object->id))
 		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			if (! empty($conf->product->enabled)) {
+			    $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			} else {
+			    $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			}
 
 			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
 			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
@@ -347,16 +374,21 @@ 
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (! $found) {
+		    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['position']='999999';
+		}
+		// File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover']=0;
 			$filearray[$key]['acl']='';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+			}
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile=new EcmFiles($db);
 
@@ -377,13 +409,11 @@ 
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
+				} else
 				{
 					$filearray[$key]['rowid']=$result;
 				}
-			}
-			else
+			} else
 			{
 				$filearray[$key]['rowid']=0;     // Should not happened
 			}
@@ -408,22 +438,27 @@ 
 
 	$sortorder=strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } else { $retup=1; $retdown=-1; }
 
 	if ($sortfield == 'name')
 	{
-		if ($a->name == $b->name) return 0;
+		if ($a->name == $b->name) {
+		    return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
 	if ($sortfield == 'date')
 	{
-		if ($a->date == $b->date) return 0;
+		if ($a->date == $b->date) {
+		    return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
 	if ($sortfield == 'size')
 	{
-		if ($a->size == $b->size) return 0;
+		if ($a->size == $b->size) {
+		    return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -438,9 +473,12 @@ 
 function dol_is_dir($folder)
 {
 	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
-}
+	if (is_dir($newfolder)) {
+	    return true;
+	} else {
+	    return false;
+	}
+	}
 
 /**
  * Return if path is a file
@@ -477,7 +515,9 @@ 
 	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
 	foreach($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i',$url)) {
+		    return true;
+		}
 	}
 	return false;
 }
@@ -499,15 +539,21 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach($name_array as $temp) {
+		    $folder_content .= $temp;
+		}
 
 		closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
+		if ($folder_content == "...") {
+		    return true;
+		} else {
+		    return false;
+		}
+	} else {
+		return true;
 	}
-	else
-	return true; // Dir does not exists
+	// Dir does not exists
 }
 
 /**
@@ -530,11 +576,12 @@ 
 		{
 			$line=fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (! $line === false) {
+			    $nb++;
+			}
 		}
 		fclose($fp);
-	}
-	else
+	} else
 	{
 		$nb=-1;
 	}
@@ -584,11 +631,17 @@ 
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($srcfile)) {
+	    return -1;
+	}
+	if (empty($destfile)) {
+	    $destfile=$srcfile;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+	if (($destfile != $srcfile) && $destexists) {
+	    return 0;
+	}
 
 	$tmpdestfile=$destfile.'.tmp';
 
@@ -625,10 +678,14 @@ 
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -669,10 +726,14 @@ 
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	if (! $overwriteifexists && $destexists) {
+	    return 0;
+	}
 
 	$newpathofsrcfile=dol_osencode($srcfile);
 	$newpathofdestfile=dol_osencode($destfile);
@@ -696,10 +757,14 @@ 
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -727,7 +792,9 @@ 
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
@@ -737,7 +804,9 @@ 
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		    $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		}
 		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
@@ -757,8 +826,7 @@ 
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
+				} else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -775,17 +843,17 @@ 
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
+				} else
 				{
 					$result=$tmpresult;
 				}
-				if ($result < 0) break;
+				if ($result < 0) {
+				    break;
+				}
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
+	} else
 	{
 		// Source directory does not exists
 		$result = -2;
@@ -852,8 +920,9 @@ 
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+			} else {
+			    dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -862,9 +931,11 @@ 
 			// Rename entry into ecm database
 			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
 			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+			}
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
 				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
@@ -873,16 +944,20 @@ 
 
 				$ecmfiletarget=new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+				if ($resultecmtarget > 0) {
+				    // An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
+				}
 
 				$ecmfile=new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+				if ($resultecm > 0) {
+				    // If an entry was found for src file, we use it to move entry
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -890,10 +965,11 @@ 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0) {
+				    // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -910,18 +986,22 @@ 
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
-				else $result = false;
+				if ($resultecm > 0) {
+				    $result=true;
+				} else {
+				    $result = false;
+				}
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		if (empty($newmask)) {
+		    $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		}
 		$newmaskdec=octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -965,9 +1045,11 @@ 
 		}
 		$antivir=new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
+		if ($result < 0) {
+		    // If virus or error, we stop here
 		{
 			$reterrors=$antivir->errors;
+		}
 			return $reterrors;
 		}
 	}
@@ -1075,13 +1157,17 @@ 
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
+	if ($reshook < 0) {
+	    // At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
 	}
-	elseif (empty($reshook))
+		if (empty($errmsg)) {
+		    $errmsg = 'ErrorReturnedBySomeHooks';
+		}
+		// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		return $errmsg;
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded=dol_osencode($src_file);
@@ -1108,11 +1194,12 @@ 
 		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1;	// Success
-		}
-		else
+		} else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3;	// Unknown error
@@ -1167,12 +1254,13 @@ 
 		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) {
+	    // reshook = 0 to do standard actions, 1 = ok, -1 = ko
 	{
 		if ($reshook < 0) return false;
-		return true;
 	}
-	else
+		return true;
+	} else
 	{
 		$error=0;
 
@@ -1188,21 +1276,28 @@ 
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) {
+					    $ok=@unlink($filename);
+					} else {
+					    $ok=unlink($filename);
+					}
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {
+						    // If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+						}
 
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
+							if (is_object($db) && $indexdatabase) {
+							    // $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
 							{
 								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+							}
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfile=new EcmFiles($db);
 								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
@@ -1216,21 +1311,28 @@ 
 								}
 							}
 						}
+					} else {
+					    dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 				}
+			} else {
+			    dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+			    $ok=@unlink($file_osencoded);
+			} else {
+			    $ok=unlink($file_osencoded);
+			}
+			if ($ok) {
+			    dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+			    dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1280,19 +1382,23 @@ 
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (! utf8_check($item)) {
+				    $item=utf8_encode($item);
+				}
+				// should be useless
 
 				if ($item != "." && $item != "..")
 				{
 					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
 					{
 						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
+					} else
 					{
 						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
-						if ($result) $countdeleted++;
+						if ($result) {
+						    $countdeleted++;
+						}
 						//else print 'Error on '.$item."\n";
 					}
 				}
@@ -1303,7 +1409,9 @@ 
 			{
 				$result=dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+				    $countdeleted++;
+				}
 				//else print 'Error on '.$dir."\n";
 			}
 		}
@@ -1328,15 +1436,25 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) {
+	    return 'ErrorObjectNoSupportedByFunction';
+	}
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1369,8 +1487,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		$multiple = $filepreviewold . ".";
 		for ($i = 0; $i < 20; $i++)
@@ -1404,18 +1521,29 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+	    return 0;
+	}
+	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
 	if ($dir)
 	{
@@ -1455,12 +1583,12 @@ 
 		$fp = fopen($file,"w");
 		fputs($fp,$meta);
 		fclose($fp);
-		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 1;
-	}
-	else
+	} else
 	{
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
@@ -1522,9 +1650,11 @@ 
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (! empty($_FILES[$varfiles])) {
+	    // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+	}
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$TFile = $_FILES[$varfiles];
@@ -1558,9 +1688,11 @@ 
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+				if (is_numeric($resupload) && $resupload > 0) {
+				    // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+				}
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -1600,19 +1732,20 @@ 
 					}
 
 					$nbok++;
-				}
-				else
+				} else
 				{
 					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
+					if ($resupload < 0) {
+					    // Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+					    // Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
-					else	// Known error
+					} else	// Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1639,8 +1772,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1671,16 +1803,27 @@ 
 	$listofnames=array();
 	$listofmimes=array();
 	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	if ($keytodelete >= 0)
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		if (empty($donotdeletefile)) {
+		    $result = dol_delete_file($pathtodelete,1);
+		}
+		// The delete of ecm database is inside the function dol_delete_file
+		else {
+		    $result=0;
+		}
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
@@ -1720,9 +1863,11 @@ 
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+	    // If not a tmp dir
 	{
 		$filename = basename($file);
+	}
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -1785,8 +1930,12 @@ 
 		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
 		$sql.= ' WHERE entity = '.$conf->entity;
 		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		if ($file) {
+		    $sql.= " AND filename = '" . $db->escape($file) . "'";
+		}
+		if ($mode) {
+		    $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		}
 
 		$resql = $db->query($sql);
 		if (!$resql)
@@ -1834,32 +1983,33 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) {
+				    $fileoutput=$fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
+				} else
 				{
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
+				if ($ret) {
+				    return $count;
+				} else {
+				    return -3;
+				}
+			} else
 			{
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		return 0;
 	}
@@ -1881,9 +2031,7 @@ 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
@@ -1903,14 +2051,12 @@ 
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -1938,8 +2084,9 @@ 
 		$archive = new PclZip($inputfile);
 		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
+		if (! is_array($result) && $result <= 0) {
+		    return array('error'=>$archive->errorInfo(true));
+		} else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1954,8 +2101,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+			    return array();
+			} else {
+			    return array('error'=>$errmsg);
+			}
 		}
 	}
 
@@ -1969,8 +2119,7 @@ 
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
+		} else
 		{
 			return array('error'=>'ErrUnzipFails');
 		}
@@ -2004,9 +2153,7 @@ 
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=0; } elseif ($mode == 'bz') { $foundhandler=0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -2059,13 +2206,11 @@ 
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2111,16 +2256,25 @@ 
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (! is_object($fuser)) {
+	    $fuser=$user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
+	if (empty($modulepart)) {
+	    return 'ErrorBadParameter';
+	}
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) {
+		    $entity=1;
+		} else {
+		    $entity=0;
+		}
 	}
 	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
+	if ($modulepart == 'users') {
+	    $modulepart='user';
+	}
 
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
@@ -2129,7 +2283,9 @@ 
 	$ret=array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) {
+	    $refname=basename(dirname($original_file)."/");
+	}
 
 	$relative_original_file = $original_file;
 
@@ -2143,7 +2299,9 @@ 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		$accessallowed=1;
 		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
@@ -2184,132 +2342,176 @@ 
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+		if ($fuser->rights->ficheinter->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+		if ($fuser->rights->contrat->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+		if ($fuser->rights->supplier_proposal->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expensereport->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->categorie->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -2372,7 +2574,9 @@ 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
@@ -2384,7 +2588,9 @@ 
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
@@ -2410,64 +2616,56 @@ 
 			$accessallowed=1;
 		}
 		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
+	} else if ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
+	} else if ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
+	} else if ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
+	} else if ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
+	} else if ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	} else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2528,8 +2726,7 @@ 
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2578,8 +2775,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+		    $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+		    $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	}
 
 	// Wrapping for accounting exports
@@ -2634,24 +2834,33 @@ 
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->product->enabled)) {
+		    $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (! empty($conf->service->enabled)) {
+		    $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les lots produits
 	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->productbatch->enabled)) {
+		    $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les contrats
@@ -2732,14 +2941,18 @@ 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_temp.'/'.$original_file;
 	}
 
@@ -2748,7 +2961,9 @@ 
 	{
 		$accessallowed=1;
 		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+		    $dir='torrents';
+		}
 		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
@@ -2776,45 +2991,62 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
+		// If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
+		// If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2822,12 +3054,13 @@ 
 				$accessallowed=1;
 			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
+		} else
 		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+			if (empty($conf->$modulepart->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 
@@ -2835,12 +3068,15 @@ 
 			$subperm=GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
+			} else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2858,11 +3094,13 @@ 
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (! empty($conf->global->$sqlProtectConstName)) {
+		    // If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
+		}
 	}
 
 	$ret = array(
@@ -2884,7 +3122,9 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
+	if (! dol_is_dir($directory)) {
+	    dol_mkdir($directory);
+	}
 	$cachefile = $directory . $filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
@@ -2938,9 +3178,11 @@ 
 
 	$exclude = 'install';
 
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+	foreach ($dir->md5file as $file) {
+	    // $file is a simpleXMLElement
 	{
 		$filename = $path.$file['name'];
+	}
 		$file_list['insignature'][] = $filename;
 		$expectedmd5 = (string) $file;
 
@@ -2949,27 +3191,31 @@ 
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
+		} else
 		{
 			$md5_local = md5_file($pathref.'/'.$filename);
 
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {
+			    // For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
 			}
-			else
+			} else
 			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				if ($md5_local != $expectedmd5) {
+				    $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				}
 				$checksumconcat[] = $md5_local;
 			}
 		}
 	}
 
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+	foreach ($dir->dir as $subdir) {
+	    // $subdir['name'] is  '' or '/accountancy/admin' for example
 	{
 		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
 	}
+	}
 
 	return $file_list;
 }

dolibarr/htdocs/core/lib/expedition.lib.php

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (! empty($conf->expedition->enabled)) {
+	    $langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;

dolibarr/htdocs/core/lib/fourn.lib.php

Braces +30 added lines, -10 removed lines

@@ -48,7 +48,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -62,11 +64,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -78,7 +86,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -116,7 +126,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -139,11 +151,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -155,7 +173,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/pdf.lib.php

Braces +510 added lines, -221 removed lines

@@ -50,8 +50,9 @@ 
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat=dol_getDefaultFormat($outputlangs);
+	} else {
+	    $pdfformat=$conf->global->MAIN_PDF_FORMAT;
 	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
 
 	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
 	$sql.=" WHERE code = '".$pdfformat."'";
@@ -123,17 +124,25 @@ 
 	require_once TCPDF_PATH.'tcpdf.php';
 
 	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) {
+	    require_once TCPDI_PATH.'tcpdi.php';
+	}
 
 	//$arrayformat=pdf_getFormat();
 	//$format=array($arrayformat['width'],$arrayformat['height']);
 	//$metric=$arrayformat['unit'];
 
 	$pdfa=false;											// PDF-1.3
-	if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
+	if (! empty($conf->global->PDF_USE_1A)) {
+	    $pdfa=true;
+	}
+	// PDF1/A
 
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-	else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	if (class_exists('TCPDI')) {
+	    $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	} else {
+	    $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+	}
 
 	// Protection and encryption of pdf
 	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
@@ -202,14 +211,18 @@ 
 {
 	global $conf;
 
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) {
+	    return $conf->global->MAIN_PDF_FORCE_FONT;
+	}
 
 	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+	if (class_exists('TCPDF')) {
+	    // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
 		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
 		{
 			$font=$outputlangs->trans('FONTFORPDF');
+	}
 		}
 	}
 	return $font;
@@ -224,11 +237,13 @@ 
 function pdf_getPDFFontSize($outputlangs)
 {
 	$size=10;                   // By default, for FPDI or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+	if (class_exists('TCPDF')) {
+	    // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
 	{
 		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
 		{
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
+	}
 		}
 	}
 	return $size;
@@ -252,7 +267,9 @@ 
 	if ($tmp['height'])
 	{
 		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+		if ($width > $maxwidth) {
+		    $height=$height*$maxwidth/$width;
+		}
 	}
 	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
 	return $height;
@@ -283,8 +300,7 @@ 
     $height = 0;
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
-    }
-    else
+    } else
     {
         for ($page=$start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
@@ -354,15 +370,33 @@ 
 {
 	global $conf, $hookmanager;
 
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
+	if ($mode == 'source' && ! is_object($sourcecompany)) {
+	    return -1;
+	}
+	if ($mode == 'target' && ! is_object($targetcompany)) {
+	    return -1;
+	}
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
-	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
-	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) {
+	    $sourcecompany->departement=getState($sourcecompany->state_id);
+	}
+	//TODO deprecated
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state)) {
+	    $sourcecompany->state=getState($sourcecompany->state_id);
+	}
+	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id)) {
+	    $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
+	}
+	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) {
+	    $targetcompany->departement=getState($targetcompany->state_id);
+	}
+	//TODO deprecated
+	if (! empty($targetcompany->state_id) && empty($targetcompany->state)) {
+	    $targetcompany->state=getState($targetcompany->state_id);
+	}
+	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id)) {
+	    $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+	}
 
 	$reshook=0;
 	$stringaddress = '';
@@ -378,61 +412,85 @@ 
     	if ($mode == 'source')
     	{
     		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    		    $withCountry = 1;
+    		}
 
     		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
     		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
     		{
     			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			if ($sourcecompany->phone) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+    			}
     			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			if ($sourcecompany->fax) {
+    			    $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+    			}
     			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			if ($sourcecompany->email) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+    			}
     			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    			if ($sourcecompany->url) {
+    			    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+    			}
     		}
     		// Intra VAT
     		if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
     		{
-    			if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+    			if ($sourcecompany->tva_intra) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+    			}
     		}
     		// Professionnal Ids
     		if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
     		}
     		if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
     		}
     		if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
     		}
     		if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
     		}
     		if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
     		}
     		if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
     		}
     	}
@@ -460,8 +518,7 @@ 
     			// Country
     			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
     				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    			} else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
     				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
     			}
 
@@ -470,58 +527,87 @@ 
     				// Phone
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
     			    {
-        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-        				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+        				}
+        				if (! empty($targetcontact->phone_pro)) {
+        				    $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+        				}
+        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= " / ";
+        				}
+        				if (! empty($targetcontact->phone_mobile)) {
+        				    $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+        				}
     			    }
     				// Fax
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
     			    {
-                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+                        if ($targetcontact->fax) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+                        }
     			    }
     				// EMail
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
     			    {
-                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+                        if ($targetcontact->email) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+                        }
     			    }
     				// Web
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
     			    {
-                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+                        if ($targetcontact->url) {
+                            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+                        }
     			    }
     			}
-    		}
-    		else
+    		} else
     		{
     			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+    			}
 
     			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
     			{
     				// Phone
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
     			    {
-    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-	    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+    			    	}
+	    				if (! empty($targetcompany->phone)) {
+	    				    $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+	    				}
+    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) {
+    					    $stringaddress .= " / ";
+    					}
+    					if (! empty($targetcompany->phone_mobile)) {
+    					    $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+    					}
     			    }
     				// Fax
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
     			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    			    	if ($targetcompany->fax) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+    			    	}
     			    }
     				// EMail
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
     			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    			    	if ($targetcompany->email) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+    			    	}
     			    }
     				// Web
     			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
     			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			    	if ($targetcompany->url) {
+    			    	    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+    			    	}
     			    }
     			}
     		}
@@ -529,44 +615,58 @@ 
     		// Intra VAT
     		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
     		{
-    			if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    			if ($targetcompany->tva_intra) {
+    			    $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+    			}
     		}
 
     		// Professionnal Ids
     		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
     		}
     		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
     		}
     		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
     		}
     		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
     		{
     			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    			if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    			    $tmp=$reg[1];
+    			}
     			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
     		}
     		if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
     		{
     		    $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    		        $tmp=$reg[1];
+    		    }
     		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
     		}
     		if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
     		{
     		    $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) {
+    		        $tmp=$reg[1];
+    		    }
     		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
     		}
 
@@ -602,9 +702,12 @@ 
 	global $conf;
 
 	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) {
+	    // Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
+		$pdf->SetAutoPageBreak(0,0);
+	}
+	// Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
 		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
 	}
@@ -645,10 +748,15 @@ 
 	global $langs, $mysoc, $user;
 
 	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
+	if ($unit=='pt') {
+	    $k=1;
+	} elseif ($unit=='mm') {
+	    $k=72/25.4;
+	} elseif ($unit=='cm') {
+	    $k=72/2.54;
+	} elseif ($unit=='in') {
+	    $k=72;
+	}
 
 	// Make substitution
 	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
@@ -710,7 +818,9 @@ 
 
 	// Use correct name of bank id according to country
 	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+	if ($account->getCountryCode() == 'IN') {
+	    $bickey="SWIFT";
+	}
 
 	// Get format of bank account according to its country
 	$usedetailedbban=$account->useDetailedBBAN();
@@ -728,7 +838,8 @@ 
 			$cury+=3;
 		}
 
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN)) {
+		    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 		{
 		    // Note:
 		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
@@ -736,6 +847,7 @@ 
 		    // number = account number
 		    // key = check control key used only when $usedetailedbban = 1
     		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
+		}
 
 
 			foreach ($account->getFieldsToShow() as $val)
@@ -759,7 +871,7 @@ 
 					// Key
 					$tmplength = 15;
 					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
+				} elseif ($val == 'IBAN' || $val == 'BIC') {
 					// Key
 					$tmplength = 0;
 					$content = '';
@@ -781,8 +893,7 @@ 
     		$curx=$savcurx;
     		$cury+=8;
 		}
-	}
-	else
+	} else
 	{
 		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
@@ -794,7 +905,9 @@ 
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
 		$cury+=3;
 
-		if ($diffsizecontent <= 2) $cury+=1;
+		if ($diffsizecontent <= 2) {
+		    $cury+=1;
+		}
 	}
 
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
@@ -818,10 +931,10 @@ 
 		$tmpy=$pdf->getStringHeight(100, $val);
 		$cury+=$tmpy;
 		$cur+=1;
+	} else if (! $usedetailedbban) {
+	    $cury+=1;
 	}
 
-	else if (! $usedetailedbban) $cury+=1;
-
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
 
@@ -835,7 +948,9 @@ 
 		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
 		{
 			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+			if($i%4 == 3 && $i > 0) {
+			    $ibanDisplay .= " ";
+			}
 		}
 
 		$pdf->SetFont('','B',$default_font_size - 3);
@@ -963,21 +1078,28 @@ 
 	if ($fromcompany->capital)
 	{
 		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) {
+		    $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+		} else {
+		    $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+		}
 	}
 	// Prof Id 1
 	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
 	}
 
@@ -986,28 +1108,36 @@ 
 	if ($fromcompany->idprof3)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// Prof Id 5
 	if ($fromcompany->idprof5)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
 	if ($fromcompany->idprof6)
 	{
 		$field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// IntraCommunautary VAT
@@ -1021,18 +1151,20 @@ 
 
 	// The start of the bottom of this page footer is positioned according to # of lines
 	$freetextheight=0;
-	if ($line)	// Free text
+	if ($line) {
+	    // Free text
 	{
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
 	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 		{
-			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+			$width=20000;
+	}
+	$align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
     		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
     			$width=200; $align='C';
     		}
 		    $freetextheight=$pdf->getStringHeight($width,$line);
-		}
-		else
+		} else
 		{
             $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
@@ -1042,14 +1174,17 @@ 
 	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
 	$posy=$marginwithfooter+0;
 
-	if ($line)	// Free text
+	if ($line) {
+	    // Free text
 	{
 		$pdf->SetXY($dims['lm'],-$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+	}
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+		    // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		}
-		else
+		} else
 		{
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
@@ -1162,15 +1297,21 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
 		$action='';
 		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1208,8 +1349,7 @@ 
 	{
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
-	}
-	else
+	} else
 	{
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
@@ -1230,7 +1370,9 @@ 
 			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
 			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
 			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
 
 			// Set desc
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
@@ -1240,11 +1382,15 @@ 
 			} else {
 				$textwasmodified=($desc == $prodser->description);
 			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+			}
 
 			// Set note
 			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) {
+			    $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+			}
 		}
 	}
 
@@ -1265,29 +1411,28 @@ 
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$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)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+			    echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+			}
 		}
 		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount=new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
+		} else
 		{
 			if ($idprod)
 			{
@@ -1296,14 +1441,12 @@ 
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
 						$libelleproduitservice=$desc."\n".$libelleproduitservice;
-					}
-					else
+					} else
 					{
 						$libelleproduitservice.=$desc;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$libelleproduitservice.=$desc;
 			}
@@ -1313,13 +1456,14 @@ 
 	// We add ref of product (and supplier ref if defined)
 	$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
+	}
+		} else
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
@@ -1329,22 +1473,25 @@ 
 	{
 		if ($issupplierline)
 		{
-			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
-				$ref_prodserv = $ref_supplier;
-			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
+			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1) {
+							$ref_prodserv = $ref_supplier;
+			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2) {
+							$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+			} else	// Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+				if ($ref_supplier) {
+				    $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+				}
 			}
-		}
-		else
+		} else
 		{
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
-		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
+		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) {
+		    $ref_prodserv .= " - ";
+		}
 	}
 
 	if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
@@ -1361,8 +1508,9 @@ 
 		{
 			// Adding the descriptions if they are filled
 			$desccateg=$cate->add_description;
-			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
+			if ($desccateg) {
+							$libelleproduitservice.='__N__'.$desccateg;
+			}
 		}
 	}
 
@@ -1385,7 +1533,7 @@ 
 		//print '>'.$outputlangs->charset_output.','.$period;
 		if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
 		    $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
-		}else{
+		} else{
 		$libelleproduitservice.="__N__".$period;
 		}
 		//print $libelleproduitservice;
@@ -1397,17 +1545,26 @@ 
 		foreach ($dbatch as $detail)
 		{
 			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+			if ($detail->eatby) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
+			}
+			if ($detail->sellby) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
+			}
+			if ($detail->batch) {
+			    $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+			}
 			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
 			$libelleproduitservice.= "__N__  ".implode(" - ", $dte);
 		}
 	}
 
 	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+	if (dol_textishtml($libelleproduitservice)) {
+	    $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
+	} else {
+	    $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+	}
 	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
 
 	return $libelleproduitservice;
@@ -1429,10 +1586,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1462,10 +1623,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1494,10 +1659,14 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1526,15 +1695,21 @@ 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1547,8 +1722,11 @@ 
 			{
 				if ($object->lines[$i]->total_localtax1 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
+					if (preg_replace('/[\s0%]/','',$tmpresult)) {
+					    $tmpresult.='/';
+					} else {
+					    $tmpresult='';
+					}
 					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
@@ -1556,8 +1734,11 @@ 
 			{
 				if ($object->lines[$i]->total_localtax2 != 0)
 				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
+					if (preg_replace('/[\s0%]/','',$tmpresult)) {
+					    $tmpresult.='/';
+					} else {
+					    $tmpresult='';
+					}
 					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
 				}
 			}
@@ -1583,20 +1764,28 @@ 
 	global $conf, $hookmanager;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
@@ -1623,24 +1812,34 @@ 
 	global $hookmanager,$conf;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -1661,20 +1860,30 @@ 
 	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result=$hookmanager->resPrint;
+		}
 	}
     if (empty($reshook))
 	{
-	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
+	   if ($object->lines[$i]->special_code == 3) {
+	       return '';
+	   }
+	   if (empty($hidedetails) || $hidedetails > 1) {
+	       $result.=$object->lines[$i]->qty;
+	   }
 	}
 	return $result;
 }
@@ -1695,20 +1904,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+        if (empty($hidedetails) || $hidedetails > 1) {
+            $result.=$object->lines[$i]->qty_asked;
+        }
 	}
 	return $result;
 }
@@ -1729,20 +1948,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=$object->lines[$i]->qty_shipped;
+	    }
 	}
 	return $result;
 }
@@ -1763,20 +1992,30 @@ 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+		if (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+		}
 	}
 	return $result;
 }
@@ -1798,9 +2037,11 @@ 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
+	}
 		if (!empty($object->lines[$i]->fk_parent_line)) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
@@ -1813,12 +2054,18 @@ 
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	    }
 	}
 	return $result;
 }
@@ -1842,20 +2089,30 @@ 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+        if ($object->lines[$i]->special_code == 3) {
+            return '';
+        }
+	    if (empty($hidedetails) || $hidedetails > 1) {
+	        $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+	    }
 	}
 	return $result;
 }
@@ -1872,25 +2129,35 @@ 
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if (empty($hookmanager)) global $hookmanager;
+	if (empty($hookmanager)) {
+	    global $hookmanager;
+	}
 	global $conf;
 
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    return $hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
-        	if ($object->lines[$i]->special_code == 3) return '';
+        	if ($object->lines[$i]->special_code == 3) {
+        	    return '';
+        	}
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
 			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
@@ -1901,9 +2168,9 @@ 
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
+			} else {
+							$result = $object->lines[$i]->situation_percent . '%';
 			}
-			else
-				$result = $object->lines[$i]->situation_percent . '%';
 	  	}
 	}
 	return $result;
@@ -1923,20 +2190,28 @@ 
 	global $conf, $hookmanager;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
     if (empty($reshook))
     {
@@ -1957,9 +2232,9 @@ 
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
 				$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+        	} else {
+        				$result.=price($sign * $total_ht, 0, $outputlangs);
         	}
-        	else
-			$result.=price($sign * $total_ht, 0, $outputlangs);
 	}
     }
 	return $result;
@@ -1979,28 +2254,37 @@ 
 	global $hookmanager,$conf;
 
 	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	    $sign=-1;
+	}
 
 	$reshook=0;
 	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+	if (is_object($hookmanager)) {
+	    // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+	}
+		if (! empty($object->lines[$i]->fk_parent_line)) {
+		    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) {
+		    $result.=$hookmanager->resPrint;
+		}
 	}
 	if (empty($reshook))
 	{
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result.=$outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+    	} elseif (empty($hidedetails) || $hidedetails > 1) {
+		    $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -2029,21 +2313,20 @@ 
 			if ($type=='all')
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+			} else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				if (! empty($object->lines[$i]->fk_parent_line)) {
+				    $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				}
 				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 				$action='';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
+			} else if ($type==0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
+			} else if ($type==1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2074,8 +2357,7 @@ 
 	    if ($objecttype == 'facture')
 	    {
 	       // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2086,8 +2368,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
+		} else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach($objects as $elementobject)
@@ -2097,8 +2378,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'contrat')
+		} else if ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
 			foreach($objects as $elementobject)
@@ -2108,8 +2388,7 @@ 
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
 			}
-		}
-		else if ($objecttype == 'shipping')
+		} else if ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
@@ -2117,24 +2396,31 @@ 
 			{
 			    $order=null;
 			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {
+			        // There is not already a link to order and object is not the order, so we show also info with order
 			    {
 			        $elementobject->fetchObjectLinked();
-			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+			    }
+			        if (! empty($elementobject->linkedObjects['commande'])) {
+			            $order = reset($elementobject->linkedObjects['commande']);
+			        }
 			    }
 			    if (! is_object($order))
 			    {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
+			        if (! empty($linkedobjects[$objecttype]['ref_value'])) {
+			            $linkedobjects[$objecttype]['ref_value'].=' / ';
+			        }
 			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else
+			    } else
 			    {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+			        if (empty($linkedobjects[$objecttype]['ref_value'])) {
+			            $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+			        }
 			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
 			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
@@ -2150,7 +2436,9 @@ 
 		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
 		$action='';
 		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+		if (! empty($hookmanager->resArray)) {
+		    $linkedobjects = $hookmanager->resArray;
+		}
 	}
 
 	return $linkedobjects;
@@ -2174,12 +2462,13 @@ 
 	if ($tmp['height'])
 	{
 		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
-		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
+		if ($width > $maxwidth) {
+		    // Pb with maxheight, so i use maxwidth
 		{
 			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
 		}
-		else	// No pb with maxheight
+			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+		} else	// No pb with maxheight
 		{
 			$height=$maxheight;
 		}

dolibarr/htdocs/core/lib/price.lib.php

Braces +64 added lines, -32 removed lines

@@ -89,14 +89,20 @@ 
 	$result=array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
+	if (empty($info_bits)) {
+	    $info_bits=0;
+	}
+	if (empty($txtva)) {
+	    $txtva=0;
+	}
 	if (empty($seller) || ! is_object($seller))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+		if (! is_object($mysoc)) {
+		    // mysoc may be not defined (during migration process)
 		{
 			$mysoc=new Societe($db);
+		}
 			$mysoc->setMysoc($conf);
 		}
 		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
@@ -111,11 +117,19 @@ 
 
 	$countryid=$seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) {
+	    $uselocaltax1_rate=(float) $uselocaltax1_rate;
+	}
+	if (is_numeric($uselocaltax2_rate)) {
+	    $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	}
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) {
+	    $uselocaltax1_rate=$seller->localtax1_assuj;
+	}
+	if ($uselocaltax2_rate < 0) {
+	    $uselocaltax2_rate=$seller->localtax2_assuj;
+	}
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
@@ -130,8 +144,7 @@ 
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+	} else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
@@ -150,24 +163,29 @@ 
 				$localtax2_type=$obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
+		} else {
+		    dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
+		if (! empty($multicurrency_tx)) {
+		    $pu = $pu_devise / $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu=0;
+	if ($pu === '') {
+	    $pu=0;
+	}
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) {
+		    $pu_devise = $pu * $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
@@ -180,7 +198,9 @@ 
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i=0; $i <= 15; $i++) {
+	    $result[$i] = 0;
+	}
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
@@ -190,8 +210,7 @@ 
     	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
-    }
-    else
+    } else
     {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
@@ -207,10 +226,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
 
@@ -231,10 +254,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -266,8 +293,7 @@ 
 		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
 		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
+	} else
 	{
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
@@ -302,10 +328,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
@@ -325,10 +355,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -352,8 +386,7 @@ 
 			$result[2]=price2num($result[0]+$result[1], 'MT');
 			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
+		} else
 		{
 			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
@@ -386,8 +419,7 @@ 
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
+	} else
 	{
 		$result[16] = $result[0];
 		$result[17] = $result[1];

dolibarr/htdocs/core/lib/ldap.lib.php

Braces +34 added lines, -18 removed lines

@@ -112,17 +112,14 @@ 
 	if (! function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
+	} else if (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
+	} else if (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
+	} else
 	{
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
@@ -146,15 +143,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;
 
@@ -168,19 +178,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"]);
-		}
-		else if ($subcount)
+		} else if ($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;
 }

dolibarr/htdocs/core/lib/functions2.lib.php

Braces +696 added lines, -349 removed lines

@@ -55,8 +55,7 @@ 
                 $entity = "&#". $unicode . ';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -97,7 +96,10 @@ 
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/',$file)) {
+                    continue;
+                }
+                // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
@@ -129,8 +131,14 @@ 
     	$outputlangs=$langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') {
+        $selected='CAP4';
+    }
+    // Canada
+    if ($outputlangs->defaultlang == 'en_US') {
+        $selected='USLetter';
+    }
+    // US
     return $selected;
 }
 
@@ -155,29 +163,42 @@ 
         {
             $content=file_get_contents($formfile);
             $isutf8=utf8_check($content);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-            else print $content;
+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                print utf8_encode($content);
+            } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                print utf8_decode($content);
+            } else {
+                print $content;
+            }
             return true;
+        } else {
+            dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            if ($langs->defaultlang != "en_US") {
+                $formfilealt = $searchdir."/langs/en_US/".$filename;
+            } else {
+                $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            }
             dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
                 $content=file_get_contents($formfilealt);
                 $isutf8=utf8_check($content);
-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-                else print $content;
+                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                    print utf8_encode($content);
+                } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                    print utf8_decode($content);
+                } else {
+                    print $content;
+                }
                 return true;
+            } else {
+                dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
             }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
     }
 
@@ -207,279 +228,460 @@ 
     $deltadateforuser=round($deltadateforclient-$deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-    if ($usetable) print '<table class="border centpercent">';
+    if ($usetable) {
+        print '<table class="border centpercent">';
+    }
 
     // Import key
     if (! empty($object->import_key))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ImportedWithSet");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print $object->import_key;
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_creation) || ! empty($object->user_creation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("CreatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_creation->id) {
+        	    print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date creation
     if (! empty($object->date_creation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateCreation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_modification) || ! empty($object->user_modification_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ModifiedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_modification->id) {
+        	    print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date change
     if (! empty($object->date_modification))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastModification");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_validation) || ! empty($object->user_validation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ValidatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_validation))
         {
-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_validation->id) {
+                print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date validation
     if (! empty($object->date_validation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateValidation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_approve) || ! empty($object->user_approve_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_approve))
         {
-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_approve->id) {
+                print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date approve
     if (! empty($object->date_approve))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve
     if (! empty($object->user_approve_id2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         $userstatic=new User($db);
         $userstatic->fetch($object->user_approve_id2);
-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        else print $langs->trans("Unknown");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($userstatic->id) {
+            print $userstatic->getNomUrl(1, '', 0, 0, 0);
+        } else {
+            print $langs->trans("Unknown");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date approve
     if (! empty($object->date_approve2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove2");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User close
     if (! empty($object->user_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ClosedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_cloture->id) {
+			    print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date close
     if (! empty($object->date_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateClosing");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User conciliate
     if (! empty($object->user_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ConciliatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_rappro->id) {
+			    print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date conciliate
     if (! empty($object->date_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateConciliating");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date send
     if (! empty($object->date_envoi))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastSend");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
-    if ($usetable) print '</table>';
-}
+    if ($usetable) {
+        print '</table>';
+    }
+    }
 
 
 /**
@@ -508,8 +710,7 @@ 
     if (checkdnsrr($domain, "MX"))
     {
         return true;
-    }
-    else
+    } else
     {
         return false;
     }
@@ -534,10 +735,14 @@ 
     $urlregex = '';
 
     // SCHEME
-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+    if ($http) {
+        $urlregex .= "^(http:\/\/|https:\/\/)";
+    }
 
     // USER AND PASS
-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    if ($pass) {
+        $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    }
 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
@@ -546,13 +751,21 @@ 
     //use only one of the above
 
     // PORT
-    if ($port) $urlregex .= "(\:[0-9]{2,5})";
+    if ($port) {
+        $urlregex .= "(\:[0-9]{2,5})";
+    }
     // PATH
-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    if ($path) {
+        $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    }
     // GET Query
-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    if ($query) {
+        $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    }
     // ANCHOR
-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    if ($anchor) {
+        $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    }
 
     // check
     if (preg_match('/'.$urlregex.'/i', $url))
@@ -600,9 +813,10 @@ 
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
+    } else {
+        return $url;
+    }
     }
-    else return $url;
-}
 
 
 
@@ -619,7 +833,9 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
+	if(!isValidEmail($mail)) {
+	    return '';
+	}
 	$tab = explode('@', $mail);
 	$tab2 = explode('.',$tab[1]);
 	$string_replace = '';
@@ -681,7 +897,9 @@ 
 function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
 {
     $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
+    if($tableMarkup) {
+        $text = '<table '.$tableoptions.'>' ;
+    }
     foreach($data as $key => $item){
         if(is_array($item)){
             $text.=array2tr($item,$troptions,$tdoptions);
@@ -692,7 +910,9 @@ 
             $text.= '</tr>' ;
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
+    if($tableMarkup) {
+        $text.= '</table>' ;
+    }
     return $text ;
 }
 
@@ -716,15 +936,25 @@ 
 {
     global $conf,$user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (! is_object($objsoc)) {
+        $valueforccc=$objsoc;
+    } else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) {
+        $valueforccc=$objsoc->code_fournisseur;
+    } else {
+        $valueforccc=$objsoc->code_client;
+    }
 
     $sharetable = $table;
-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+    if ($table == 'facture' || $table == 'invoice') {
+        $sharetable = 'invoicenumber';
+    }
+    // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') {
+        $date=dol_now();
+    }
+    // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -741,8 +971,7 @@ 
         $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -752,7 +981,9 @@ 
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
-    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -764,9 +995,12 @@ 
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -780,8 +1014,7 @@ 
         $masktype=$regType[1];
         $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$masktype='';
     	$masktype_value='';
@@ -791,13 +1024,14 @@ 
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+    	if (is_object($objuser)) {
+    	    $lastname = $objuser->lastname;
+    	}
 
     	$maskuser=$regType[1];
     	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
     	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$maskuser='';
     	$maskuser_value='';
@@ -844,8 +1078,12 @@ 
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
     $sqlwhere='';
@@ -853,14 +1091,21 @@ 
     $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    }
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
+            $maskraz=$yearoffsettype;
+    }
+    // For backward compatibility
+    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
+            $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    }
     //print "maskraz=".$maskraz;	// -1=no reset
 
     if ($maskraz > 0) {   // A reset is required
@@ -868,23 +1113,28 @@ 
             $maskraz = date('m', $date);
             $resetEveryMonth = true;
         }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define posy, posm and reg
-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
+        if ($maskraz > 1) {
+            // if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-
-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2;
         }
-        else // if reset is for a specific month in year, we need year
+        $posm=3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else {
+                return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            }
+
+            if (dol_strlen($reg[$posy]) < 2) {
+                return 'ErrorCantUseRazWithYearOnOneDigit';
+            }
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; } else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; } else {
+                return 'ErrorCantUseRazIfNoYearInMask';
+            }
         }
         // Define length
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
@@ -902,9 +1152,11 @@ 
         $monthcomp=$maskraz;
         $yearcomp=0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+            // $yearoffsettype is - or +
         {
         	$currentyear=date("Y", $date);
+        }
         	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
         	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
         	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
@@ -914,21 +1166,32 @@ 
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+        		    $yearoffset=1;
+        		}
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') {
+        	    $yearoffset=-1;
+        	}
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+        if ($yearlen == 4) {
+            $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
+        } elseif ($yearlen == 2) {
+            $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
+        } elseif ($yearlen == 1) {
+            $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        }
+        if ($monthcomp > 1 && empty($resetEveryMonth)) {
+            // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
             if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+        } elseif ($yearlen == 2) {
+                $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            }
 
             $sqlwhere.="(";
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
@@ -937,13 +1200,11 @@ 
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
-        }
-		else if ($resetEveryMonth)
+        } else if ($resetEveryMonth)
 		{
 			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
+		} else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -955,12 +1216,13 @@ 
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
+	} else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    if ($posnumstart < 0) {
+        return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    }
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
@@ -973,9 +1235,15 @@ 
     $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
     $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
     $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    if ($maskrefclient) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+    }
+    if ($masktype) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+    }
+    if ($maskuser) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    }
     foreach($maskperso as $key => $val)
     {
     	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
@@ -987,12 +1255,18 @@ 
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
 	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
-    if ($bentityon) // only if entity enable
+    if ($bentityon) {
+        // only if entity enable
     	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    } else if (! empty($forceentity)) {
+        	$sql.= " AND entity IN (".$forceentity.")";
+    }
+    if ($where) {
+        $sql.=$where;
+    }
+    if ($sqlwhere) {
+        $sql.=' AND '.$sqlwhere;
+    }
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
@@ -1001,21 +1275,26 @@ 
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
+    } else {
+        dol_print_error($db);
     }
-    else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) {
+        $counter=$maskoffset;
+    } else if (preg_match('/[^0-9]/i',$counter))
     {
     	$counter=0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+    } else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+        $counter=$maskoffset;
     }
-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
-    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
+    if ($mode == 'last') {
+        // We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
         $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+    }
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
@@ -1027,34 +1306,48 @@ 
         $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
         $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
         $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        if ($maskrefclient) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        }
+        if ($masktype) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        }
+        if ($maskuser) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        }
 
         $ref='';
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
+    	if ($bentityon) {
+    	    // only if entity enable
         	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	} else if (! empty($forceentity)) {
+                	$sql.= " AND entity IN (".$forceentity.")";
+        }
+        if ($where) {
+            $sql.=$where;
+        }
+        if ($sqlwhere) {
+            $sql.=' AND '.$sqlwhere;
+        }
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $ref = $obj->ref;
+            if ($obj) {
+                $ref = $obj->ref;
+            }
+        } else {
+            dol_print_error($db);
         }
-        else dol_print_error($db);
 
         $numFinal=$ref;
-    }
-    else if ($mode == 'next')
+    } else if ($mode == 'next')
     {
         $counter++;
 
@@ -1070,7 +1363,9 @@ 
 
             // Define $sqlstring
             $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+            if ($maskrefclient_posnumstart <= 0) {
+                return 'ErrorBadMask';
+            }
             $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
@@ -1092,12 +1387,20 @@ 
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            if ($bentityon) // only if entity enable
+            if ($bentityon) {
+                // only if entity enable
             	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            } else if (! empty($forceentity)) {
+                        	$sql.= " AND entity IN (".$forceentity.")";
+            }
+            if ($where) {
+                $maskrefclient_sql.=$where;
+            }
+            //use the same optional where as general mask
+            if ($sqlwhere) {
+                $maskrefclient_sql.=' AND '.$sqlwhere;
+            }
+            //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
@@ -1106,10 +1409,13 @@ 
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) {
+                $maskrefclient_counter=$maskrefclient_maskoffset;
+            }
 			$maskrefclient_counter++;
         }
 
@@ -1117,13 +1423,14 @@ 
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+		    // yearoffsettype is - or +, so we don't want current year
 		{
 	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+		}
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+		} else	// we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
@@ -1180,7 +1487,9 @@ 
 {
     $string = " ".$string;
      $ini = strpos($string,$start);
-     if ($ini == 0) return "";
+     if ($ini == 0) {
+         return "";
+     }
      $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
@@ -1204,8 +1513,7 @@ 
         $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -1214,7 +1522,9 @@ 
 
     $maskraz=-1;
     $maskoffset=0;
-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -1226,9 +1536,12 @@ 
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1250,21 +1563,35 @@ 
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $maskraz=preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $maskraz=preg_replace('/^@/','',$reg[3]);
+    }
     if ($maskraz >= 0)
     {
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        }
+        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazIfNoYearInMask';
+        }
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1274,7 +1601,9 @@ 
 
     // Check length
     $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    if (dol_strlen($value) != $len) {
+        $result=-1;
+    }
 
     // Define $maskLike
     /* seems not used
@@ -1355,29 +1684,37 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
+    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) {
+        // Dimanche
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) {
+        // du Lundi au Mercredi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) {
+        // du Vendredi au Samedi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
-    else // Jeudi
+    } else {
+        // Jeudi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    }
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) {
+        // Dimanche
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) {
+        // du Lundi au Mercredi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) {
+        // du Vendredi au Samedi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
     }
-    else // Jeudi
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
     }
@@ -1398,8 +1735,7 @@ 
         if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
         {
             $numeroSemaine = 53;
-        }
-        else
+        } else
         {
             $numeroSemaine = 1;
         }
@@ -1458,7 +1794,9 @@ 
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
     // Verification parametres
-    if (count($tab) < 1) return -1;
+    if (count($tab) < 1) {
+        return -1;
+    }
 
     $db->begin();
 
@@ -1470,7 +1808,9 @@ 
     $i=0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
+        if ($i > 0) {
+            $sql.=',';
+        }
         $sql.="'".$db->escape($key)."'";
         $i++;
     }
@@ -1504,8 +1844,7 @@ 
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
+        } else
         {
             unset($user->conf->$key);
         }
@@ -1528,8 +1867,7 @@ 
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else
+    } else
     {
     	$string = vatrate($reduction,true);
     }
@@ -1616,9 +1954,11 @@ 
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (! empty($obj->description)) {
+                // A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            }
 
                 $const=$obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
@@ -1637,7 +1977,9 @@ 
                     {
 			// all type of template is allowed
 			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        if (count($tmpfiles)) {
+                            $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
                     }
                 }
 
@@ -1648,40 +1990,41 @@ 
                         $max=($maxfilenamelength?$maxfilenamelength:28);
                         $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
                     }
-                }
-                else
+                } else
                 {
                     $liste[0]=$obj->label.': '.$langs->trans("None");
                 }
-            }
-            else
+            } else
             {
-                if ($type == 'member' && $obj->lib == 'standard')   // Special case, if member template, we add variant per format
+                if ($type == 'member' && $obj->lib == 'standard') {
+                    // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
+                }
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
                     foreach($_Avery_Labels as $key => $val)
                     {
                         $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
                     }
-                }
-                else    // Common usage
+                } else    // Common usage
                 {
                     $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
                 }
             }
             $i++;
         }
-    }
-    else
+    } else
     {
         dol_print_error($db);
         return -1;
     }
 
-    if ($found) return $liste;
-    else return 0;
-}
+    if ($found) {
+        return $liste;
+    } else {
+        return 0;
+    }
+    }
 
 /**
  * This function evaluates a string that should be a valid IPv4
@@ -1696,10 +2039,14 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+		    return 2;
+		}
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+		    return 0;
+		}
 
 		return 1;
 	}
@@ -1752,8 +2099,7 @@ 
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else
+    } else
     {
         $params=array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
@@ -1860,14 +2206,12 @@ 
 		$classname='FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
+	} elseif ($objecttype == 'order_supplier')   {
 		$classfile = 'fournisseur.commande';
 		$classname='CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
+	} elseif ($objecttype == 'stock')   {
 		$classpath = 'product/stock/class';
 		$classfile='entrepot';
 		$classname='Entrepot';
@@ -1887,8 +2231,9 @@ 
 					$ret=$langs->trans('Deleted');
 				}
 				unset($object);
+			} else {
+			    dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1920,11 +2265,12 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			if ($obj->parent_id > 0) {
+			    $listofparentid[$obj->rowid]=$obj->parent_id;
+			}
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -1959,9 +2305,11 @@ 
 			while ($cursor > 0)
 			{
 				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+				if ($arrayidparsed[$listofparentid[$cursor]]) {
+				    // We detect a loop. A record with a parent that was already into child
 				{
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+				}
 					unset($arrayidparsed);
 					$listofidtoclean[$cursor]=$id;
 					break;
@@ -1969,7 +2317,9 @@ 
 				$cursor=$listofparentid[$cursor];
 			}
 
-			if (count($listofidtoclean)) break;
+			if (count($listofidtoclean)) {
+			    break;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
@@ -2116,9 +2466,15 @@ 
         $classfile='fournisseur.facture';
     }
 
-    if (!isset($classfile)) $classfile = strtolower($subelement);
-    if (!isset($classname)) $classname = ucfirst($subelement);
-    if (!isset($classpath)) $classpath = $module.'/class';
+    if (!isset($classfile)) {
+        $classfile = strtolower($subelement);
+    }
+    if (!isset($classname)) {
+        $classname = ucfirst($subelement);
+    }
+    if (!isset($classpath)) {
+        $classpath = $module.'/class';
+    }
 
     $element_properties = array(
         'module' => $module,
@@ -2172,8 +2528,12 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
+	if (! is_array($arraycolor)) {
+	    return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+	    return $colorifnotfound;
+	}
 	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
@@ -2189,12 +2549,17 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	if (is_array($stringcolor)) {
+	    return $stringcolor;
+	}
+	// If already into correct output format, we return as is
 	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
 	if (! $tmp)
 	{
 		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
+		if (count($tmp) < 3) {
+		    return $colorifnotfound;
+		}
 		return $tmp;
 	}
 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
@@ -2240,69 +2605,51 @@ 
 function getModuleDirForApiClass($module)
 {
     $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    if ($moduledirforclass != 'api') {
+        $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    }
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
     	$moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
     }