Dolibarr / dolibarr

htdocs/core/lib/functions.lib.php

Braces +1732 added lines, -901 removed lines

@@ -74,7 +74,9 @@ 
 		if ($found) return $result;
 	}*/
 
-	if (isset($class::$member)) return $class::$member;
+	if (isset($class::$member)) {
+		return $class::$member;
+	}
 	dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
 	return null;
 }
@@ -122,19 +124,26 @@ 
 	global $conf, $mc;
 
 	// For backward compatibilty
-	if ($element == 'actioncomm') $element='agenda';
-	if ($element == 'fichinter')  $element='intervention';
-	if ($element == 'categorie')  $element='category';
+	if ($element == 'actioncomm') {
+		$element='agenda';
+	}
+	if ($element == 'fichinter') {
+		$element='intervention';
+	}
+	if ($element == 'categorie') {
+		$element='category';
+	}
 
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $forceentity);
-	}
-	else
+	} else
 	{
 		$out='';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-		if (in_array($element, $addzero)) $out.= '0,';
+		if (in_array($element, $addzero)) {
+			$out.= '0,';
+		}
 		$out.= $conf->entity;
 		return $out;
 	}
@@ -194,20 +203,12 @@ 
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent))			{ $os='linux'; }
-	elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; }
-	elseif (preg_match('/windows/i', $user_agent))		{ $os='windows'; }
+	if (preg_match('/linux/i', $user_agent))			{ $os='linux'; } elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; } elseif (preg_match('/windows/i', $user_agent))		{ $os='windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))      { $name='firefox';   $version=$reg[2]; }
-	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg))     { $name='edge';      $version=$reg[2]; }
-	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg))   { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg))                   { $name='chrome'; }
-	elseif (preg_match('/iceweasel/i', $user_agent))                      { $name='iceweasel'; }
-	elseif (preg_match('/epiphany/i', $user_agent))                       { $name='epiphany';  }
-	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg))   { $name='safari';    $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; }
-	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))      { $name='firefox';   $version=$reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg))     { $name='edge';      $version=$reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg))   { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg))                   { $name='chrome'; } elseif (preg_match('/iceweasel/i', $user_agent))                      { $name='iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent))                       { $name='epiphany';  } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg))   { $name='safari';    $version=$reg[2]; }	// Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg))    { $name='opera';     $version=$reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg))  { $name='ie'; $version=end($reg); }    // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name='lynxlinks'; $version=$reg[4]; }
 
@@ -280,7 +281,9 @@ 
 {
 	global $mysoc,$user,$conf;
 
-	if (empty($paramname)) return 'BadFirstParameterForGETPOST';
+	if (empty($paramname)) {
+		return 'BadFirstParameterForGETPOST';
+	}
 	if (empty($check))
 	{
 		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
@@ -288,19 +291,28 @@ 
 		//var_dump(debug_backtrace()[0]);
 	}
 
-	if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
-	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
-	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
-	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
-	elseif ($method==4) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
-	else return 'BadThirdParameterForGETPOST';
+	if (empty($method)) {
+		$out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
+	} elseif ($method==1) {
+		$out = isset($_GET[$paramname])?$_GET[$paramname]:'';
+	} elseif ($method==2) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:'';
+	} elseif ($method==3) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
+	} elseif ($method==4) {
+		$out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:(isset($_COOKIE[$paramname])?$_COOKIE[$paramname]:''));
+	} else {
+		return 'BadThirdParameterForGETPOST';
+	}
 
 	if (empty($method) || $method == 3 || $method == 4)
 	{
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		//var_dump($relativepathstring);
@@ -308,9 +320,11 @@ 
 
 		// Code for search criteria persistence.
 		// Retrieve values if restore_lastsearch_values is set and there is saved values
-		if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring]))        // Keep $_GET here
+		if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring])) {
+			// Keep $_GET here
 		{
 			$tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
+		}
 			if (is_array($tmp))
 			{
 				foreach($tmp as $key => $val)
@@ -324,12 +338,14 @@ 
 			}
 		}
 		// Else, retreive default values if we are not doing a sort
-		elseif (! isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+		elseif (! isset($_GET['sortfield'])) {
+			// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 			{
 				// Search default value from $object->field
 				global $object;
+		}
 				if (is_object($object) && isset($object->fields[$paramname]['default']))
 				{
 					$out = $object->fields[$paramname]['default'];
@@ -340,13 +356,15 @@ 
 				if (! empty($_GET['action']) && $_GET['action'] == 'create' && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (! empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						if (isset($user->default_values[$relativepathstring]['createform']))
 						{
 							foreach($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
 							{
 								$qualified = 0;
+					}
 								if ($defkey != '_noquery_')
 								{
 									$tmpqueryarraytohave=explode('&', $defkey);
@@ -354,12 +372,17 @@ 
 									$foundintru=0;
 									foreach($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru=1;
+										}
+									}
+									if (! $foundintru) {
+										$qualified=1;
 									}
-									if (! $foundintru) $qualified=1;
 									//var_dump($defkey.'-'.$qualified);
+								} else {
+									$qualified = 1;
 								}
-								else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -378,7 +401,8 @@ 
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				{
-					if (! empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
+					if (! empty($user->default_values)) {
+						// $user->default_values defined from menu 'Setup - Default values'
 					{
 						//var_dump($user->default_values[$relativepathstring]);
 						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
@@ -388,6 +412,7 @@ 
 								foreach($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
 								{
 									$qualified = 0;
+					}
 									if ($defkey != '_noquery_')
 									{
 										$tmpqueryarraytohave=explode('&', $defkey);
@@ -395,19 +420,26 @@ 
 										$foundintru=0;
 										foreach($tmpqueryarraytohave as $tmpquerytohave)
 										{
-											if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+											if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+												$foundintru=1;
+											}
+										}
+										if (! $foundintru) {
+											$qualified=1;
 										}
-										if (! $foundintru) $qualified=1;
 										//var_dump($defkey.'-'.$qualified);
+									} else {
+										$qualified = 1;
 									}
-									else $qualified = 1;
 
 									if ($qualified)
 									{
 										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 										foreach($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
 										{
-											if ($out) $out.=', ';
+											if ($out) {
+												$out.=', ';
+											}
 											if ($paramname == 'sortfield')
 											{
 												$out.=dol_string_nospecial($key, '', $forbidden_chars_to_replace);
@@ -421,8 +453,7 @@ 
 									}
 								}
 							}
-						}
-						elseif (isset($user->default_values[$relativepathstring]['filters']))
+						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
 							foreach($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)
 							{
@@ -434,12 +465,17 @@ 
 									$foundintru=0;
 									foreach($tmpqueryarraytohave as $tmpquerytohave)
 									{
-										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru=1;
+										if (! in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru=1;
+										}
+									}
+									if (! $foundintru) {
+										$qualified=1;
 									}
-									if (! $foundintru) $qualified=1;
 									//var_dump($defkey.'-'.$qualified);
+								} else {
+									$qualified = 1;
 								}
-								else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -451,8 +487,7 @@ 
 											$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
-									}
-									else
+									} else
 									{
 										$forbidden_chars_to_replace=array(" ","'","/","\\",":","*","?","\"","<",">","|","[","]",";","=");  // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
@@ -473,36 +508,29 @@ 
 	if (! is_array($out) && empty($_POST[$paramname]) && empty($noreplace))
 	{
 		$maxloop=20; $loopnb=0;    // Protection against infinite loop
-		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
-		{
-				$loopnb++; $newout = '';
-
-				if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-				elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  }
-				elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-				elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-				elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-				elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-				elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-				elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
+		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {
+			// Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
+		{
+				$loopnb++;
+		}
+		$newout = '';
+
+				if ($reg[1] == 'DAY')                { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; } elseif ($reg[1] == 'MONTH')          { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon'];  } elseif ($reg[1] == 'YEAR')           { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; } elseif ($reg[1] == 'PREVIOUS_DAY')   { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'PREVIOUS_YEAR')  { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); } elseif ($reg[1] == 'NEXT_DAY')       { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; } elseif ($reg[1] == 'NEXT_MONTH')     { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['month']; } elseif ($reg[1] == 'NEXT_YEAR')      { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); } elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
 				{
 					$newout = $mysoc->country_id;
-				}
-				elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
+				} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
 				{
 					$newout = $user->id;
-				}
-				elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
+				} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
 				{
 					$newout = $user->fk_user;
-				}
-				elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
+				} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
 				{
 					$newout = $conf->entity;
+				} else {
+					$newout = '';
 				}
-				else $newout = '';     // Key not found, we replace with empty string
+				// Key not found, we replace with empty string
 				//var_dump('__'.$reg[1].'__ -> '.$newout);
 				$out = preg_replace('/__'.preg_quote($reg[1],'/').'__/', $newout, $out);
 		}
@@ -517,7 +545,9 @@ 
 			if (! is_numeric($out)) { $out=''; }
 			break;
 		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i',$out)) $out='';
+			if (preg_match('/[^0-9,-]+/i',$out)) {
+				$out='';
+			}
 			break;
 		case 'alpha':
 			if (! is_array($out))
@@ -525,8 +555,11 @@ 
 				$out=trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
+				if (preg_match('/"/',$out)) {
+					$out='';
+				} else if (preg_match('/\.\.\//',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'san_alpha':
@@ -536,18 +569,24 @@ 
 			if (! is_array($out))
 			{
 				$out=trim($out);
-				if (preg_match('/[^a-z]+/i',$out)) $out='';
+				if (preg_match('/[^a-z]+/i',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'aZ09':
 			if (! is_array($out))
 			{
 				$out=trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) {
+					$out='';
+				}
 			}
 			break;
 		case 'array':
-			if (! is_array($out) || empty($out)) $out=array();
+			if (! is_array($out) || empty($out)) {
+				$out=array();
+			}
 			break;
 		case 'nohtml':
 			$out=dol_string_nohtmltag($out, 0);
@@ -558,13 +597,18 @@ 
 				$out=trim($out);
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				if (preg_match('/"/',$out)) $out='';
-				else if (preg_match('/\.\.\//',$out)) $out='';
+				if (preg_match('/"/',$out)) {
+					$out='';
+				} else if (preg_match('/\.\.\//',$out)) {
+					$out='';
+				}
 				$out=dol_string_nohtmltag($out);
 			}
 			break;
 		case 'custom':
-			if (empty($filter)) return 'BadFourthParameterForGETPOST';
+			if (empty($filter)) {
+				return 'BadFourthParameterForGETPOST';
+			}
 			$out=filter_var($out, $filter, $options);
 			break;
 	}
@@ -612,8 +656,11 @@ 
 		// If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
 		if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
 		{
-			if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-			else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+			if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+				return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+			} else if (isset($_SERVER["SERVER_NAME"])) {
+				return $_SERVER["SERVER_NAME"];
+			}
 		}
 
 		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
@@ -621,8 +668,9 @@ 
 			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 			// Use this for a "readable" cookie name
 			//return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+		} else {
+			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 		}
-		else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 	}
 }
 
@@ -671,41 +719,57 @@ 
 
 	$path=preg_replace('/^\//','',$path);
 
-	if (empty($type))	// For a filesystem path
+	if (empty($type)) {
+		// For a filesystem path
 	{
-		$res = DOL_DOCUMENT_ROOT.'/'.$path;		// Standard default path
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+		$res = DOL_DOCUMENT_ROOT.'/'.$path;
+	}
+	// Standard default path
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {
+			// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main') continue;
+		}
 			if (file_exists($dirroot.'/'.$path))
 			{
 				$res=$dirroot.'/'.$path;
 				return $res;
 			}
 		}
-		if ($returnemptyifnotfound)								// Not found into alternate dir
+		if ($returnemptyifnotfound) {
+			// Not found into alternate dir
 		{
 			if ($returnemptyifnotfound == 1 || ! file_exists($res)) return '';
 		}
-	}
-	else				// For an url path
+		}
+	} else				// For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
 		// works only for some web server and some setup. This is bugged when
 		// using proxy, rewriting, virtual path, etc...
 		$res='';
-		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path;			// Standard value
-		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path;		// Standard value
-		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
+		if ($type == 1) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 2) {
+			$res = DOL_MAIN_URL_ROOT.'/'.$path;
+		}
+		// Standard value
+		if ($type == 3) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
 
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {
+			// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 		{
 			if ($key == 'main')
 			{
 				if ($type == 3)
 				{
 					global $dolibarr_main_url_root;
+		}
 
 					// Define $urlwithroot
 					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -767,8 +831,7 @@ 
 	if (empty($native))
 	{
 		$myclone=unserialize(serialize($object));
-	}
-	else
+	} else
 	{
 		$myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
@@ -788,10 +851,15 @@ 
 function dol_size($size,$type='')
 {
 	global $conf;
-	if (empty($conf->dol_optimize_smallscreen)) return $size;
-	if ($type == 'width' && $size > 250) return 250;
-	else return 10;
-}
+	if (empty($conf->dol_optimize_smallscreen)) {
+		return $size;
+	}
+	if ($type == 'width' && $size > 250) {
+		return 250;
+	} else {
+		return 10;
+	}
+	}
 
 
 /**
@@ -857,8 +925,7 @@ 
 		);
 		$string=strtr($string, $replacements);
 		return rawurldecode($string);
-	}
-	else
+	} else
 	{
 		// See http://www.ascii-code.com/
 		$string = strtr(
@@ -896,7 +963,9 @@ 
 {
 	$forbidden_chars_to_replace=array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove=array();
-	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace=$badcharstoreplace;
+	if (is_array($badcharstoreplace)) {
+		$forbidden_chars_to_replace=$badcharstoreplace;
+	}
 	//$forbidden_chars_to_remove=array("(",")");
 
 	return str_replace($forbidden_chars_to_replace,$newstr,str_replace($forbidden_chars_to_remove,"",$str));
@@ -928,10 +997,9 @@ 
 	$substitjs=array("&#039;"=>"\\'","\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"]='\\n'; $substitjs['\\']='\\\\'; }
-	if (empty($mode)) { $substitjs["'"]="\\'"; $substitjs['"']="\\'"; }
-	else if ($mode == 1) $substitjs["'"]="\\'";
-	else if ($mode == 2) { $substitjs['"']='\\"'; }
-	else if ($mode == 3) { $substitjs["'"]="\\'"; $substitjs['"']="\\\""; }
+	if (empty($mode)) { $substitjs["'"]="\\'"; $substitjs['"']="\\'"; } else if ($mode == 1) {
+		$substitjs["'"]="\\'";
+	} else if ($mode == 2) { $substitjs['"']='\\"'; } else if ($mode == 3) { $substitjs["'"]="\\'"; $substitjs['"']="\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -949,8 +1017,12 @@ 
 {
 	// escape quotes and backslashes, newlines, etc.
 	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
-	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
-	if (! $keepn) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
+	if (! $keepb) {
+		$tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
+	}
+	if (! $keepn) {
+		$tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
+	}
 	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html tags
 }
 
@@ -1003,7 +1075,9 @@ 
 	global $conf, $user;
 
 	// If syslog module enabled
-	if (empty($conf->syslog->enabled)) return;
+	if (empty($conf->syslog->enabled)) {
+		return;
+	}
 
 	if (! empty($message))
 	{
@@ -1013,13 +1087,17 @@ 
 		{
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) return;
+		if ($level > $conf->global->SYSLOG_LEVEL) {
+			return;
+		}
 
 		// If adding log inside HTML page is required
-		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
+		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML))) {
+			// MAIN_LOGTOHTML kept for backward compatibility
 		{
 			$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
 		}
+		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
 		// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
@@ -1039,19 +1117,31 @@ 
 		);
 
 		// This is when server run behind a reverse proxy
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"])?'':'->'.$_SERVER['REMOTE_ADDR']);
+		}
 		// This is when server run normally on a server
-		else if (! empty($_SERVER["REMOTE_ADDR"])) $data['ip'] = $_SERVER['REMOTE_ADDR'];
+		else if (! empty($_SERVER["REMOTE_ADDR"])) {
+			$data['ip'] = $_SERVER['REMOTE_ADDR'];
+		}
 		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-		else if (! empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
+		else if (! empty($_SERVER['SERVER_ADDR'])) {
+			$data['ip'] = $_SERVER['SERVER_ADDR'];
+		}
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-		else if (! empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME'])?'':'@'.$_SERVER['USERNAME']);
+		else if (! empty($_SERVER['COMPUTERNAME'])) {
+			$data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME'])?'':'@'.$_SERVER['USERNAME']);
+		}
 		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-		else if (! empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		else if (! empty($_SERVER['LOGNAME'])) {
+			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		}
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance)
 		{
-			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;
+			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+				continue;
+			}
 			$loghandlerinstance->export($data,$suffixinfilename);
 		}
 		unset($data);
@@ -1102,16 +1192,23 @@ 
 
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
-	if ($morehtmlright) $out.='<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';	// Output right area first so when space is missing, text is in front of tabs and not under.
+	if ($morehtmlright) {
+		$out.='<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>';
+	}
+	// Output right area first so when space is missing, text is in front of tabs and not under.
 
 	// Show title
 	$showtitle=1;
-	if (! empty($conf->dol_optimize_smallscreen)) $showtitle=0;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$showtitle=0;
+	}
 	if (! empty($title) && $showtitle)
 	{
 		$limittitle=30;
 		$out.='<a class="tabTitle">';
-		if ($picto) $out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
+		if ($picto) {
+			$out.=img_picto($title,($pictoisfullpath?'':'object_').$picto,'',$pictoisfullpath).' ';
+		}
 		$out.='<span class="tabTitleText">'.dol_trunc($title,$limittitle).'</span>';
 		$out.='</a>';
 	}
@@ -1121,10 +1218,14 @@ 
 	if (is_array($links) && ! empty($links))
 	{
 		$keys=array_keys($links);
-		if (count($keys)) $maxkey=max($keys);
+		if (count($keys)) {
+			$maxkey=max($keys);
+		}
 	}
 
-	if (! empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD=2;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$conf->global->MAIN_MAXTABS_IN_CARD=2;
+	}
 
 	// Show tabs
 	$bactive=false;
@@ -1138,7 +1239,9 @@ 
 		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
 		{
 			// If active tab is already present
-			if ($i >= $limittoshow) $limittoshow--;
+			if ($i >= $limittoshow) {
+				$limittoshow--;
+			}
 		}
 	}
 
@@ -1148,8 +1251,7 @@ 
 		{
 			$isactive=true;
 			$bactive=true;
-		}
-		else
+		} else
 		{
 			$isactive=false;
 		}
@@ -1162,13 +1264,11 @@ 
 				if (!empty($links[$i][0]))
 				{
 					$out.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				}
-				else
+				} else
 				{
 					$out.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			}
-			else if (! empty($links[$i][1]))
+			} else if (! empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
@@ -1176,8 +1276,7 @@ 
 					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabactive tab inline-block" href="'.$links[$i][0].'">';
 					$out.=$links[$i][1];
 					$out.='</a>'."\n";
-				}
-				else
+				} else
 				{
 					$out.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabunactive tab inline-block" href="'.$links[$i][0].'">';
 					$out.=$links[$i][1];
@@ -1185,8 +1284,7 @@ 
 				}
 			}
 			$out.='</div>';
-		}
-		else
+		} else
 		{
 			// The popup with the other tabs
 			if (! $popuptab)
@@ -1197,13 +1295,13 @@ 
 			$outmore.='<div class="popuptab wordwrap" style="display:inherit;">';
 			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
-				if (!empty($links[$i][0]))
-					$outmore.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else
-					$outmore.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				if (!empty($links[$i][0])) {
+									$outmore.='<a class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				} else {
+									$outmore.='<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				}
 
-			}
-			else if (! empty($links[$i][1]))
+			} else if (! empty($links[$i][1]))
 			{
 				$outmore.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="wordwrap inline-block" href="'.$links[$i][0].'">';
 				$outmore.=preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]);	// Replace x/y with x / y to allow wrap on long composed texts.
@@ -1215,7 +1313,9 @@ 
 		}
 		$displaytab=$i;
 	}
-	if ($popuptab) $outmore.='</div>';
+	if ($popuptab) {
+		$outmore.='</div>';
+	}
 
 	if ($displaytab > $limittoshow)
 	{
@@ -1239,7 +1339,9 @@ 
 
 	$out.="</div>\n";
 
-	if (! $notab || $notab == -1) $out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
+	if (! $notab || $notab == -1) {
+		$out.="\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";
+	}
 
 	$parameters=array('tabname' => $active, 'out' => $out);
 	$reshook=$hookmanager->executeHooks('printTabsHead',$parameters);	// This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -1270,9 +1372,12 @@ 
  */
 function dol_get_fiche_end($notab=0)
 {
-	if (! $notab || $notab == -1) return "\n</div>\n";
-	else return '';
-}
+	if (! $notab || $notab == -1) {
+		return "\n</div>\n";
+	} else {
+		return '';
+	}
+	}
 
 /**
  *  Show tab footer of a card.
@@ -1302,26 +1407,56 @@ 
 	$maxvisiblephotos=1;
 	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+		$showbarcode=0;
+	}
 	$modulepart='unknown';
 
-	if ($object->element == 'societe')         $modulepart='societe';
-	if ($object->element == 'contact')         $modulepart='contact';
-	if ($object->element == 'member')          $modulepart='memberphoto';
-	if ($object->element == 'user')            $modulepart='userphoto';
-	if ($object->element == 'product')         $modulepart='product';
+	if ($object->element == 'societe') {
+		$modulepart='societe';
+	}
+	if ($object->element == 'contact') {
+		$modulepart='contact';
+	}
+	if ($object->element == 'member') {
+		$modulepart='memberphoto';
+	}
+	if ($object->element == 'user') {
+		$modulepart='userphoto';
+	}
+	if ($object->element == 'product') {
+		$modulepart='product';
+	}
 
 	if (class_exists("Imagick"))
 	{
-		if ($object->element == 'propal')            $modulepart='propal';
-		if ($object->element == 'commande')          $modulepart='commande';
-		if ($object->element == 'facture')           $modulepart='facture';
-		if ($object->element == 'fichinter')         $modulepart='ficheinter';
-		if ($object->element == 'contrat')           $modulepart='contract';
-		if ($object->element == 'supplier_proposal') $modulepart='supplier_proposal';
-		if ($object->element == 'order_supplier')    $modulepart='supplier_order';
-		if ($object->element == 'invoice_supplier')  $modulepart='supplier_invoice';
-		if ($object->element == 'expensereport')     $modulepart='expensereport';
+		if ($object->element == 'propal') {
+			$modulepart='propal';
+		}
+		if ($object->element == 'commande') {
+			$modulepart='commande';
+		}
+		if ($object->element == 'facture') {
+			$modulepart='facture';
+		}
+		if ($object->element == 'fichinter') {
+			$modulepart='ficheinter';
+		}
+		if ($object->element == 'contrat') {
+			$modulepart='contract';
+		}
+		if ($object->element == 'supplier_proposal') {
+			$modulepart='supplier_proposal';
+		}
+		if ($object->element == 'order_supplier') {
+			$modulepart='supplier_order';
+		}
+		if ($object->element == 'invoice_supplier') {
+			$modulepart='supplier_invoice';
+		}
+		if ($object->element == 'expensereport') {
+			$modulepart='expensereport';
+		}
 	}
 
 	if ($object->element == 'product')
@@ -1329,9 +1464,12 @@ 
 		$width=80; $cssclass='photoref';
 		$showimage=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
 		$maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
-		if ($conf->browser->phone) $maxvisiblephotos=1;
-		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
-		else
+		if ($conf->browser->phone) {
+			$maxvisiblephotos=1;
+		}
+		if ($showimage) {
+			$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'</div>';
+		} else
 		{
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
@@ -1342,8 +1480,7 @@ 
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="No photo" border="0"'.($width?' width="'.$width.'"':'').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			//}
 		}
-	}
-	else
+	} else
 	{
 		if ($showimage)
 		{
@@ -1358,8 +1495,7 @@ 
 					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
 					{
 						$subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref;		// the objectref dir is not include into get_exdir when used with level=2, so we add it here
-					}
-					else
+					} else
 					{
 						$subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart);
 					}
@@ -1382,15 +1518,21 @@ 
 						  && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))
 						   )
 						{
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {
+								// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
 							{
 								$ret = dol_convert_file($file, 'png', $fileimage);
-								if ($ret < 0) $error++;
+							}
+								if ($ret < 0) {
+									$error++;
+								}
 							}
 						}
 
 						$heightforphotref=70;
-						if (! empty($conf->dol_optimize_smallscreen)) $heightforphotref=60;
+						if (! empty($conf->dol_optimize_smallscreen)) {
+							$heightforphotref=60;
+						}
 						// Si fichier png PDF d'1 page trouve
 						if (file_exists($fileimage))
 						{
@@ -1407,8 +1549,7 @@ 
 							$phototoshow.= '</div></div>';
 						}
 					}
-				}
-				else if (! $phototoshow)
+				} else if (! $phototoshow)
 				{
 					$phototoshow = $form->showphoto($modulepart,$object,0,0,0,'photoref','small',1,0,$maxvisiblephotos);
 				}
@@ -1421,20 +1562,24 @@ 
 				}
 			}
 
-			if (! $phototoshow)      // Show No photo link (picto of pbject)
+			if (! $phototoshow) {
+				// Show No photo link (picto of pbject)
 			{
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">';
+			}
 				if ($object->element == 'action')
 				{
 					$width=80;
 					$cssclass='photorefcenter';
 					$nophoto=img_picto('', 'title_agenda', '', false, 1);
-				}
-				else
+				} else
 				{
 					$width=14; $cssclass='photorefcenter';
 					$picto = $object->picto;
-					if ($object->element == 'project' && ! $object->public) $picto = 'project'; // instead of projectpub
+					if ($object->element == 'project' && ! $object->public) {
+						$picto = 'project';
+					}
+					// instead of projectpub
 					$nophoto=img_picto('', 'object_'.$picto, '', false, 1);
 				}
 				$morehtmlleft.='<!-- No photo to show -->';
@@ -1445,19 +1590,19 @@ 
 		}
 	}
 
-	if ($showbarcode) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	if ($showbarcode) {
+		$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	}
 
 	if ($object->element == 'societe')
 	{
 		if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
 		   	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-		}
-		else {
+		} else {
 			$morehtmlstatus.=$object->getLibStatut(6);
 		}
-	}
-	elseif ($object->element == 'product')
+	} elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1472,26 +1617,32 @@ 
 		} else {
 			$morehtmlstatus.='<span class="statusrefbuy">'.$object->getLibStatut(5,1).'</span>';
 		}
-	}
-	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt=$object->getLibStatut(6, $object->totalpaye);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') {
+			$tmptxt=$object->getLibStatut(5, $object->totalpaye);
+		}
 		$morehtmlstatus.=$tmptxt;
-	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract')
+	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
-		if ($object->statut == 0) $morehtmlstatus.=$object->getLibStatut(5);
-		else $morehtmlstatus.=$object->getLibStatut(4);
-	}
-	elseif ($object->element == 'facturerec')
+		if ($object->statut == 0) {
+			$morehtmlstatus.=$object->getLibStatut(5);
+		} else {
+			$morehtmlstatus.=$object->getLibStatut(4);
+		}
+	} elseif ($object->element == 'facturerec')
 	{
-		if ($object->frequency == 0) $morehtmlstatus.=$object->getLibStatut(2);
-		else $morehtmlstatus.=$object->getLibStatut(5);
-	}
-	else { // Generic case
+		if ($object->frequency == 0) {
+			$morehtmlstatus.=$object->getLibStatut(2);
+		} else {
+			$morehtmlstatus.=$object->getLibStatut(5);
+		}
+	} else { // Generic case
 		$tmptxt=$object->getLibStatut(6);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') {
+			$tmptxt=$object->getLibStatut(5);
+		}
 		$morehtmlstatus.=$tmptxt;
 	}
 
@@ -1507,12 +1658,16 @@ 
 	}
 
 	// Add alias for thirdparty
-	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
+	if (! empty($object->name_alias)) {
+		$morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
+	}
 
 	// Add label
 	if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
 	{
-		if (! empty($object->label)) $morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		if (! empty($object->label)) {
+			$morehtmlref.='<div class="refidno">'.$object->label.'</div>';
+		}
 	}
 
 	if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files')
@@ -1546,11 +1701,19 @@ 
 {
 	global $conf, $langs;
 	$ret='';
-	if ($fieldrequired) $ret.='<span class="fieldrequired">';
-	if (($conf->dol_use_jmobile != 4)) $ret.='<label for="'.$fieldkey.'">';
+	if ($fieldrequired) {
+		$ret.='<span class="fieldrequired">';
+	}
+	if (($conf->dol_use_jmobile != 4)) {
+		$ret.='<label for="'.$fieldkey.'">';
+	}
 	$ret.=$langs->trans($langkey);
-	if (($conf->dol_use_jmobile != 4)) $ret.='</label>';
-	if ($fieldrequired) $ret.='</span>';
+	if (($conf->dol_use_jmobile != 4)) {
+		$ret.='</label>';
+	}
+	if ($fieldrequired) {
+		$ret.='</span>';
+	}
 	return $ret;
 }
 
@@ -1565,7 +1728,9 @@ 
 {
 	global $bc;
 	$ret=' '.$bc[$var];
-	if ($moreclass) $ret=preg_replace('/class=\"/','class="'.$moreclass.' ',$ret);
+	if ($moreclass) {
+		$ret=preg_replace('/class=\"/','class="'.$moreclass.' ',$ret);
+	}
 	return $ret;
 }
 
@@ -1592,40 +1757,48 @@ 
 		$ret .= $object->address;
 	}
 	// Zip/Town/State
-	if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country
+	if (in_array($object->country_code,array('AU', 'CA', 'US')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {
+		// US: title firstname name \n address lines \n town, state, zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
+	}
 		if ($object->state)
 		{
 			$ret.=($ret?", ":'').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret?", ":'').$object->zip;
-	}
-	else if (in_array($object->country_code,array('GB','UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+		if ($object->zip) {
+			$ret .= ($ret?", ":'').$object->zip;
+		}
+	} else if (in_array($object->country_code,array('GB','UK'))) {
+		// UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->town;
+	}
 		if ($object->state)
 		{
 			$ret.=($ret?", ":'').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? $sep : '' ).$object->zip;
-	}
-	else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+		if ($object->zip) {
+			$ret .= ($ret ? $sep : '' ).$object->zip;
+		}
+	} else if (in_array($object->country_code,array('ES','TR'))) {
+		// ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
+	}
 		$ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
 		if ($object->state)
 		{
 			$ret.="\n".$object->state;
 		}
-	}
-	else if (in_array($object->country_code,array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} else if (in_array($object->country_code,array('IT'))) {
+		// IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
                 $ret .= ($ret ? $sep : '' ).$object->zip;
+	}
                 $ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
                 $ret .= ($object->departement_id?(' ('.($object->departement_id).')'):'');
-	}
-	else                                        		// Other: title firstname name \n address lines \n zip town \n country
+	} else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= $object->zip ? (($ret ? $sep : '' ).$object->zip) : '';
 		$ret .= ($object->town?(($object->zip?' ':($ret ? $sep : '' )).$object->town):'');
@@ -1634,8 +1807,12 @@ 
 			$ret.=($ret?", ":'').$object->state;
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
+	if ($withcountry) {
+		$ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	}
 
 	return $ret;
 }
@@ -1654,9 +1831,10 @@ 
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+	} else {
+		return 'Error date into a not supported range';
+	}
 	}
-	else return 'Error date into a not supported range';
-}
 
 /**
  *	Output date in a string format according to outputlangs (or langs if not defined).
@@ -1697,8 +1875,7 @@ 
 				$offsettzstring=@date_default_timezone_get();		// Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz=0;
 				$offsetdst=0;
-			}
-			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
 				$to_gmt=true;
 				$offsettzstring=(empty($_SESSION['dol_tz_string'])?'UTC':$_SESSION['dol_tz_string']);	// Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -1707,31 +1884,57 @@ 
 			}
 		}
 	}
-	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if (! $format) $format='daytextshort';
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
+	if (! $format) {
+		$format='daytextshort';
+	}
 	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','dayhour')))?1:0;
 	$formatwithoutreduce = preg_replace('/reduceformat/','',$format);
 	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat=1; }  // so format 'dayreduceformat' is processed like day
 
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 	// TODO Add format daysmallyear and dayhoursmallyear
-	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
-	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
-	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
-	else if ($format == 'daytext')			 $format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
-	else if ($format == 'daytextshort')	$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
-	else if ($format == 'dayhour')			 $format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
-	else if ($format == 'dayhoursec')		 $format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
-	else if ($format == 'dayhourtext')		 $format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
-	else if ($format == 'dayhourtextshort') $format=($outputlangs->trans("FormatDateHourTextShort")!="FormatDateHourTextShort"?$outputlangs->trans("FormatDateHourTextShort"):$conf->format_date_hour_text_short);
+	if ($format == 'day') {
+		$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
+	} else if ($format == 'hour') {
+		$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
+	} else if ($format == 'hourduration') {
+		$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
+	} else if ($format == 'daytext') {
+		$format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
+	} else if ($format == 'daytextshort') {
+		$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
+	} else if ($format == 'dayhour') {
+		$format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
+	} else if ($format == 'dayhoursec') {
+		$format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
+	} else if ($format == 'dayhourtext') {
+		$format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
+	} else if ($format == 'dayhourtextshort') {
+		$format=($outputlangs->trans("FormatDateHourTextShort")!="FormatDateHourTextShort"?$outputlangs->trans("FormatDateHourTextShort"):$conf->format_date_hour_text_short);
+	}
 	// Format not sensitive to language
-	else if ($format == 'dayhourlog')		 $format='%Y%m%d%H%M%S';
-	else if ($format == 'dayhourldap')		 $format='%Y%m%d%H%M%SZ';
-	else if ($format == 'dayhourxcard')	$format='%Y%m%dT%H%M%SZ';
-	else if ($format == 'dayxcard')	 	$format='%Y%m%d';
-	else if ($format == 'dayrfc')			 $format='%Y-%m-%d';             // DATE_RFC3339
-	else if ($format == 'dayhourrfc')		 $format='%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
+	else if ($format == 'dayhourlog') {
+		$format='%Y%m%d%H%M%S';
+	} else if ($format == 'dayhourldap') {
+		$format='%Y%m%d%H%M%SZ';
+	} else if ($format == 'dayhourxcard') {
+		$format='%Y%m%dT%H%M%SZ';
+	} else if ($format == 'dayxcard') {
+		$format='%Y%m%d';
+	} else if ($format == 'dayrfc') {
+		$format='%Y-%m-%d';
+	}
+	// DATE_RFC3339
+	else if ($format == 'dayhourrfc') {
+		$format='%Y-%m-%dT%H:%M:%SZ';
+	}
+	// DATETIME RFC3339
+	else if ($format == 'standard') {
+		$format='%Y-%m-%d %H:%M:%S';
+	}
 
 	if ($reduceformat)
 	{
@@ -1740,29 +1943,38 @@ 
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return '';		// $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) {
+		return '';
+	}
+	// $time=0 allowed (it means 01/01/1970 00:00:00)
 
 	// Clean format
-	if (preg_match('/%b/i',$format))		// There is some text to translate
+	if (preg_match('/%b/i',$format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format=str_replace('%b','__b__',$format);
+	}
 		$format=str_replace('%B','__B__',$format);
 	}
-	if (preg_match('/%a/i',$format))		// There is some text to translate
+	if (preg_match('/%a/i',$format)) {
+		// There is some text to translate
 	{
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format=str_replace('%a','__a__',$format);
+	}
 		$format=str_replace('%A','__A__',$format);
 	}
 
 	// Analyze date
 	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$time,$reg)
-	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
+	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg)) {
+		// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
 		// TODO Remove this.
 		// This part of code should not be used.
 		dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);
+	}
 		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'
 		$syear	= (! empty($reg[1]) ? $reg[1] : '');
 		$smonth	= (! empty($reg[2]) ? $reg[2] : '');
@@ -1773,17 +1985,20 @@ 
 
 		$time=dol_mktime($shour,$smin,$ssec,$smonth,$sday,$syear,true);
 		$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);
-	}
-	else
+	} else
 	{
 		// Date is a timestamps
-		if ($time < 100000000000)	// Protection against bad date values
+		if ($time < 100000000000) {
+			// Protection against bad date values
 		{
-			$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+			$timetouse = $time+$offsettz+$offsetdst;
+		}
+		// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret=adodb_strftime($format, $timetouse, $to_gmt);
+		} else {
+			$ret='Bad value '.$time.' for date';
 		}
-		else $ret='Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i',$format))
@@ -1797,8 +2012,7 @@ 
 		{
 			$monthtext=$outputlangs->transnoentities('Month'.$month);
 			$monthtextshort=$outputlangs->transnoentities('MonthShort'.$month);
-		}
-		else
+		} else
 		{
 			$monthtext=$outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort=$outputlangs->transnoentitiesnoconv('MonthShort'.$month);
@@ -1861,14 +2075,19 @@ 
 	global $conf;
 
 	$usealternatemethod=false;
-	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
+	if ($timestamp <= 0) {
+		$usealternatemethod=true;
+	}
+	// <= 1970
+	if ($timestamp >= 2145913200) {
+		$usealternatemethod=true;
+	}
+	// >= 2038
 
 	if ($usealternatemethod)
 	{
 		$arrayinfo=adodb_getdate($timestamp,$fast);
-	}
-	else
+	} else
 	{
 		$arrayinfo=getdate($timestamp);
 	}
@@ -1901,19 +2120,37 @@ 
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 
 	// Clean parameters
-	if ($hour   == -1 || empty($hour)) $hour=0;
-	if ($minute == -1 || empty($minute)) $minute=0;
-	if ($second == -1 || empty($second)) $second=0;
+	if ($hour   == -1 || empty($hour)) {
+		$hour=0;
+	}
+	if ($minute == -1 || empty($minute)) {
+		$minute=0;
+	}
+	if ($second == -1 || empty($second)) {
+		$second=0;
+	}
 
 	// Check parameters
 	if ($check)
 	{
-		if (! $month || ! $day)  return '';
-		if ($day   > 31) return '';
-		if ($month > 12) return '';
-		if ($hour  < 0 || $hour   > 24) return '';
-		if ($minute< 0 || $minute > 60) return '';
-		if ($second< 0 || $second > 60) return '';
+		if (! $month || ! $day) {
+			return '';
+		}
+		if ($day   > 31) {
+			return '';
+		}
+		if ($month > 12) {
+			return '';
+		}
+		if ($hour  < 0 || $hour   > 24) {
+			return '';
+		}
+		if ($minute< 0 || $minute > 60) {
+			return '';
+		}
+		if ($second< 0 || $second > 60) {
+			return '';
+		}
 	}
 
 	if (method_exists('DateTime','getTimestamp'))
@@ -1922,28 +2159,24 @@ 
 		{
 			$default_timezone=@date_default_timezone_get();		// Example 'Europe/Berlin'
 			$localtz = new DateTimeZone($default_timezone);
-		}
-		else if ($gm === 'user')
+		} else if ($gm === 'user')
 		{
 			// We use dol_tz_string first because it is more reliable.
 			$default_timezone=(empty($_SESSION["dol_tz_string"])?@date_default_timezone_get():$_SESSION["dol_tz_string"]);		// Example 'Europe/Berlin'
 			try {
 				$localtz = new DateTimeZone($default_timezone);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 				$default_timezone=@date_default_timezone_get();
 			}
-		}
-		else if (strrpos($gm, "tz,") !== false)
+		} else if (strrpos($gm, "tz,") !== false)
 		{
 			$timezone=str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'
 			try
 			{
 				$localtz = new DateTimeZone($timezone);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 			}
@@ -1960,8 +2193,7 @@ 
 		$date=$dt->getTimestamp();	// should include daylight saving time
 		//var_dump($date);
 		return $date;
-	}
-	else
+	} else
 	{
 		dol_print_error('','PHP version must be 5.3+');
 		return '';
@@ -1984,10 +2216,15 @@ 
 
 	// Note that gmmktime and mktime return same value (GMT) when used without parameters
 	//if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
-	if ($mode == 'gmt') $ret=time();	// Time for now at greenwich.
-	else if ($mode == 'tzserver')		// Time for now with PHP server timezone added
+	if ($mode == 'gmt') {
+		$ret=time();
+	}
+	// Time for now at greenwich.
+	else if ($mode == 'tzserver') {
+		// Time for now with PHP server timezone added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	}
 		$tzsecond=getServerTimeZoneInt('now');    // Contains tz+dayling saving time
 		$ret=(int) dol_now('gmt')+($tzsecond*3600);
 	}
@@ -1997,10 +2234,12 @@ 
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
 		$ret=dol_now('gmt')+($tzsecond*3600);
 	}*/
-	else if ($mode == 'tzuser')				// Time for now with user timezone added
+	else if ($mode == 'tzuser') {
+		// Time for now with user timezone added
 	{
 		//print 'eeee'.time().'-'.mktime().'-'.gmmktime();
 		$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
+	}
 		$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
 		$ret=(int) dol_now('gmt')+($offsettz+$offsetdst);
 	}
@@ -2022,7 +2261,9 @@ 
 	global $conf,$langs;
 	$level=1024;
 
-	if (! empty($conf->dol_optimize_smallscreen)) $shortunit=1;
+	if (! empty($conf->dol_optimize_smallscreen)) {
+		$shortunit=1;
+	}
 
 	// Set value text
 	if (empty($shortvalue) || $size < ($level*10))
@@ -2030,16 +2271,14 @@ 
 		$ret=$size;
 		$textunitshort=$langs->trans("b");
 		$textunitlong=$langs->trans("Bytes");
-	}
-	else
+	} else
 	{
 		$ret=round($size/$level,0);
 		$textunitshort=$langs->trans("Kb");
 		$textunitlong=$langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret.=' '.$textunitlong; }
-	else { $ret.=' '.$textunitshort; }
+	if (empty($shortunit)) { $ret.=' '.$textunitlong; } else { $ret.=' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2057,15 +2296,23 @@ 
 {
 	global $langs;
 
-	if (empty($url)) return '';
+	if (empty($url)) {
+		return '';
+	}
 
 	$link='<a href="';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
+	if (! preg_match('/^http/i',$url)) {
+		$link.='http://';
+	}
 	$link.=$url;
 	$link.='"';
-	if ($target) $link.=' target="'.$target.'"';
+	if ($target) {
+		$link.=' target="'.$target.'"';
+	}
 	$link.='>';
-	if (! preg_match('/^http/i',$url)) $link.='http://';
+	if (! preg_match('/^http/i',$url)) {
+		$link.='http://';
+	}
 	$link.=dol_trunc($url,$max);
 	$link.='</a>';
 	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("Url"), 'object_globe.png').' ':'').$link.'</div>';
@@ -2089,12 +2336,16 @@ 
 
 	$newemail=$email;
 
-	if (empty($email)) return '&nbsp;';
+	if (empty($email)) {
+		return '&nbsp;';
+	}
 
 	if (! empty($addlink))
 	{
 		$newemail='<a style="text-overflow: ellipsis;" href="';
-		if (! preg_match('/^mailto:/i',$email)) $newemail.='mailto:';
+		if (! preg_match('/^mailto:/i',$email)) {
+			$newemail.='mailto:';
+		}
 		$newemail.=$email;
 		$newemail.='">';
 		$newemail.=dol_trunc($email,$max);
@@ -2108,11 +2359,14 @@ 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_EMAIL'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newemail='<div>'.$newemail.' '.$link.'</div>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
+			if ($link) {
+				$newemail='<div>'.$newemail.' '.$link.'</div>';
+			}
 		}
-	}
-	else
+	} else
 	{
 		if ($showinvalid && ! isValidEmail($email))
 		{
@@ -2139,7 +2393,9 @@ 
 
 	$newskype=$skype;
 
-	if (empty($skype)) return '&nbsp;';
+	if (empty($skype)) {
+		return '&nbsp;';
+	}
 
 	if (! empty($addlink))
 	{
@@ -2160,11 +2416,12 @@ 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_SKYPE'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
 			$newskype='<div class="divskype nowrap">'.$newskype.($link?' '.$link:'').'</div>';
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		$newskype.=img_warning($langs->trans("ErrorBadSkype",$skype));
@@ -2193,10 +2450,14 @@ 
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/","",trim($phone));
 	if (empty($phone)) { return ''; }
-	if (empty($countrycode)) $countrycode=$mysoc->country_code;
+	if (empty($countrycode)) {
+		$countrycode=$mysoc->country_code;
+	}
 
 	// Short format for small screens
-	if ($conf->dol_optimize_smallscreen) $separ='';
+	if ($conf->dol_optimize_smallscreen) {
+		$separ='';
+	}
 
 	$newphone=$phone;
 	if (strtoupper($countrycode) == "FR")
@@ -2204,297 +2465,257 @@ 
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,2).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2);
-		}
-		elseif (dol_strlen($phone) == 7)
+		} elseif (dol_strlen($phone) == 7)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2);
-		}
-		elseif (dol_strlen($phone) == 9)
+		} elseif (dol_strlen($phone) == 9)
 		{
 			$newphone=substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{
 			$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{
 			$newphone=substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-
-	elseif (strtoupper($countrycode) == "CA")
+	} elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone=($separ!=''?'(':'').substr($newphone,0,3).($separ!=''?')':'').$separ.substr($newphone,3,3).($separ!=''?'-':'').substr($newphone,6,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PT" )
+	} elseif (strtoupper($countrycode) == "PT" )
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SR" )
+	} elseif (strtoupper($countrycode) == "SR" )
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DE" )
+	} elseif (strtoupper($countrycode) == "DE" )
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ES")
+	} elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BF")
+	} elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "RO")
+	} elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TR")
+	} elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "US")
+	} elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MX")
+	} elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ML")
+	} elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if(dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TH")
+	} elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if(dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
 		}
-		}
-	elseif (strtoupper($countrycode) == "MU")
+		} elseif (strtoupper($countrycode) == "MU")
 	{//Maurice
 		if(dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ZA")
+	} elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if(dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SY")
+	} elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if(dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AE")
+	} elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if(dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
-		}
-		elseif(dol_strlen($phone) == 14)
+		} elseif(dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DZ")
+	} elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if(dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BE")
+	} elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if(dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
-		}
-		elseif(dol_strlen($phone) == 12)
+		} elseif(dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PF")
+	} elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if(dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CO")
+	} elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if(dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JO")
+	} elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if(dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MG")
+	} elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if(dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GB")
+	} elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if(dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CH")
+	} elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if(dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
-		}
-		elseif(dol_strlen($phone) == 15)
+		} elseif(dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TN")
+	} elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if(dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GF")
+	} elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if(dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GP")
+	} elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if(dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MQ")
+	} elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if(dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "IT")
+	} elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if(dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
-		}
-		elseif(dol_strlen($phone) == 13)
+		} elseif(dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
 		}
-	}
-	elseif(strtoupper($countrycode) == "AU")
+	} elseif(strtoupper($countrycode) == "AU")
 	{//Australie
 		 if(dol_strlen($phone) == 12)
 		{//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
 		}
 	}
-	if (! empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
+	if (! empty($addlink)) {
+		// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
 		if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
 		{
 			$newphone ='<a href="tel:'.$phone.'"';
+	}
 			$newphone.='>'.$phone.'</a>';
-		}
-		else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {
+			// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
+		}
 
 			// Define urlmask
 			$urlmask='ErrorClickToDialModuleNotConfigured';
-			if (! empty($conf->global->CLICKTODIAL_URL)) $urlmask=$conf->global->CLICKTODIAL_URL;
-			if (! empty($user->clicktodial_url)) $urlmask=$user->clicktodial_url;
+			if (! empty($conf->global->CLICKTODIAL_URL)) {
+				$urlmask=$conf->global->CLICKTODIAL_URL;
+			}
+			if (! empty($user->clicktodial_url)) {
+				$urlmask=$user->clicktodial_url;
+			}
 
 			$clicktodial_poste=(! empty($user->clicktodial_poste)?urlencode($user->clicktodial_poste):'');
 			$clicktodial_login=(! empty($user->clicktodial_login)?urlencode($user->clicktodial_login):'');
@@ -2509,7 +2730,9 @@ 
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav=$newphone;
 			$newphone ='<a href="'.$url.'"';
-			if (! empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone.=' target="_blank"';
+			if (! empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+				$newphone.=' target="_blank"';
+			}
 			$newphone.='>'.$newphonesav.'</a>';
 		}
 
@@ -2517,9 +2740,15 @@ 
 		if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_TEL'; $link='';
-			if ($addlink == 'AC_FAX') $type='AC_FAX';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newphone='<div>'.$newphone.' '.$link.'</div>';
+			if ($addlink == 'AC_FAX') {
+				$type='AC_FAX';
+			}
+			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+				$link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			}
+			if ($link) {
+				$newphone='<div>'.$newphone.' '.$link.'</div>';
+			}
 		}
 	}
 
@@ -2540,19 +2769,25 @@ 
 		if($withpicto){
 			if($withpicto=='fax'){
 				$picto = 'phoning_fax';
-			}elseif($withpicto=='phone'){
+			} elseif($withpicto=='phone'){
 				$picto = 'phoning';
-			}elseif($withpicto=='mobile'){
+			} elseif($withpicto=='mobile'){
 				$picto = 'phoning_mobile';
-			}else{
+			} else{
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) $rep.='<div class="nospan float" style="margin-right: 10px">';
-		else $rep.='<span style="margin-right: 10px;">';
+		if ($adddivfloat) {
+			$rep.='<div class="nospan float" style="margin-right: 10px">';
+		} else {
+			$rep.='<span style="margin-right: 10px;">';
+		}
 		$rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone;
-		if ($adddivfloat) $rep.='</div>';
-		else $rep.='</span>';
+		if ($adddivfloat) {
+			$rep.='</div>';
+		} else {
+			$rep.='</span>';
+		}
 	  }
 
 	return $rep;
@@ -2571,18 +2806,23 @@ 
 
 	$ret='';
 
-	if (empty($mode)) $ret.=$ip;
+	if (empty($mode)) {
+		$ret.=$ip;
+	}
 
 	if ($mode != 2)
 	{
 		$countrycode=dolGetCountryCodeFromIp($ip);
-		if ($countrycode)	// If success, countrycode is us, fr, ...
+		if ($countrycode) {
+			// If success, countrycode is us, fr, ...
 		{
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret.=' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"),DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png','',1);
+		}
+			} else {
+				$ret.=' ('.$countrycode.')';
 			}
-			else $ret.=' ('.$countrycode.')';
 		}
 	}
 
@@ -2671,18 +2911,33 @@ 
 		}
 		if (empty($reshook))
 		{
-			if (empty($charfornl)) $out.=nl2br($address);
-			else $out.=preg_replace('/[\r\n]+/', $charfornl, $address);
+			if (empty($charfornl)) {
+				$out.=nl2br($address);
+			} else {
+				$out.=preg_replace('/[\r\n]+/', $charfornl, $address);
+			}
 
 			$showgmap=$showomap=0;
 
 			// TODO Add a hook here
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap=1;
-			if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap=1;
-			if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap=1;
-			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap=1;
-			if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap=1;
-			if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap=1;
+			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+				$showgmap=1;
+			}
+			if ($mode=='contact' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+				$showgmap=1;
+			}
+			if ($mode=='member' && ! empty($conf->google->enabled) && ! empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+				$showgmap=1;
+			}
+			if (($mode=='thirdparty' || $mode =='societe') && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+				$showomap=1;
+			}
+			if ($mode=='contact' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+				$showomap=1;
+			}
+			if ($mode=='member' && ! empty($conf->openstreetmap->enabled) && ! empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+				$showomap=1;
+			}
 
 			if ($showgmap)
 			{
@@ -2696,9 +2951,12 @@ 
 			}
 		}
 	}
-	if ($noprint) return $out;
-	else print $out;
-}
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
+	}
 
 
 /**
@@ -2710,8 +2968,12 @@ 
  */
 function isValidEmail($address, $acceptsupervisorkey=0)
 {
-	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;
-	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;
+	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+		return true;
+	}
+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+		return true;
+	}
 
 	return false;
 }
@@ -2738,9 +3000,12 @@ 
  */
 function dol_strlen($string,$stringencoding='UTF-8')
 {
-	if (function_exists('mb_strlen')) return mb_strlen($string,$stringencoding);
-	else return strlen($string);
-}
+	if (function_exists('mb_strlen')) {
+		return mb_strlen($string,$stringencoding);
+	} else {
+		return strlen($string);
+	}
+	}
 
 /**
  * Make a substring. Works even in mbstring module is not enabled.
@@ -2755,14 +3020,15 @@ 
 {
 	global $langs;
 
-	if (empty($stringencoding)) $stringencoding=$langs->charset_output;
+	if (empty($stringencoding)) {
+		$stringencoding=$langs->charset_output;
+	}
 
 	$ret='';
 	if (function_exists('mb_substr'))
 	{
 		$ret=mb_substr($string,$start,$length,$stringencoding);
-	}
-	else
+	} else
 	{
 		$ret=substr($string,$start,$length);
 	}
@@ -2802,7 +3068,9 @@ 
 		return;
 	}
 
-	if (empty($conf->use_javascript_ajax)) return;
+	if (empty($conf->use_javascript_ajax)) {
+		return;
+	}
 	$jsgraphlib='flot';
 	$datacolor=array();
 
@@ -2860,11 +3128,17 @@ 
 										var number=series.data[0][1];
 										return \'';
 										print '<div style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-										if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'">';
+										if ($url) {
+											print '<a style="color: #FFFFFF;" border="0" href="'.$url.'">';
+										}
 										print '\'+'.($showlegend?'number':'label+\' \'+number');
-										if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
+										if (! empty($showpercent)) {
+											print '+\'<br/>\'+percent+\'%\'';
+										}
 										print '+\'';
-										if ($url) print '</a>';
+										if ($url) {
+											print '</a>';
+										}
 										print '</div>\';
 									},
 									background: {
@@ -2890,8 +3164,7 @@ 
 				plotWithOptions();
 			});
 			</script>';
-		}
-		else if ($type == 'barline')
+		} else if ($type == 'barline')
 		{
 			// data is   array('series'=>array(serie1,serie2,...),
 			//                 'seriestype'=>array('bar','line',...),
@@ -2906,18 +3179,24 @@ 
 				foreach($data['series'] as $serie)
 				{
 					if ($data['seriestype'][$i]=='line') { $i++; continue; };
-					if ($outputserie > 0) print ',';
+					if ($outputserie > 0) {
+						print ',';
+					}
 					print '{ bars: { stack: 0, show: true, barWidth: 0.9, align: \'center\' }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
 				}
-				if ($outputserie) print ', ';
+				if ($outputserie) {
+					print ', ';
+				}
 				//print '];
 				//var datalines = [';
 				$i=0; $outputserie=0;
 				foreach($data['series'] as $serie)
 				{
 					if (empty($data['seriestype'][$i]) || $data['seriestype'][$i]=='bar') { $i++; continue; };
-					if ($outputserie > 0) print ',';
+					if ($outputserie > 0) {
+						print ',';
+					}
 					print '{ lines: { show: true }, label: \''.dol_escape_js($serie['label']).'\', data: '.json_encode($serie['data']).'}'."\n";
 					$outputserie++; $i++;
 				}
@@ -2947,8 +3226,9 @@ 
 				plotWithOptions();
 			});
 			</script>';
+		} else {
+			print 'BadValueForParameterType';
 		}
-		else print 'BadValueForParameterType';
 	}
 }
 
@@ -2969,23 +3249,30 @@ 
 {
 	global $conf;
 
-	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
+	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) {
+		return $string;
+	}
 
-	if (empty($stringencoding)) $stringencoding='UTF-8';
+	if (empty($stringencoding)) {
+		$stringencoding='UTF-8';
+	}
 	// reduce for small screen
-	if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
+	if ($conf->dol_optimize_smallscreen==1 && $display==1) {
+		$size = round($size/3);
+	}
 
 	// We go always here
 	if ($trunc == 'right')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
-		else
-		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		} else {
+				//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
-	}
-	elseif ($trunc == 'middle')
+		}
+	} elseif ($trunc == 'middle')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
 		if (dol_strlen($newstring,$stringencoding) > 2 && dol_strlen($newstring,$stringencoding) > ($size+1))
@@ -2993,28 +3280,30 @@ 
 			$size1=round($size/2);
 			$size2=round($size/2);
 			return dol_substr($newstring,0,$size1,$stringencoding).'...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size2,$size2,$stringencoding);
+		} else {
+				return $string;
 		}
-		else
-		return $string;
-	}
-	elseif ($trunc == 'left')
+	} elseif ($trunc == 'left')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+		if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:3))) {
+			// If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring,dol_strlen($newstring,$stringencoding) - $size,$size,$stringencoding);
-		else
-		return $string;
-	}
-	elseif ($trunc == 'wrap')
+		} else {
+				return $string;
+		}
+	} elseif ($trunc == 'wrap')
 	{
 		$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
-		if (dol_strlen($newstring,$stringencoding) > ($size+1))
-		return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
-		else
-		return $string;
+		if (dol_strlen($newstring,$stringencoding) > ($size+1)) {
+				return dol_substr($newstring,0,$size,$stringencoding)."\n".dol_trunc(dol_substr($newstring,$size,dol_strlen($newstring,$stringencoding)-$size,$stringencoding),$size,$trunc);
+		} else {
+				return $string;
+		}
+	} else {
+		return 'BadParam3CallingDolTrunc';
+	}
 	}
-	else return 'BadParam3CallingDolTrunc';
-}
 
 /**
  *	Show picto whatever it's its name (generic function)
@@ -3042,10 +3331,11 @@ 
 	if ($pictoisfullpath)
 	{
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) {
+			$picto .= '.png';
+		}
 		$fullpathpicto = $picto;
-	}
-	else
+	} else
 	{
 		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
@@ -3057,7 +3347,9 @@ 
 			if ($picto == 'on')  { $fakey = 'fa-check-square-o'; $fasize='1.3em'; }
 			$enabledisablehtml='';
 			$enabledisablehtml.='<span class="fa '.$fakey.' valignmiddle'.($morecss?' '.$morecss:'').'" style="'.($fasize?('font-size: '.$fasize.';'):'').($facolor?(' color: '.$facolor.';'):'').'" alt="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'"'.($moreatt?' '.$moreatt:'').'">';
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$titlealt;
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$enabledisablehtml.=$titlealt;
+			}
 			$enabledisablehtml.='</span>';
 			return $enabledisablehtml;
 		}
@@ -3067,9 +3359,18 @@ 
 		$theme = $conf->theme;
 
 		$path = 'theme/'.$theme;
-		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;	// If the theme does not have the same name as the module
-		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme
-		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme;	// If the theme have the same name as the module
+		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
+			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;
+		}
+		// If the theme does not have the same name as the module
+		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
+			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
+		}
+		// To allow an external module to overwrite image resources whatever is activated theme
+		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
+			$path = $theme.'/theme/'.$theme;
+		}
+		// If the theme have the same name as the module
 
 		// If we ask an image into $url/$mymodule/img (instead of default path)
 		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
@@ -3079,14 +3380,20 @@ 
 		}
 
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) $picto .= '.png';
+		if (! preg_match('/(\.png|\.gif|\.svg)$/i',$picto)) {
+			$picto .= '.png';
+		}
 		// If alt path are defined, define url where img file is, according to physical path
-		foreach ($conf->file->dol_document_root as $type => $dirroot)	// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $type => $dirroot) {
+			// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
 		{
 			if ($type == 'main') continue;
-			if (file_exists($dirroot.'/'.$path.'/img/'.$picto))	// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
+		}
+			if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {
+				// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
 			{
 				$url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
+			}
 				break;
 			}
 		}
@@ -3095,8 +3402,9 @@ 
 		$fullpathpicto = $url.'/'.$path.'/img/'.$picto;
 	}
 
-	if ($srconly) return $fullpathpicto;
-	else
+	if ($srconly) {
+		return $fullpathpicto;
+	} else
 	{
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people
 		//$tmparray=array(0=>$titlealt);
@@ -3140,7 +3448,9 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (! preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3161,10 +3471,13 @@ 
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (! preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
-	if ($pictoisfullpath) $path = $picto;
-	else
+	if ($pictoisfullpath) {
+		$path = $picto;
+	} else
 	{
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
@@ -3172,7 +3485,9 @@ 
 		{
 			$themepath = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto;
 
-			if (file_exists($themepath)) $path = $themepath;
+			if (file_exists($themepath)) {
+				$path = $themepath;
+			}
 		}
 	}
 
@@ -3192,14 +3507,11 @@ 
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO')			{ $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction ==  '0' || $numaction == 'ST_NEVER') 	{ $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction ==  '1' || $numaction == 'ST_TODO')  	{ $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction ==  '2' || $numaction == 'ST_PEND')  	{ $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction ==  '3' || $numaction == 'ST_DONE')  	{ $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
-		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO')			{ $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); } elseif ($numaction ==  '0' || $numaction == 'ST_NEVER') 	{ $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); } elseif ($numaction ==  '1' || $numaction == 'ST_TODO')  	{ $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); } elseif ($numaction ==  '2' || $numaction == 'ST_PEND')  	{ $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); } elseif ($numaction ==  '3' || $numaction == 'ST_DONE')  	{ $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); } else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+	}
+	if (! is_numeric($numaction)) {
+		$numaction=0;
 	}
-	if (! is_numeric($numaction)) $numaction=0;
 
 	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
 }
@@ -3215,7 +3527,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Show');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Show');
+	}
 
 	return img_picto($titlealt, 'pdf'.$size.'.png');
 }
@@ -3231,7 +3545,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Add');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Add');
+	}
 
 	return img_picto($titlealt, 'edit_add.png', $other);
 }
@@ -3246,7 +3562,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Remove');
+	}
 
 	return img_picto($titlealt, 'edit_remove.png', $other);
 }
@@ -3263,7 +3581,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Modify');
+	}
 
 	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : "") . ($other?' '.$other:''));
 }
@@ -3280,7 +3600,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('View');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('View');
+	}
 
 	$moreatt = ($float ? 'style="float: right" ' : '').$other;
 
@@ -3298,7 +3620,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Delete');
+	}
 
 	return img_picto($titlealt, 'delete.png', $other);
 }
@@ -3313,7 +3637,9 @@ 
 function img_printer($titlealt = "default", $other='')
 {
 	global $conf,$langs;
-	if ($titlealt=="default") $titlealt=$langs->trans("Print");
+	if ($titlealt=="default") {
+		$titlealt=$langs->trans("Print");
+	}
 	return img_picto($titlealt,'printer.png',$other);
 }
 
@@ -3328,7 +3654,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Split');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Split');
+	}
 
 	return img_picto($titlealt, 'split.png', $other);
 }
@@ -3346,8 +3674,11 @@ 
 
 	if ($usealttitle)
 	{
-		if (is_string($usealttitle)) $usealttitle = dol_escape_htmltag($usealttitle);
-		else $usealttitle = $langs->trans('Info');
+		if (is_string($usealttitle)) {
+			$usealttitle = dol_escape_htmltag($usealttitle);
+		} else {
+			$usealttitle = $langs->trans('Info');
+		}
 	}
 
 	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
@@ -3363,7 +3694,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Informations');
+	}
 
 	return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
 }
@@ -3379,7 +3712,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Warning');
+	}
 
 	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
 	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
@@ -3395,7 +3730,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Error');
+	}
 
 	return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
 }
@@ -3411,7 +3748,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Next');
+	}
 
 	//return img_picto($titlealt, 'next.png', $moreatt);
 	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3428,7 +3767,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Previous');
+	}
 
 	//return img_picto($titlealt, 'previous.png', $moreatt);
 	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3446,7 +3787,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Down');
+	}
 
 	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass?" ".$moreclass:"").'"');
 }
@@ -3463,7 +3806,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Up');
+	}
 
 	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass?" ".$moreclass:"").'"');
 }
@@ -3480,7 +3825,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Left');
+	}
 
 	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3497,7 +3844,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Right');
+	}
 
 	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
@@ -3513,9 +3862,13 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Active');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Active');
+	}
 
-	if ($allow == 1) return img_picto($titlealt, 'tick.png');
+	if ($allow == 1) {
+		return img_picto($titlealt, 'tick.png');
+	}
 
 	return '-';
 }
@@ -3537,7 +3890,9 @@ 
 	$mimeimg = dol_mimetype($file, '', 2);
 	$mimefa = dol_mimetype($file, '', 4);
 
-	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
+	if (empty($titlealt)) {
+		$titlealt = 'Mime type: '.$mimetype;
+	}
 
 	//return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
 	return '<i class="fa fa-'.$mimefa.' paddingright"></i>';
@@ -3560,10 +3915,15 @@ 
 
 	global $conf,$langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Call');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Call');
+	}
 
-	if ($option == 1) $img = 'call';
-	else $img = 'call_out';
+	if ($option == 1) {
+		$img = 'call';
+	} else {
+		$img = 'call_out';
+	}
 
 	return img_picto($titlealt, $img);
 }
@@ -3579,7 +3939,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -3600,7 +3962,9 @@ 
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -3663,15 +4027,21 @@ 
 	$langs->load("main");
 	$langs->load("errors");
 
-	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
+	if ($_SERVER['DOCUMENT_ROOT']) {
+		// Mode web
 	{
 		$out.=$langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+	}
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		}
 		$out.=$langs->trans("InformationToHelpDiagnose").":<br>\n";
 
 		$out.="<b>".$langs->trans("Date").":</b> ".dol_print_date(time(),'dayhourlog')."<br>\n";
 		$out.="<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out.="<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out.="<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";
+		}
 		if (function_exists("phpversion"))
 		{
 			$out.="<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
@@ -3689,8 +4059,7 @@ 
 		$out.="<br>\n";
 		$syslog.="url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog.=", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-	}
-	else                              // Mode CLI
+	} else                              // Mode CLI
 	{
 		$out.='> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog.="pid=".dol_getmypid();
@@ -3698,15 +4067,16 @@ 
 
 	if (is_object($db))
 	{
-		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+		if ($_SERVER['DOCUMENT_ROOT']) {
+			// Mode web
 		{
 			$out.="<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
+		}
 			$out.="<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror()?dol_escape_htmltag($db->lastqueryerror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno()?dol_escape_htmltag($db->lasterrno()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror()?dol_escape_htmltag($db->lasterror()):$langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out.="<br>\n";
-		}
-		else                            // Mode CLI
+		} else                            // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out.='> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -3724,19 +4094,27 @@ 
 		$langs->load("errors");
 
 		// Merge all into $errors array
-		if (is_array($error) && is_array($errors)) $errors=array_merge($error,$errors);
-		elseif (is_array($error)) $errors=$error;
-		elseif (is_array($errors)) $errors=array_merge(array($error),$errors);
-		else $errors=array_merge(array($error));
+		if (is_array($error) && is_array($errors)) {
+			$errors=array_merge($error,$errors);
+		} elseif (is_array($error)) {
+			$errors=$error;
+		} elseif (is_array($errors)) {
+			$errors=array_merge(array($error),$errors);
+		} else {
+			$errors=array_merge(array($error));
+		}
 
 		foreach($errors as $msg)
 		{
-			if (empty($msg)) continue;
-			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
+			if (empty($msg)) {
+				continue;
+			}
+			if ($_SERVER['DOCUMENT_ROOT']) {
+				// Mode web
 			{
 				$out.="<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n" ;
 			}
-			else                        // Mode CLI
+			} else                        // Mode CLI
 			{
 				$out.='> '.$langs->transnoentities("Message").":\n".$msg."\n" ;
 			}
@@ -3753,8 +4131,9 @@ 
 		$out.="<br>\n";
 	}
 
-	if (empty($dolibarr_main_prod)) print $out;
-	else
+	if (empty($dolibarr_main_prod)) {
+		print $out;
+	} else
 	{
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
@@ -3781,7 +4160,9 @@ 
 	$now=dol_now();
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
 	print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
-	if ($errormessage) print '<br><br>'.$errormessage;
+	if ($errormessage) {
+		print '<br><br>'.$errormessage;
+	}
 	if (is_array($errormessages) && count($errormessages))
 	{
 		foreach($errormessages as $mesgtoshow)
@@ -3839,7 +4220,9 @@ 
 	$sortimg='';
 
 	$tag='th';
-	if ($thead==2) $tag='div';
+	if ($thead==2) {
+		$tag='div';
+	}
 
 	$tmpsortfield=explode(',',$sortfield);
 	$sortfield1=trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
@@ -3849,42 +4232,63 @@ 
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
-	else $out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) {
+		$out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
+	} else {
+		$out.= '<'.$tag.' class="'.$prefix.'liste_titre" '. $moreattrib.'>';
+	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+	}
 		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
 		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		if (! preg_match('/^&/',$options)) {
+			$options='&'.$options;
+		}
 
-		if ($field1 != $sortfield1) // We are on another field
+		if ($field1 != $sortfield1) {
+			// We are on another field
 		{
 			if (preg_match('/^DESC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
-		}
-		else                      // We are of first sorting criteria
+		} else {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+			}
+		} else                      // We are of first sorting criteria
 		{
-			if (preg_match('/^ASC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
-			else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			if (preg_match('/^ASC/', $sortorder)) {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+			} else {
+				$out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+			}
 		}
 	}
 
-	if ($tooltip) $out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
-	else $out.=$langs->trans($name);
+	if ($tooltip) {
+		$out.=$form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
+	} else {
+		$out.=$langs->trans($name);
+	}
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
+	if (empty($thead) && $field && empty($disablesortlink)) {
+		// If this is a sort field
 	{
 		$out.='</a>';
 	}
+	}
 
-	if (empty($thead) && $field)    // If this is a sort field
+	if (empty($thead) && $field) {
+		// If this is a sort field
 	{
 		$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
+	}
 		$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
 		$options=preg_replace('/&+/i','&',$options);
-		if (! preg_match('/^&/',$options)) $options='&'.$options;
+		if (! preg_match('/^&/',$options)) {
+			$options='&'.$options;
+		}
 
 		//print "&nbsp;";
 		//$sortimg.= '<img width="2" src="'.DOL_URL_ROOT.'/theme/common/transparent.png" alt="">';
@@ -3894,8 +4298,7 @@ 
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-		}
-		else
+		} else
 		{
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
@@ -3969,12 +4372,18 @@ 
 
 	$return='';
 
-	if ($picto == 'setup') $picto='title.png';
-	if (($conf->browser->name == 'ie') && $picto=='title.png') $picto='title.gif';
+	if ($picto == 'setup') {
+		$picto='title.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto=='title.png') {
+		$picto='title.gif';
+	}
 
 	$return.= "\n";
 	$return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" class="centpercent notopnoleftnoright'.($morecssontable?' '.$morecssontable:'').'" style="margin-bottom: 2px;"><tr>';
-	if ($picto) $return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) {
+		$return.= '<td class="nobordernopadding widthpictotitle" valign="middle">'.img_picto('',$picto, 'class="valignmiddle widthpictotitle" id="pictotitle"', $pictoisfullpath).'</td>';
+	}
 	$return.= '<td class="nobordernopadding" valign="middle">';
 	$return.= '<div class="titre">'.$titre.'</div>';
 	$return.= '</td>';
@@ -4020,14 +4429,19 @@ 
 	$savtotalnboflines = $totalnboflines;
 	$totalnboflines=abs($totalnboflines);
 
-	if ($picto == 'setup') $picto='title_setup.png';
-	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
-	if ($limit < 0) $limit = $conf->liste_limit;
+	if ($picto == 'setup') {
+		$picto='title_setup.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') {
+		$picto='title.gif';
+	}
+	if ($limit < 0) {
+		$limit = $conf->liste_limit;
+	}
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
-	}
-	else
+	} else
 	{
 		$nextpage = 0;
 	}
@@ -4040,9 +4454,13 @@ 
 	// Left
 	//if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding valignmiddle">';
-	if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	if ($picto && $titre) {
+		print img_picto('', $picto, 'class="hideonsmartphone valignmiddle" id="pictotitle"', $pictoisfullpath);
+	}
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+		print ' ('.$totalnboflines.')';
+	}
 	print '</div></td>';
 
 	// Center
@@ -4053,27 +4471,39 @@ 
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle" align="right">';
-	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
-	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
+	if ($sortfield) {
+		$options .= "&sortfield=".urlencode($sortfield);
+	}
+	if ($sortorder) {
+		$options .= "&sortorder=".urlencode($sortorder);
+	}
 	// Show navigation bar
 	$pagelist = '';
 	if ($savlimit != 0 && ($page > 0 || $num > $limit))
 	{
-		if ($totalnboflines)	// If we know total nb of lines
+		if ($totalnboflines) {
+			// If we know total nb of lines
 		{
 			// Define nb of extra page links before and after selected page + ... + first or last
 			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1);
+		}
 
-			if ($limit > 0) $nbpages=ceil($totalnboflines/$limit);
-			else $nbpages=1;
+			if ($limit > 0) {
+				$nbpages=ceil($totalnboflines/$limit);
+			} else {
+				$nbpages=1;
+			}
 			$cpt=($page-$maxnbofpage);
 			if ($cpt < 0) { $cpt=0; }
 
 			if ($cpt>=1)
 			{
 				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';
-				if ($cpt > 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == 2) $pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+				if ($cpt > 2) {
+					$pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				} else if ($cpt == 2) {
+					$pagelist.='<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+				}
 			}
 
 			do
@@ -4081,8 +4511,7 @@ 
 				if ($cpt==$page)
 				{
 					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1).'</span></li>';
-				}
-				else
+				} else
 				{
 					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt+1).'</a></li>';
 				}
@@ -4092,12 +4521,14 @@ 
 
 			if ($cpt<$nbpages)
 			{
-				if ($cpt<$nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
-				else if ($cpt == $nbpages-2) $pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+				if ($cpt<$nbpages-2) {
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="inactive"':'').'>...</span></li>';
+				} else if ($cpt == $nbpages-2) {
+					$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-2).$options.'">'.($nbpages - 1).'</a></li>';
+				}
 				$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><a href="'.$file.'?page='.($nbpages-1).$options.'">'.$nbpages.'</a></li>';
 			}
-		}
-		else
+		} else
 		{
 			$pagelist.= '<li'.(($conf->dol_use_jmobile != 4)?' class="pagination"':'').'><span '.(($conf->dol_use_jmobile != 4)?'class="active"':'').'>'.($page+1)."</li>";
 		}
@@ -4135,15 +4566,21 @@ 
 		$pagesizechoices='10:10,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
-		if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+		if (! empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+			$pagesizechoices=$conf->global->MAIN_PAGESIZE_CHOICES;
+		}
 
 		print '<li class="pagination">';
 		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
 		$tmpchoice=explode(',',$pagesizechoices);
 		$tmpkey=$limit.':'.$limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+		if (! in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[]=$tmpkey;
+		}
 		$tmpkey=$conf->liste_limit.':'.$conf->liste_limit;
-		if (! in_array($tmpkey, $tmpchoice)) $tmpchoice[]=$tmpkey;
+		if (! in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[]=$tmpkey;
+		}
 		asort($tmpchoice, SORT_NUMERIC);
 		$found=false;
 		foreach($tmpchoice as $val)
@@ -4231,13 +4668,16 @@ 
 	}
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-	if (! preg_match('/\//', $rate)) $ret=price($rate,0,'',0,0).($addpercent?'%':'');
-	else
+	if (! preg_match('/\//', $rate)) {
+		$ret=price($rate,0,'',0,0).($addpercent?'%':'');
+	} else
 	{
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret=$rate.($addpercent?'%':'');
 	}
-	if (($info_bits & 1) && $usestarfornpr >= 0) $ret.=' *';
+	if (($info_bits & 1) && $usestarfornpr >= 0) {
+		$ret.=' *';
+	}
 	$ret.=$morelabel;
 	return $ret;
 }
@@ -4263,21 +4703,35 @@ 
 	global $langs,$conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount=0;	// To have a numeric value if amount not defined or = ''
+	if (empty($amount)) {
+		$amount=0;
+	}
+	// To have a numeric value if amount not defined or = ''
 	$amount = (is_numeric($amount)?$amount:0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-	if ($rounding < 0) $rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	if ($rounding < 0) {
+		$rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	}
 	$nbdecimal=$rounding;
 
 	// Output separators by default (french)
 	$dec=','; $thousand=' ';
 
 	// If $outlangs not forced, we use use language
-	if (! is_object($outlangs)) $outlangs=$langs;
+	if (! is_object($outlangs)) {
+		$outlangs=$langs;
+	}
 
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$outlangs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	else if ($thousand == 'Space') $thousand=' ';
+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec=$outlangs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") {
+		$thousand=$outlangs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand='';
+	} else if ($thousand == 'Space') {
+		$thousand=' ';
+	}
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	//print "amount=".$amount."-";
@@ -4290,7 +4744,9 @@ 
 	$end='';
 
 	// We increase nbdecimal if there is more decimal than asked (to not loose information)
-	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal=dol_strlen($decpart);
+	if (dol_strlen($decpart) > $nbdecimal) {
+		$nbdecimal=dol_strlen($decpart);
+	}
 	// Si on depasse max
 	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)
 	{
@@ -4303,7 +4759,9 @@ 
 	}
 
 	// If force rounding
-	if ($forcerounding >= 0) $nbdecimal = $forcerounding;
+	if ($forcerounding >= 0) {
+		$nbdecimal = $forcerounding;
+	}
 
 	// Format number
 	$output=number_format($amount, $nbdecimal, $dec, $thousand);
@@ -4316,11 +4774,14 @@ 
 	$cursymbolbefore=$cursymbolafter='';
 	if ($currency_code)
 	{
-		if ($currency_code == 'auto') $currency_code=$conf->currency;
+		if ($currency_code == 'auto') {
+			$currency_code=$conf->currency;
+		}
 
 		$listofcurrenciesbefore=array('USD','GBP','AUD','MXN','PEN','CNY');
-		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
-		else
+		if (in_array($currency_code,$listofcurrenciesbefore)) {
+			$cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
+		} else
 		{
 			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
@@ -4353,14 +4814,22 @@ 
 	// Numbers must be '1234.56'
 	// Decimal delimiter for PHP and database SQL requests must be '.'
 	$dec=','; $thousand=' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($langs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand='';
-	elseif ($thousand == 'Space') $thousand=' ';
+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($langs->transnoentitiesnoconv("SeparatorThousand")!= "SeparatorThousand") {
+		$thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand='';
+	} elseif ($thousand == 'Space') {
+		$thousand=' ';
+	}
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
-	if ($alreadysqlnb != 1)	// If not a PHP number or unknown, we change format
+	if ($alreadysqlnb != 1) {
+		// If not a PHP number or unknown, we change format
 	{
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
 
@@ -4369,7 +4838,9 @@ 
 		if (is_numeric($amount))
 		{
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps=sprintf("%0.10F",$amount-intval($amount));	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps=sprintf("%0.10F",$amount-intval($amount));
+	}
+	// temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps=preg_replace('/([\.1-9])0+$/','\\1',$temps); // temps=0. or 0.00002 or 9999.1
 			$nbofdec=max(0,dol_strlen($temps)-2);	// -2 to remove "0."
 			$amount=number_format($amount,$nbofdec,$dec,$thousand);
@@ -4377,7 +4848,10 @@ 
 		//print "QQ".$amount.'<br>';
 
 		// Now make replace (the main goal of function)
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount=str_replace(',','.',$amount);
+		}
+		// To accept 2 notations for french users
 		$amount=str_replace(' ','',$amount);		// To avoid spaces
 		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount=str_replace($dec,'.',$amount);
@@ -4387,13 +4861,24 @@ 
 	if ($rounding)
 	{
 		$nbofdectoround='';
-		if ($rounding == 'MU')     $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround=empty($conf->global->MAIN_MAX_DECIMALS_STOCK)?5:$conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif (is_numeric($rounding))  $nbofdectoround=$rounding; 	// For admin info page
+		if ($rounding == 'MU') {
+			$nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_UNIT;
+		} elseif ($rounding == 'MT') {
+			$nbofdectoround=$conf->global->MAIN_MAX_DECIMALS_TOT;
+		} elseif ($rounding == 'MS') {
+			$nbofdectoround=empty($conf->global->MAIN_MAX_DECIMALS_STOCK)?5:$conf->global->MAIN_MAX_DECIMALS_STOCK;
+		} elseif (is_numeric($rounding)) {
+			$nbofdectoround=$rounding;
+		}
+		// For admin info page
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round($amount,$nbofdectoround);	// $nbofdectoround can be 0.
-		else return 'ErrorBadParameterProvidedToFunction';
+		if (dol_strlen($nbofdectoround)) {
+			$amount = round($amount,$nbofdectoround);
+		}
+		// $nbofdectoround can be 0.
+		else {
+			return 'ErrorBadParameterProvidedToFunction';
+		}
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
@@ -4410,7 +4895,10 @@ 
 
 		// Always make replace because each math function (like round) replace
 		// with local values and we want a number that has a SQL string format x.y
-		if ($thousand != ',' && $thousand != '.') $amount=str_replace(',','.',$amount);	// To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount=str_replace(',','.',$amount);
+		}
+		// To accept 2 notations for french users
 		$amount=str_replace(' ','',$amount);		// To avoid spaces
 		$amount=str_replace($thousand,'',$amount);	// Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount=str_replace($dec,'.',$amount);
@@ -4439,18 +4927,15 @@ 
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	} elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
 	{
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
 	{
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
@@ -4478,14 +4963,18 @@ 
 {
 	global $db, $conf, $mysoc;
 
-	if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) $thirdparty_seller=$mysoc;
+	if (empty($thirdparty_seller) || ! is_object($thirdparty_seller)) {
+		$thirdparty_seller=$mysoc;
+	}
 
 	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
 	$vatratecleaned = $vatrate;
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+		// If vat is "xx (yy)"
 	{
 		$vatratecleaned = trim($reg[1]);
+	}
 		$vatratecode = $reg[2];
 	}
 
@@ -4495,38 +4984,51 @@ 
 	}*/
 
 	// Some test to guess with no need to make database access
-	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
+	if ($mysoc->country_code == 'ES') {
+		// For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
 	{
 		if ($local == 1)
 		{
 			if (! $mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
+	}
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax1_assuj) return 0;
-			}
-			else
+				if (! $thirdparty_buyer->localtax1_assuj) {
+					return 0;
+				}
+			} else
 			{
-				if (! $thirdparty_seller->localtax1_assuj) return 0;
+				if (! $thirdparty_seller->localtax1_assuj) {
+					return 0;
+				}
 			}
 		}
 
 		if ($local == 2)
 		{
-			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
+			if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") {
+				return 0;
+			}
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
-				if (! $thirdparty_buyer->localtax2_assuj) return 0;
-			}
-			else
+				if (! $thirdparty_buyer->localtax2_assuj) {
+					return 0;
+				}
+			} else
 			{
-				if (! $thirdparty_seller->localtax2_assuj) return 0;
+				if (! $thirdparty_seller->localtax2_assuj) {
+					return 0;
+				}
 			}
 		}
-	}
-	else
+	} else
 	{
-		if ($local == 1 && ! $thirdparty_seller->localtax1_assuj) return 0;
-		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 1 && ! $thirdparty_seller->localtax1_assuj) {
+			return 0;
+		}
+		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) {
+			return 0;
+		}
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4542,35 +5044,41 @@ 
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			}
-			else  // i am the seller
+				}
+			} else  // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX1;
 				}
+				}
 			}
 		}
 		if ($local==2)
 		{
 			if ($thirdparty_seller != $mysoc)
 			{
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+				if (!isOnlyOneLocalTax($local)) {
+					// TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 				// TODO We should also return value defined on thirdparty only if defined
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			}
-			else  // i am the seller
+				}
+			} else  // i am the seller
 			{
-				if (!isOnlyOneLocalTax($local))  // This is for spain only, we don't return value found into datbase even if there is only one locatax vat.
+				if (!isOnlyOneLocalTax($local)) {
+					// This is for spain only, we don't return value found into datbase even if there is only one locatax vat.
 				{
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
+				}
 			}
 		}
 	}
@@ -4580,16 +5088,24 @@ 
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql.= " AND t.code ='".$vatratecode."'";		// If we have the code, we use it in priority
-   	else $sql.= " AND t.recuperableonly ='".$vatnpr."'";
+   	if ($vatratecode) {
+   		$sql.= " AND t.code ='".$vatratecode."'";
+   	}
+   	// If we have the code, we use it in priority
+   	else {
+   		$sql.= " AND t.recuperableonly ='".$vatnpr."'";
+   	}
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql=$db->query($sql);
 
    	if ($resql)
    	{
    		$obj = $db->fetch_object($resql);
-   		if ($local==1) return $obj->localtax1;
-   		elseif ($local==2) return $obj->localtax2;
+   		if ($local==1) {
+   			return $obj->localtax1;
+   		} elseif ($local==2) {
+   			return $obj->localtax2;
+   		}
 	}
 
 	return 0;
@@ -4613,8 +5129,7 @@ 
 	if (count($valors)>1)
 	{
 		return false;
-	}
-	else
+	} else
 	{
 		return true;
 	}
@@ -4640,8 +5155,11 @@ 
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local==1) return $obj->localtax1;
-		elseif ($local==2) return $obj->localtax2;
+		if ($local==1) {
+			return $obj->localtax1;
+		} elseif ($local==2) {
+			return $obj->localtax2;
+		}
 	}
 
 	return 0;
@@ -4669,32 +5187,46 @@ 
 	// Search local taxes
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
-	else
+	if ($firstparamisid) {
+		$sql.= " WHERE t.rowid = ".(int) $vatrate;
+	} else
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
 		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
+		}
+		// local tax in spain use the buyer country ??
+		else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		}
 		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql.= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
-		else return array();
+		if ($obj) {
+			return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
+		} else {
+			return array();
+		}
+	} else {
+		dol_print_error($db);
 	}
-	else dol_print_error($db);
 
 	return array();
 }
@@ -4724,22 +5256,32 @@ 
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-	if ($firstparamisid) $sql.= " WHERE t.rowid = ".(int) $vatrate;
-	else
+	if ($firstparamisid) {
+		$sql.= " WHERE t.rowid = ".(int) $vatrate;
+	} else
 	{
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {
+			// If vat is "xx (yy)"
 		{
 			$vatratecleaned = $reg[1];
+		}
 			$vatratecode = $reg[2];
 		}
 
 		$sql.=", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
+		}
+		// local tax in spain use the buyer country ??
+		else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		}
 		$sql.= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql.= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) {
+			$sql.= " AND t.code = '".$vatratecode."'";
+		}
 	}
 
 	$resql=$db->query($sql);
@@ -4751,43 +5293,36 @@ 
 			if (! isOnlyOneLocalTax(1))
 			{
 				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
+			} else
 			{
 				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
-		}
-		elseif ($local == 2)
+		} elseif ($local == 2)
 		{
 			if (! isOnlyOneLocalTax(2))
 			{
 				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell, $obj->accountancy_code_buy);
-			}
-			else
+			} else
 			{
 				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell, $obj->accountancy_code_buy);
 			}
-		}
-		else
+		} else
 		{
 			if(! isOnlyOneLocalTax(1))
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
 					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
-				}
-				else
+				} else
 				{
 					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
-			}
-			else
+			} else
 			{
 				if(! isOnlyOneLocalTax(2))
 				{
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-				}
-				else
+				} else
 				{
 					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2, $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 				}
@@ -4823,22 +5358,26 @@ 
 		$product=new Product($db);
 		$result=$product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" order or invoice
 			{
 				$product->get_buyprice($idprodfournprice,0,0,0);
+		}
 				$ret=$product->vatrate_supplier;
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
-			}
-			else
+				if ($product->default_vat_code) {
+					$ret.=' ('.$product->default_vat_code.')';
+				}
+			} else
 			{
 				$ret=$product->tva_tx;    // Default vat of product we defined
-				if ($product->default_vat_code) $ret.=' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret.=' ('.$product->default_vat_code.')';
+				}
 			}
 			$found=1;
-		}
-		else
+		} else
 		{
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
@@ -4865,10 +5404,13 @@ 
 					$ret=$obj->vat_rate;
 				}
 				$db->free($sql);
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
+		} else {
+			$ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
 		}
-		else $ret=$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
+		// Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -4901,7 +5443,8 @@ 
 		$product=new Product($db);
 		$result=$product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
+		if ($mysoc->country_code == $thirdparty_seller->country_code) {
+			// If selling country is ours
 		{
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
@@ -4921,6 +5464,7 @@ 
 	{
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
 		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
@@ -4932,11 +5476,15 @@ 
 			$obj=$db->fetch_object($resql);
 			if ($obj)
 			{
-				if ($local==1) $ret=$obj->localtax1;
-				elseif ($local==2) $ret=$obj->localtax2;
+				if ($local==1) {
+					$ret=$obj->localtax1;
+				} elseif ($local==2) {
+					$ret=$obj->localtax2;
+				}
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -4998,11 +5546,13 @@ 
 
 	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code,array('FR,MC')) && in_array($buyer_country_code,array('FR','MC')))) // Warning ->country_code not always defined
+	|| (in_array($seller_country_code,array('FR,MC')) && in_array($buyer_country_code,array('FR','MC')))) {
+		// Warning ->country_code not always defined
 	{
 		//print 'VATRULE 2';
 		return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
 	}
+	}
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.
 	// Not supported
@@ -5016,8 +5566,7 @@ 
 		{
 			//print 'VATRULE 3';
 			return 0;
-		}
-		else
+		} else
 		{
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod,$thirdparty_seller,$idprodfournprice);
@@ -5047,16 +5596,17 @@ 
 
 	if ($idprodfournprice > 0)
 	{
-		if (! class_exists('ProductFournisseur'))
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+		if (! class_exists('ProductFournisseur')) {
+					require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+		}
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	}
-	elseif ($idprod > 0)
+	} elseif ($idprod > 0)
 	{
-		if (! class_exists('Product'))
-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		if (! class_exists('Product')) {
+					require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		}
 		$prod = new Product($db);
 		$prod->fetch($idprod);
 		return $prod->tva_npr;
@@ -5082,27 +5632,39 @@ 
 {
 	global $mysoc;
 
-	if (!is_object($thirdparty_seller)) return -1;
-	if (!is_object($thirdparty_buyer)) return -1;
+	if (!is_object($thirdparty_seller)) {
+		return -1;
+	}
+	if (!is_object($thirdparty_buyer)) {
+		return -1;
+	}
 
-	if ($local==1) // Localtax 1
+	if ($local==1) {
+		// Localtax 1
 	{
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && ! $thirdparty_buyer->localtax1_assuj) return 0;
-		}
-		else
+	}
+		} else
 		{
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) return 0;
-			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') return 0;
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) {
+				return 0;
+			}
+			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') {
+				return 0;
+			}
 		}
-	}
-	elseif ($local==2) //I Localtax 2
+	} elseif ($local==2) {
+		//I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && ! $thirdparty_seller->localtax2_assuj) return 0;
-		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') return 0;
+	}
+		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') {
+			return 0;
+		}
 	}
 
 	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)
@@ -5125,26 +5687,44 @@ 
 {
 	global $langs;
 	$result='unknown'; $classname='';
-	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
+	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {
+		// A mettre avant test sur no a cause du == 0
 	{
 		$result=$langs->trans('yes');
-		if ($case == 1 || $case == 3) $result=$langs->trans("Yes");
-		if ($case == 2) $result='<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="1" checked disabled> '.$result;
+	}
+		if ($case == 1 || $case == 3) {
+			$result=$langs->trans("Yes");
+		}
+		if ($case == 2) {
+			$result='<input type="checkbox" value="1" checked disabled>';
+		}
+		if ($case == 3) {
+			$result='<input type="checkbox" value="1" checked disabled> '.$result;
+		}
 
 		$classname='ok';
-	}
-	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result=$langs->trans("no");
-		if ($case == 1 || $case == 3) $result=$langs->trans("No");
-		if ($case == 2) $result='<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result='<input type="checkbox" value="0" disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result=$langs->trans("No");
+		}
+		if ($case == 2) {
+			$result='<input type="checkbox" value="0" disabled>';
+		}
+		if ($case == 3) {
+			$result='<input type="checkbox" value="0" disabled> '.$result;
+		}
 
-		if ($color == 2) $classname='ok';
-		else $classname='error';
+		if ($color == 2) {
+			$classname='ok';
+		} else {
+			$classname='error';
+		}
+	}
+	if ($color) {
+		return '<font class="'.$classname.'">'.$result.'</font>';
 	}
-	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
 }
 
@@ -5171,18 +5751,28 @@ 
 	$path = '';
 
 	$arrayforoldpath=array('cheque','user','category','holiday','supplier_invoice','invoice_supplier','mailing','supplier_payment');
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product';
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		$arrayforoldpath[]='product';
+	}
 	if (! empty($level) && in_array($modulepart, $arrayforoldpath))
 	{
 		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-		if (empty($alpha)) $num = preg_replace('/([^0-9])/i','',$num);
-		else $num = preg_replace('/^.*\-/i','',$num);
+		if (empty($alpha)) {
+			$num = preg_replace('/([^0-9])/i','',$num);
+		} else {
+			$num = preg_replace('/^.*\-/i','',$num);
+		}
 		$num = substr("000".$num, -$level);
-		if ($level == 1) $path = substr($num,0,1);
-		if ($level == 2) $path = substr($num,1,1).'/'.substr($num,0,1);
-		if ($level == 3) $path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
-	}
-	else
+		if ($level == 1) {
+			$path = substr($num,0,1);
+		}
+		if ($level == 2) {
+			$path = substr($num,1,1).'/'.substr($num,0,1);
+		}
+		if ($level == 3) {
+			$path = substr($num,2,1).'/'.substr($num,1,1).'/'.substr($num,0,1);
+		}
+	} else
 	{
 		// TODO
 		// We will enhance here a common way of forging path for document storage
@@ -5193,7 +5783,9 @@ 
 		}
 	}
 
-	if (empty($withoutslash) && ! empty($path)) $path.='/';
+	if (empty($withoutslash) && ! empty($path)) {
+		$path.='/';
+	}
 
 	return $path;
 }
@@ -5213,7 +5805,9 @@ 
 	dol_syslog("functions.lib::dol_mkdir: dir=".$dir,LOG_INFO);
 
 	$dir_osencoded=dol_osencode($dir);
-	if (@is_dir($dir_osencoded)) return 0;
+	if (@is_dir($dir_osencoded)) {
+		return 0;
+	}
 
 	$nberr=0;
 	$nbcreated=0;
@@ -5229,9 +5823,15 @@ 
 	$num=count($cdir);
 	for ($i = 0; $i < $num; $i++)
 	{
-		if ($i > 0) $ccdir .= '/'.$cdir[$i];
-		else $ccdir .= $cdir[$i];
-		if (preg_match("/^.:$/",$ccdir,$regs)) continue;	// Si chemin Windows incomplet, on poursuit par rep suivant
+		if ($i > 0) {
+			$ccdir .= '/'.$cdir[$i];
+		} else {
+			$ccdir .= $cdir[$i];
+		}
+		if (preg_match("/^.:$/",$ccdir,$regs)) {
+			continue;
+		}
+		// Si chemin Windows incomplet, on poursuit par rep suivant
 
 		// Attention, le is_dir() peut echouer bien que le rep existe.
 		// (ex selon config de open_basedir)
@@ -5253,15 +5853,13 @@ 
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.",LOG_WARNING);
 					$nberr++;
-				}
-				else
+				} else
 				{
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created",LOG_DEBUG);
 					$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
-			}
-			else
+			} else
 			{
 				$nberr=0;	// On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
@@ -5310,7 +5908,9 @@ 
 	// $temp after pass 2: 0000-021
 
 	// Supprime aussi les retours
-	if ($removelinefeed) $temp=str_replace(array("\r\n","\r","\n")," ",$temp);
+	if ($removelinefeed) {
+		$temp=str_replace(array("\r\n","\r","\n")," ",$temp);
+	}
 
 	// et les espaces doubles
 	while(strpos($temp,"  "))
@@ -5339,14 +5939,12 @@ 
 			$firstline=preg_replace('/<br[^>]*>.*$/s','',$text);		// The s pattern modifier means the . can match newline characters
 			$firstline=preg_replace('/<div[^>]*>.*$/s','',$firstline);	// The s pattern modifier means the . can match newline characters
 
-		}
-		else
+		} else
 		{
 			$firstline=preg_replace('/[\n\r].*/','',$text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text))?'...':'');
-	}
-	else
+	} else
 	{
 		$ishtml=0;
 		if (dol_textishtml($text))
@@ -5354,15 +5952,17 @@ 
 			$text=preg_replace('/\n/','',$text);
 			$ishtml=1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
-		}
-		else
+		} else
 		{
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
 		$text = strtr($text, $repTable);
 		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-		else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+		else {
+			$pattern = '/(<br[^>]*>)/U';
+		}
+		// /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$firstline='';
@@ -5370,8 +5970,11 @@ 
 		$nba = count($a);	// 2x nb of lines in $a because $a contains also a line for each new line separator
 		while (($i < $nba) && ($i < ($nboflines * 2)))
 		{
-			if ($i % 2 == 0) $firstline .= $a[$i];
-			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml?"<br>\n":"\n");
+			if ($i % 2 == 0) {
+				$firstline .= $a[$i];
+			} elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+				$firstline .= ($ishtml?"<br>\n":"\n");
+			}
 			$i++;
 		}
 		unset($a);
@@ -5420,17 +6023,25 @@ 
 function dol_htmlentitiesbr($stringtoencode, $nl2brmode=0, $pagecodefrom='UTF-8', $removelasteolbr=1)
 {
 	$newstring=$stringtoencode;
-	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not
+	if (dol_textishtml($stringtoencode)) {
+		// Check if text is already HTML or not
 	{
-		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-		if ($removelasteolbr) $newstring=preg_replace('/<br>$/i','',$newstring);	// Remove last <br> (remove only last one)
+		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);
+	}
+	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
+		if ($removelasteolbr) {
+			$newstring=preg_replace('/<br>$/i','',$newstring);
+		}
+		// Remove last <br> (remove only last one)
 		$newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__'));
 		$newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom);	// Make entity encoding
 		$newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"'));
-	}
-	else
+	} else
 	{
-		if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring);	// Remove last \n (may remove several)
+		if ($removelasteolbr) {
+			$newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring);
+		}
+		// Remove last \n (may remove several)
 		$newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode);
 	}
 	// Other substitutions that htmlentities does not do
@@ -5528,7 +6139,9 @@ 
  */
 function dol_nboflines($s,$maxchar=0)
 {
-	if ($s == '') return 0;
+	if ($s == '') {
+		return 0;
+	}
 	$arraystring=explode("\n",$s);
 	$nb=count($arraystring);
 
@@ -5548,11 +6161,16 @@ 
 function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 {
 	$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	if (dol_textishtml($text)) {
+		$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	}
 
 	$text = strtr($text, $repTable);
 	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-	else $pattern = '/(<br[^>]*>)/U';							// /U is to have UNGREEDY regex to limit to one html tag.
+	else {
+		$pattern = '/(<br[^>]*>)/U';
+	}
+	// /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 	$nblines = (int) floor((count($a)+1)/2);
@@ -5604,24 +6222,46 @@ 
 {
 	if ($option == 1)
 	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<br/i',$msg))				return true;
+		if (preg_match('/<html/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<body/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<br/i',$msg)) {
+			return true;
+		}
 		return false;
-	}
-	else
-	{
-		if (preg_match('/<html/i',$msg))				return true;
-		elseif (preg_match('/<body/i',$msg))			return true;
-		elseif (preg_match('/<(b|em|i|u)>/i',$msg))		return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) 	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;
-		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i',$msg)) return true;	// must accept <img src="http://example.com/aaa.png" />
-		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i',$msg)) return true;	// must accept <a href="http://example.com/aaa.png" />
-		elseif (preg_match('/<h[0-9]>/i',$msg))			return true;
-		elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg))	return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-		elseif (preg_match('/&#[0-9]{2,3};/i',$msg))	return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+	} else
+	{
+		if (preg_match('/<html/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<body/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(b|em|i|u)>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i',$msg)) {
+			return true;
+		}
+		// must accept <img src="http://example.com/aaa.png" />
+		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i',$msg)) {
+			return true;
+		}
+		// must accept <a href="http://example.com/aaa.png" />
+		elseif (preg_match('/<h[0-9]>/i',$msg)) {
+			return true;
+		} elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) {
+			return true;
+		}
+		// Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+		elseif (preg_match('/&#[0-9]{2,3};/i',$msg)) {
+			return true;
+		}
+		// Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 		return false;
 	}
 }
@@ -5732,8 +6372,7 @@ 
 				$substitutionarray['__SHIPPINGTRACKNUM__']='Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__']='Shipping tracking url';
 			}
-		}
-		else
+		} else
 		{
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
@@ -5745,10 +6384,14 @@ 
 
 			$birthday = dol_print_date($object->birth,'day');
 
-			if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+			if (method_exists($object, 'getCivilityLabel')) {
+				$substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+			}
 			$substitutionarray['__MEMBER_FIRSTNAME__']=$msgishtml?dol_htmlentitiesbr($object->firstname):$object->firstname;
 			$substitutionarray['__MEMBER_LASTNAME__']=$msgishtml?dol_htmlentitiesbr($object->lastname):$object->lastname;
-			if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($outputlangs)):$object->getFullName($outputlangs);
+			if (method_exists($object, 'getFullName')) {
+				$substitutionarray['__MEMBER_FULLNAME__']=$msgishtml?dol_htmlentitiesbr($object->getFullName($outputlangs)):$object->getFullName($outputlangs);
+			}
 			$substitutionarray['__MEMBER_COMPANY__']=$msgishtml?dol_htmlentitiesbr($object->societe):$object->societe;
 			$substitutionarray['__MEMBER_ADDRESS__']=$msgishtml?dol_htmlentitiesbr($object->address):$object->address;
 			$substitutionarray['__MEMBER_ZIP__']=$msgishtml?dol_htmlentitiesbr($object->zip):$object->zip;
@@ -5769,8 +6412,7 @@ 
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:'');
 				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object)?$object->name_alias:'');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object)?$object->email:'');
-			}
-			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+			} elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
@@ -5797,8 +6439,12 @@ 
 				$datenextexpiration='';
 				foreach($object->lines as $line)
 				{
-					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+					if ($line->date_ouverture_prevue > $dateplannedstart) {
+						$dateplannedstart = $line->date_ouverture_prevue;
+					}
+					if ($line->statut == 4 && $line->date_fin_prevue && (! $datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+						$datenextexpiration = $line->date_fin_prevue;
+					}
 				}
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -5827,8 +6473,12 @@ 
 		$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
- 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+ 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+ 			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
+ 		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+		}
 
 		/* TODO Add key for multicurrency
     	$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object)?price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
@@ -5919,9 +6569,13 @@ 
 {
 	global $conf, $langs;
 
-	if (! is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	if (! is_array($substitutionarray)) {
+		return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	}
 
-	if (empty($outputlangs)) $outputlangs=$langs;
+	if (empty($outputlangs)) {
+		$outputlangs=$langs;
+	}
 
 	// Make substitution for language keys
 	if (is_object($outputlangs))
@@ -5929,11 +6583,15 @@ 
 		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text,1)) $msgishtml = 1;
+			if (dol_textishtml($text,1)) {
+				$msgishtml = 1;
+			}
 
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
 			$tmp=explode('|',$reg[1]);
-			if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
+			if (! empty($tmp[1])) {
+				$outputlangs->load($tmp[1]);
+			}
 
 			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
@@ -5944,19 +6602,30 @@ 
 	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))
 	{
 		$msgishtml = 0;
-		if (dol_textishtml($text,1)) $msgishtml = 1;
+		if (dol_textishtml($text,1)) {
+			$msgishtml = 1;
+		}
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-		else $newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
+		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+			$newval = '*****forbidden*****';
+		} else {
+			$newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
+		}
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
 	foreach ($substitutionarray as $key => $value)
 	{
-		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';		// Protection
-		if ($key == '__USER_SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';	// Protection
+		if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value='';
+		}
+		// Protection
+		if ($key == '__USER_SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value='';
+		}
+		// Protection
 
 		$text=str_replace("$key","$value",$text);	// We must keep the " to work when value is 123.5 for example
 	}
@@ -6003,7 +6672,9 @@ 
 		$dir=dol_buildpath($reldir,0);
 
 		// Check if directory exists
-		if (! dol_is_dir($dir)) continue;
+		if (! dol_is_dir($dir)) {
+			continue;
+		}
 
 		$substitfiles=dol_dir_list($dir,'files',0,'functions_');
 		foreach($substitfiles as $substitfile)
@@ -6017,7 +6688,9 @@ 
 				require_once $dir.$substitfile['name'];
 				// Call the user's function, and only if it is defined
 				$function_name=$module."_".$callfunc;
-				if (function_exists($function_name)) $function_name($substitutionarray,$outputlangs,$object,$parameters);
+				if (function_exists($function_name)) {
+					$function_name($substitutionarray,$outputlangs,$object,$parameters);
+				}
 			}
 		}
 	}
@@ -6053,7 +6726,9 @@ 
 
 	$out='';
 
-	if (! is_object($outputlangs)) $outputlangs=$langs;
+	if (! is_object($outputlangs)) {
+		$outputlangs=$langs;
+	}
 
 	if ($date_start && $date_end)
 	{
@@ -6085,21 +6760,25 @@ 
 
 	$ret='';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	if ($nameorder < 0) {
+		$nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION));
+	}
 	if ($nameorder && ((string) $nameorder != '2'))
 	{
 		$ret.=$firstname;
-		if ($firstname && $lastname) $ret.=' ';
+		if ($firstname && $lastname) {
+			$ret.=' ';
+		}
 		$ret.=$lastname;
-	}
-	else if ($nameorder == 2)
+	} else if ($nameorder == 2)
 	{
 	   $ret.=$firstname;
-	}
-	else
+	} else
 	{
 		$ret.=$lastname;
-		if ($firstname && $lastname) $ret.=' ';
+		if ($firstname && $lastname) {
+			$ret.=' ';
+		}
 		$ret.=$firstname;
 	}
 	return $ret;
@@ -6119,15 +6798,18 @@ 
 function setEventMessage($mesgs, $style='mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
-	if (! is_array($mesgs))		// If mesgs is a string
+	if (! is_array($mesgs)) {
+		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
 	}
-	else						// If mesgs is an array
+	} else						// If mesgs is an array
 	{
 		foreach($mesgs as $mesg)
 		{
-			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
+			if ($mesg) {
+				$_SESSION['dol_events'][$style][] = $mesg;
+			}
 		}
 	}
 }
@@ -6144,11 +6826,17 @@ 
  */
 function setEventMessages($mesg, $mesgs, $style='mesgs')
 {
-	if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter style='.$style.' for setEventMessages');
-	if (empty($mesgs)) setEventMessage($mesg, $style);
-	else
+	if (! in_array((string) $style, array('mesgs','warnings','errors'))) {
+		dol_print_error('','Bad parameter style='.$style.' for setEventMessages');
+	}
+	if (empty($mesgs)) {
+		setEventMessage($mesg, $style);
+	} else
 	{
-		if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
+		if (! empty($mesg) && ! in_array($mesg, $mesgs)) {
+			setEventMessage($mesg, $style);
+		}
+		// Add message string if not already into array
 		setEventMessage($mesgs, $style);
 	}
 }
@@ -6166,19 +6854,25 @@ 
 {
 	// Show mesgs
 	if (isset($_SESSION['dol_events']['mesgs'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		}
 		unset($_SESSION['dol_events']['mesgs']);
 	}
 
 	// Show errors
 	if (isset($_SESSION['dol_events']['errors'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		}
 		unset($_SESSION['dol_events']['errors']);
 	}
 
 	// Show warnings
 	if (isset($_SESSION['dol_events']['warnings'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		}
 		unset($_SESSION['dol_events']['warnings']);
 	}
 }
@@ -6222,7 +6916,9 @@ 
 			{
 				$ret++;
 				$out.= $langs->trans($message);
-				if ($ret < count($mesgarray)) $out.= "<br>\n";
+				if ($ret < count($mesgarray)) {
+					$out.= "<br>\n";
+				}
 			}
 		}
 		if ($mesgstring)
@@ -6252,8 +6948,7 @@ 
 						}
 					});
 				</script>';
-		}
-		else
+		} else
 		{
 			$return = $out;
 		}
@@ -6293,7 +6988,9 @@ 
  */
 function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepembedded=0)
 {
-	if (empty($mesgstring) && (! is_array($mesgarray) || count($mesgarray) == 0)) return;
+	if (empty($mesgstring) && (! is_array($mesgarray) || count($mesgarray) == 0)) {
+		return;
+	}
 
 	$iserror=0;
 	$iswarning=0;
@@ -6304,11 +7001,17 @@ 
 			if ($val && preg_match('/class="error"/i',$val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i',$val)) { $iswarning++; break; }
 		}
+	} else if ($mesgstring && preg_match('/class="error"/i',$mesgstring)) {
+		$iserror++;
+	} else if ($mesgstring && preg_match('/class="warning"/i',$mesgstring)) {
+		$iswarning++;
+	}
+	if ($style=='error') {
+		$iserror++;
+	}
+	if ($style=='warning') {
+		$iswarning++;
 	}
-	else if ($mesgstring && preg_match('/class="error"/i',$mesgstring)) $iserror++;
-	else if ($mesgstring && preg_match('/class="warning"/i',$mesgstring)) $iswarning++;
-	if ($style=='error') $iserror++;
-	if ($style=='warning') $iswarning++;
 
 	if ($iserror || $iswarning)
 	{
@@ -6330,9 +7033,10 @@ 
 			$mesgarray=$newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring,$mesgarray,($iserror?'error':'warning'),$keepembedded);
+	} else {
+		print get_htmloutput_mesg($mesgstring,$mesgarray,'ok',$keepembedded);
+	}
 	}
-	else print get_htmloutput_mesg($mesgstring,$mesgarray,'ok',$keepembedded);
-}
 
 /**
  *  Print formated error messages to output (Used to show messages on html output).
@@ -6372,13 +7076,18 @@ 
 	if (is_array($array) && $sizearray>0)
 	{
 		$temp = array();
-		foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
+		foreach(array_keys($array) as $key) {
+			$temp[$key]=$array[$key][$index];
+		}
 
-		if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
-		else
+		if (!$natsort) {
+			($order=='asc') ? asort($temp) : arsort($temp);
+		} else
 		{
 			($case_sensitive) ? natsort($temp) : natcasesort($temp);
-			if($order!='asc') $temp=array_reverse($temp,TRUE);
+			if($order!='asc') {
+				$temp=array_reverse($temp,TRUE);
+			}
 		}
 
 		$sorted = array();
@@ -6406,17 +7115,39 @@ 
 	$strLength = dol_strlen($str);
 	for ($i=0; $i<$strLength; $i++)
 	{
-		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
-		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
+		if (ord($str[$i]) < 0x80) {
+			continue;
+		}
+		// 0bbbbbbb
+		elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
 			return false;
 		}
+		// Does not match any model
+		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+						return false;
+			}
+		}
 	}
 	return true;
 }
@@ -6434,11 +7165,21 @@ 
 	global $conf;
 
 	$tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
-	if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows
-	if (empty($tmp)) $tmp='utf-8';										// By default for other
-	if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
+	if (empty($tmp) && ! empty($_SERVER["WINDIR"])) {
+		$tmp='iso-8859-1';
+	}
+	// By default for windows
+	if (empty($tmp)) {
+		$tmp='utf-8';
+	}
+	// By default for other
+	if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+		$tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
+	}
 
-	if ($tmp == 'iso-8859-1') return utf8_decode($str);
+	if ($tmp == 'iso-8859-1') {
+		return utf8_decode($str);
+	}
 	return $str;
 }
 
@@ -6461,31 +7202,39 @@ 
 	global $cache_codes;
 
 	// If key empty
-	if ($key == '') return '';
+	if ($key == '') {
+		return '';
+	}
 
 	// Check in cache
-	if (isset($cache_codes[$tablename][$key]))	// Can be defined to 0 or ''
+	if (isset($cache_codes[$tablename][$key])) {
+		// Can be defined to 0 or ''
 	{
-		return $cache_codes[$tablename][$key];   // Found in cache
+		return $cache_codes[$tablename][$key];
+	}
+	// Found in cache
 	}
 
 	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql.= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
-	if (! empty($entityfilter))
-		$sql.= " AND entity IN (" . getEntity($tablename) . ")";
+	if (! empty($entityfilter)) {
+			$sql.= " AND entity IN (" . getEntity($tablename) . ")";
+	}
 
 	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key]=$obj->valuetoget;
-		else $cache_codes[$tablename][$key]='';
+		if ($obj) {
+			$cache_codes[$tablename][$key]=$obj->valuetoget;
+		} else {
+			$cache_codes[$tablename][$key]='';
+		}
 		$db->free($resql);
 		return $cache_codes[$tablename][$key];
-	}
-	else
+	} else
 	{
 		return -1;
 	}
@@ -6542,13 +7291,18 @@ 
 	//print $s."<br>\n";
 	if ($returnvalue)
 	{
-		if ($hideerrors) return @eval('return '.$s.';');
-		else return eval('return '.$s.';');
-	}
-	else
+		if ($hideerrors) {
+			return @eval('return '.$s.';');
+		} else {
+			return eval('return '.$s.';');
+		}
+	} else
 	{
-		if ($hideerrors) @eval($s);
-		else eval($s);
+		if ($hideerrors) {
+			@eval($s);
+		} else {
+			eval($s);
+		}
 	}
 }
 
@@ -6574,9 +7328,13 @@ 
 {
 	global $langs;
 
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
 	if ($codelang == 'auto')
 	{
@@ -6591,8 +7349,9 @@ 
 		'sv_SV' => 'se'
 	);
 
-	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else
+	if (isset($langtocountryflag[$codelang])) {
+		$flagImage = $langtocountryflag[$codelang];
+	} else
 	{
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
@@ -6642,50 +7401,62 @@ 
 
 			if ($mode == 'add' && ! preg_match('/^\-/',$values[1]))
 			{
-				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+				if (count($values) == 6) {
+					// new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
 				{
 					if ($values[0] != $type) continue;
+				}
 
 					if (verifCond($values[4]))
 					{
-						if ($values[3]) $langs->load($values[3]);
+						if ($values[3]) {
+							$langs->load($values[3]);
+						}
 						if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
 						{
 							$substitutionarray=array();
 							complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
 							$label=make_substitutions($reg[1], $substitutionarray);
+						} else {
+							$label=$langs->trans($values[2]);
 						}
-						else $label=$langs->trans($values[2]);
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+','',$values[1]);
 						$h++;
 					}
-				}
-				else if (count($values) == 5)       // deprecated
+				} else if (count($values) == 5) {
+					// deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
+				}
 
-					if ($values[0] != $type) continue;
-					if ($values[3]) $langs->load($values[3]);
+					if ($values[0] != $type) {
+						continue;
+					}
+					if ($values[3]) {
+						$langs->load($values[3]);
+					}
 					if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
 					{
 						$substitutionarray=array();
 						complete_substitutions_array($substitutionarray,$langs,$object,array('needforkey'=>$values[2]));
 						$label=make_substitutions($reg[1], $substitutionarray);
+					} else {
+						$label=$langs->trans($values[2]);
 					}
-					else $label=$langs->trans($values[2]);
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && ! empty($object->id))?$object->id:''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+','',$values[1]);
 					$h++;
 				}
-			}
-			else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
+			} else if ($mode == 'remove' && preg_match('/^\-/',$values[1]))
 			{
-				if ($values[0] != $type) continue;
+				if ($values[0] != $type) {
+					continue;
+				}
 				$tabname=str_replace('-','',$values[1]);
 				foreach($head as $key => $val)
 				{
@@ -6728,14 +7499,19 @@ 
 	global $conf, $hookmanager;
 	global $micro_start_time;
 
-	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
-	else print "\n".'<!-- Common footer for public page -->'."\n";
+	if ($zone == 'private') {
+		print "\n".'<!-- Common footer for private page -->'."\n";
+	} else {
+		print "\n".'<!-- Common footer for public page -->'."\n";
+	}
 
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('printCommonFooter',$parameters);    // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook))
 	{
-		if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
+		if (! empty($conf->global->MAIN_HTML_FOOTER)) {
+			print $conf->global->MAIN_HTML_FOOTER."\n";
+		}
 
 		print "\n";
 		if (! empty($conf->use_javascript_ajax))
@@ -6779,11 +7555,15 @@ 
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (! empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				if (! empty($conf->global->MEMCACHED_SERVER)) {
+					print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				}
 				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
-				if (! empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
+				if (! empty($micro_start_time)) {
+					// Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 				{
 					$micro_end_time = microtime(true);
+				}
 					print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
 				}
 				if (function_exists("memory_get_usage"))
@@ -6921,7 +7701,9 @@ 
 
 	$crits = explode(' ', $value);
 	$res = '';
-	if (! is_array($fields)) $fields = array($fields);
+	if (! is_array($fields)) {
+		$fields = array($fields);
+	}
 
 	$nboffields = count($fields);
 	$end2 = count($crits);
@@ -6948,20 +7730,17 @@ 
 					if (is_numeric($numnewcrit))
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' '.$operator.' '.$numnewcrit;
-					}
-					else
+					} else
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2';	// force false
 					}
 					$i2++;	// a criteria was added to string
 				}
-			}
-			else if ($mode == 2)
+			} else if ($mode == 2)
 			{
 				$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";
 				$i2++;	// a criteria was added to string
-			}
-			else if ($mode == 3)
+			} else if ($mode == 3)
 			{
 				$tmparray=explode(',',trim($crit));
 				if (count($tmparray))
@@ -6978,8 +7757,7 @@ 
 					$newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";
 					$i2++;	// a criteria was added to string
 				}
-			}
-			else    // $mode=0
+			} else    // $mode=0
 			{
 				$textcrit = '';
 				$tmpcrits = explode('|',$crit);
@@ -6988,11 +7766,12 @@ 
 				{
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
-					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
+					if (preg_match('/\.(id|rowid)$/', $field)) {
+						// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field . " = " . (is_numeric(trim($tmpcrit))?trim($tmpcrit):'0');
 					}
-					else
+					} else
 					{
 						$newres .= $field . " LIKE '";
 
@@ -7025,7 +7804,9 @@ 
 			}
 			$i++;
 		}
-		if ($newres) $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
+		if ($newres) {
+			$res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : '');
+		}
 		$j++;
 	}
 	$res = ($nofirstand?"":" AND ")."(" . $res . ")";
@@ -7066,21 +7847,37 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget='')
 {
 	$dirName = dirname($file);
-	if ($dirName == '.') $dirName='';
+	if ($dirName == '.') {
+		$dirName='';
+	}
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.png$/i',$file)?'.png':'');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
+	}
 
-	if (! $extImgTarget) return $file;
+	if (! $extImgTarget) {
+		return $file;
+	}
 
 	$subdir='';
-	if ($extName) $subdir = 'thumbs/';
+	if ($extName) {
+		$subdir = 'thumbs/';
+	}
 
 	return ($dirName?$dirName.'/':'').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
@@ -7099,7 +7896,9 @@ 
 {
 	global $conf, $langs;
 
-	if (empty($conf->use_javascript_ajax)) return '';
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
 
 	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -7108,14 +7907,20 @@ 
 
 	if ($alldata == 1)
 	{
-		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
-		else return array();
+		if ($num_mime !== false) {
+			return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath), 'mime'=>dol_mimetype($relativepath), );
+		} else {
+			return array();
+		}
 	}
 
 	// old behavior
-	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
-	else return '';
-}
+	if ($num_mime !== false) {
+		return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param?'&'.$param:'')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+	} else {
+		return '';
+	}
+	}
 
 
 /**
@@ -7132,7 +7937,9 @@ 
 				    jQuery("#'.$htmlname.'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) {
+		$out.=' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	}
 	return $out;
 }
 
@@ -7269,7 +8076,9 @@ 
 	{
 		$dictvalues[$tablename] = array();
 		$sql = 'SELECT * FROM '.$tablename.' WHERE 1';
-		if ($checkentity) $sql.= ' entity IN (0,'.getEntity('').')';
+		if ($checkentity) {
+			$sql.= ' entity IN (0,'.getEntity('').')';
+		}
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -7278,17 +8087,21 @@ 
 			{
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
 	}
 
-	if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found
+	if (!empty($dictvalues[$tablename][$id])) {
+		return $dictvalues[$tablename][$id]->{$field};
+	}
+	// Found
 	else // Not found
 	{
-		if ($id > 0) return $id;
+		if ($id > 0) {
+			return $id;
+		}
 		return '';
 	}
 }
@@ -7306,13 +8119,14 @@ 
 	{
 		$res = 0;
 		$tmp=explode(',', $stringcolor);
-		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
+		if (count($tmp) > 1) {
+			// This is a comma RGB ('255','255','255')
 		{
 			$r = $tmp[0];
+		}
 			$g = $tmp[1];
 			$b = $tmp[2];
-		}
-		else
+		} else
 		{
 			$hexr=$stringcolor[0].$stringcolor[1];
 			$hexg=$stringcolor[2].$stringcolor[3];
@@ -7322,7 +8136,9 @@ 
 			$b = hexdec($hexb);
 		}
 		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-		if ($bright > 0.6) $res = 1;
+		if ($bright > 0.6) {
+			$res = 1;
+		}
 	}
 	return $res;
 }
@@ -7341,7 +8157,10 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
+	if (empty($menuentry['enabled'])) {
+		return 0;
+	}
+	// Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
 		$tmploops=explode('|',$menuentry['module']);
@@ -7352,10 +8171,22 @@ 
 				$found++; break;
 			}
 		}
-		if (! $found) return 0;	// Entry is for menus all excluded to external users
+		if (! $found) {
+			return 0;
+		}
+		// Entry is for menus all excluded to external users
+	}
+	if (! $menuentry['perms'] && $type_user) {
+		return 0;
+	}
+	// No permissions and user is external
+	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0;
+	}
+	// No permissions and option to hide when not allowed, even for internal user, is on
+	if (! $menuentry['perms']) {
+		return 2;
 	}
-	if (! $menuentry['perms'] && $type_user) return 0; 											// No permissions and user is external
-	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0;	// No permissions and option to hide when not allowed, even for internal user, is on
-	if (! $menuentry['perms']) return 2;															// No permissions and user is external
+	// No permissions and user is external
 	return 1;
 }

htdocs/core/lib/files.lib.php

Braces +491 added lines, -257 removed lines

@@ -97,16 +97,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;
@@ -116,8 +121,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)
 				{
@@ -136,12 +142,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,
@@ -161,16 +173,21 @@ 
 						{
 							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file));
 						}
-					}
-					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,
@@ -197,12 +214,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;
 }
@@ -227,7 +248,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;
@@ -275,12 +298,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();
@@ -326,16 +350,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);
 
@@ -356,13 +385,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
 			}
@@ -387,22 +414,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;
 	}
 }
@@ -417,9 +449,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
@@ -444,7 +479,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;
 }
@@ -466,15 +503,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
 }
 
 /**
@@ -497,11 +540,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;
 	}
@@ -551,11 +595,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';
 
@@ -592,10 +642,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';
 	}
 
@@ -637,10 +691,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);
@@ -664,10 +722,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';
 	}
 
@@ -695,7 +757,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.
@@ -705,7 +769,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));
 	}
@@ -725,8 +791,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
@@ -743,18 +808,18 @@ 
 				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;
@@ -821,8 +886,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
@@ -831,9 +897,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);
 
@@ -842,16 +910,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);
@@ -859,10 +931,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);
@@ -879,18 +952,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
@@ -934,9 +1011,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;
 		}
 	}
@@ -1044,13 +1123,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);
@@ -1077,11 +1160,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
@@ -1134,12 +1218,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;
 
@@ -1155,17 +1240,22 @@ 
 			{
 				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);
+						}
 
 							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';
@@ -1180,21 +1270,28 @@ 
 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							}
 						}
+					} 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 of not exists, we must 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;
@@ -1244,19 +1341,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++;
+						}
 					}
 				}
 			}
@@ -1266,7 +1367,9 @@ 
 			{
 				$result=dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+					$countdeleted++;
+				}
 			}
 		}
 	}
@@ -1290,15 +1393,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 ;
@@ -1331,8 +1444,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		$multiple = $filepreviewold . ".";
 		for ($i = 0; $i < 20; $i++)
@@ -1366,18 +1478,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)
 	{
@@ -1417,12 +1540,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);
 	}
@@ -1484,9 +1607,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];
@@ -1520,9 +1645,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';
 
@@ -1562,19 +1689,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');
 					}
@@ -1601,8 +1729,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1633,16 +1760,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))
@@ -1682,9 +1820,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);
 
@@ -1747,8 +1887,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)
@@ -1796,32 +1940,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;
 	}
@@ -1843,9 +1988,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'))
 			{
@@ -1865,14 +2008,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");
@@ -1900,8 +2041,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
@@ -1916,8 +2058,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+				return array();
+			} else {
+				return array('error'=>$errmsg);
+			}
 		}
 	}
 
@@ -1931,8 +2076,7 @@ 
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
+		} else
 		{
 			return array('error'=>'ErrUnzipFails');
 		}
@@ -1966,9 +2110,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'))
             {
@@ -2021,13 +2163,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");
@@ -2073,13 +2213,20 @@ 
 	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;
+		}
 	}
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
@@ -2088,7 +2235,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;
 
@@ -2102,7 +2251,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;
 	}
@@ -2143,132 +2294,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->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_output.'/'.$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->dir_temp))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_temp.'/'.$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
@@ -2331,7 +2526,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;
@@ -2343,7 +2540,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;
@@ -2369,64 +2568,56 @@ 
 			$accessallowed=1;
 		}
 		$original_file=$conf->propal->dir_output.'/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->propal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->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))
 		{
@@ -2488,8 +2679,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))
 		{
@@ -2538,8 +2728,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
@@ -2594,13 +2787,18 @@ 
 	// 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 contrats
@@ -2681,14 +2879,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;
 	}
 
@@ -2697,7 +2899,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;
 	}
 
@@ -2725,45 +2929,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
+		} 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;
 			}
 
@@ -2771,12 +2992,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;
 			}
 		}
@@ -2794,11 +3018,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(
@@ -2820,7 +3046,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);
@@ -2874,9 +3102,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;
 
@@ -2885,27 +3115,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;
 }

htdocs/societe/class/societe.class.php

Braces +564 added lines, -333 removed lines

@@ -446,15 +446,25 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
+		if (empty($this->status)) {
+			$this->status=0;
+		}
 		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->name=ucwords($this->name);
+		}
 		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->client)) {
+			$this->client=0;
+		}
+		if (empty($this->fournisseur)) {
+			$this->fournisseur=0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -468,8 +478,12 @@ 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this,1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -516,32 +530,32 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
+				} else {
+					$error++;
 				}
-				else $error++;
 
 				if (! $error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
 					$result=-1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$result=-2;
@@ -550,8 +564,7 @@ 
 				return $result;
 			}
 
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -703,8 +716,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
@@ -731,7 +743,9 @@ 
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+			$result = -4;
+		}
 
 		return $result;
 	}
@@ -753,7 +767,9 @@ 
 		global $langs,$conf,$hookmanager;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		$error=0;
 
@@ -796,9 +812,13 @@ 
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -812,8 +832,13 @@ 
 		$this->localtax1_value=trim($this->localtax1_value);
 		$this->localtax2_value=trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') {
+			$this->capital=price2num(trim($this->capital));
+		}
+		if (! is_numeric($this->capital)) {
+			$this->capital = '';
+		}
+		// '' = undef
 
 		$this->effectif_id=trim($this->effectif_id);
 		$this->forme_juridique_code=trim($this->forme_juridique_code);
@@ -822,8 +847,12 @@ 
 		$this->barcode=trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+			$this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+			$this->get_codefournisseur($this,1);
+		}
 
 		$this->code_compta=trim($this->code_compta);
 		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
@@ -843,7 +872,9 @@ 
 			if (empty($this->code_compta))
 			{
 				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$customer=true;
@@ -856,7 +887,9 @@ 
 			if (empty($this->code_compta_fournisseur))
 			{
 				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+					return -1;
+				}
 			}
 
 			$supplier=true;
@@ -926,22 +959,26 @@ 
 				if($this->localtax1_value!='')
 				{
 					$sql .=",localtax1_value =".$this->localtax1_value;
+				} else {
+					$sql .=",localtax1_value =0.000";
 				}
-				else $sql .=",localtax1_value =0.000";
 
+			} else {
+				$sql .=",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
 
 			if($this->localtax2_assuj==1)
 			{
 				if($this->localtax2_value!='')
 				{
 					$sql .=",localtax2_value =".$this->localtax2_value;
+				} else {
+					$sql .=",localtax2_value =0.000";
 				}
-				else $sql .=",localtax2_value =0.000";
 
+			} else {
+				$sql .=",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1034,8 +1071,7 @@ 
 								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 								$error++;
 							}
-						}
-						else if ($result < 0)
+						} else if ($result < 0)
 						{
 							$this->error=$lmember->error;
 							$error++;
@@ -1052,22 +1088,27 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+						// For avoid conflicts if trigger used
 					{
 						$result=$this->insertExtraFields();
+					}
 						if ($result < 0)
 						{
 							$error++;
 						}
 					}
+				} else if ($reshook < 0) {
+					$error++;
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && $call_trigger)
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
@@ -1076,22 +1117,19 @@ 
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
+				} else
 				{
 					$this->error = $this->db->lasterror();
 					$result = -2;
@@ -1099,8 +1137,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 	   {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -1130,7 +1167,9 @@ 
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+			return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1167,18 +1206,42 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($nom_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+			$sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+			$sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+			$sql .= " AND s.nom_alias = '".$this->db->escape($nom_alias)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+			$sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		}
+		if ($idprof1) {
+			$sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+			$sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+			$sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+			$sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+			$sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+			$sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+			$sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1189,10 +1252,11 @@ 
 				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num) {
+				// $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
+			}
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
@@ -1320,22 +1384,22 @@ 
 				// Retreive all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+			$this->price_level=1;
+		}
 
 		return $result;
 	}
@@ -1370,10 +1434,11 @@ 
 		$sql.= " WHERE entity IN (".getEntity('category').")";
 		if (! empty($type))
 		{
-			if ($type == 1 || $type == 2)
-				$sql.= " AND client = ".$type;
-			elseif ($type == 3)
-				$sql.= " AND fournisseur = 1";
+			if ($type == 1 || $type == 2) {
+							$sql.= " AND client = ".$type;
+			} elseif ($type == 3) {
+							$sql.= " AND fournisseur = 1";
+			}
 		}
 		if (! empty($name))
 		{
@@ -1382,27 +1447,27 @@ 
 				if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
 				{
 					$name = str_replace('*', '%', $name);
-				}
-				else
+				} else
 				{
 					$name = '%'.$name.'%';
 				}
 			}
 			$sql.= " AND ";
-			if (is_array($filters) && ! empty($filters))
-				$sql.= "(";
+			if (is_array($filters) && ! empty($filters)) {
+							$sql.= "(";
+			}
 			if ($similar)
 			{
 				// For test similitude (string inside name into database, or name into database inside string)
 				// Do not use this. Not compatible with other database.
 				$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
-			}
-			else
+			} else
 			{
-				if (! $case)
-					$sql.= "nom LIKE '".$this->db->escape($name)."'";
-				else
-					$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+				if (! $case) {
+									$sql.= "nom LIKE '".$this->db->escape($name)."'";
+				} else {
+									$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
+				}
 			}
 		}
 		if (is_array($filters) && ! empty($filters))
@@ -1414,19 +1479,20 @@ 
 					if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
 					{
 						$value = str_replace('*', '%', $value);
-					}
-					else
+					} else
 					{
 						$value = '%'.$value.'%';
 					}
 				}
-				if (! $case)
-					$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
-				else
-					$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+				if (! $case) {
+									$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
+				} else {
+									$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
+				}
+			}
+			if (! empty($name)) {
+							$sql.= ")";
 			}
-			if (! empty($name))
-				$sql.= ")";
 		}
 
 		$res  = $this->db->query($sql);
@@ -1440,8 +1506,7 @@ 
 			}
 
 			return $thirdparties;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1460,7 +1525,9 @@ 
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) {
+			$fuser=$user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1480,7 +1547,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -1525,9 +1594,11 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+				// For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -1562,15 +1633,15 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
+		} else {
+			dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1584,7 +1655,10 @@ 
 		if ($this->id)
 		{
 			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+				$newclient=3;
+			}
+			//If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql.= " SET client = ".$newclient;
 			$sql.= " WHERE rowid = " . $this->id;
@@ -1594,8 +1668,9 @@ 
 			{
 				$this->client = $newclient;
 				return 1;
+			} else {
+				return -1;
 			}
-			else return -1;
 		}
 		return 0;
 	}
@@ -1705,14 +1780,14 @@ 
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error=$discount->error;
 				return -3;
 			}
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -1732,8 +1807,7 @@ 
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$discountstatic->error;
 			return -1;
@@ -1760,9 +1834,9 @@ 
 			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql.= " AND ug.entity = ".$conf->entity.")";
 			$sql.= " OR u.admin = 1)";
+		} else {
+					$sql.= " WHERE entity in (0, ".$conf->entity.")";
 		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -1785,8 +1859,7 @@ 
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1892,7 +1965,10 @@ 
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) {
+			$notooltip=1;
+		}
+		// Force disable tooltips
 
 		$name=$this->name?$this->name:$this->nom;
 
@@ -1902,23 +1978,28 @@ 
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
 				)
-			)
-			$code = $this->code_client . ' - ';
+			) {
+						$code = $this->code_client . ' - ';
+			}
 
 			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
 				)
-			)
-			$code .= $this->code_fournisseur . ' - ';
+			) {
+						$code .= $this->code_fournisseur . ' - ';
+			}
 
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-				$name =$code.' '.$name;
-			else
-				$name =$code;
+			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
+							$name =$code.' '.$name;
+			} else {
+							$name =$code;
+			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+			$name .= ' ('.$this->name_alias.')';
+		}
 
 		$result=''; $label='';
 		$linkstart=''; $linkend='';
@@ -1936,38 +2017,31 @@ 
 		{
 		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		else if ($option == 'supplier')
+		} else if ($option == 'supplier')
 		{
 			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		else if ($option == 'agenda')
+		} else if ($option == 'agenda')
 		{
 			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		else if ($option == 'project')
+		} else if ($option == 'project')
 		{
 			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		else if ($option == 'margin')
+		} else if ($option == 'margin')
 		{
 			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		else if ($option == 'contact')
+		} else if ($option == 'contact')
 		{
 			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		else if ($option == 'ban')
+		} else if ($option == 'ban')
 		{
 			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/rib.php?socid='.$this->id;
@@ -1983,21 +2057,29 @@ 
 		if (! empty($this->name))
 		{
 			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+			if (! empty($this->name_alias)) {
+				$label.=' ('.$this->name_alias.')';
+			}
 			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($this->code_client) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && $this->client)
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		if (! empty($this->country_code)) {
+					$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+		}
+		if (! empty($this->tva_intra)) {
+					$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		}
+		if (! empty($this->code_client) && $this->client) {
+					$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+		}
+		if (! empty($this->code_fournisseur) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+		}
+		if (! empty($conf->accounting->enabled) && $this->client) {
+					$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		}
+		if (! empty($conf->accounting->enabled) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		}
 
 		$label.= '</div>';
 
@@ -2005,8 +2087,12 @@ 
 		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values=1;
+		}
+		if ($add_save_lastsearch_values) {
+			$linkstart.='&save_lastsearch_values=1';
+		}
 		$linkstart.='"';
 
 		$linkclose='';
@@ -2028,7 +2114,9 @@ 
 			$hookmanager->initHooks(array('societedao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			if ($reshook > 0) {
+				$linkclose = $hookmanager->resPrint;
+			}
 		}
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
@@ -2041,8 +2129,12 @@ 
 		}
 
 		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		if ($withpicto) {
+			$result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+			$result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		}
 		$result.=$linkend;
 
 		return $result;
@@ -2073,38 +2165,66 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut==0) {
+				return $langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return $langs->trans("InActivity");
+			}
 		}
 		if ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			if ($statut==1) return $langs->trans("InActivity");
+			if ($statut==0) {
+				return $langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return $langs->trans("InActivity");
+			}
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut==0) {
+				return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 		if ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			}
+			if ($statut==1) {
+				return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 	}
 
@@ -2121,7 +2241,9 @@ 
 		$contact_emails = $this->contact_property_array('email',1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) {
+				$this->name=$this->nom;
+			}
 			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2139,9 +2261,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (! empty($this->phone)) {
+			// If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
 			if (empty($this->name)) $this->name=$this->nom;
+		}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
 		}
@@ -2182,24 +2306,30 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') {
+						$property=$obj->email;
+					} else if ($mode == 'mobile') {
+						$property=$obj->phone_mobile;
+					} else {
+						$property=$obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') {
+								$property=$langs->transnoentitiesnoconv("NoEMail");
+							} else if ($mode == 'mobile') {
+								$property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
+						} else
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
@@ -2207,8 +2337,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2240,8 +2369,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2275,8 +2403,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2294,7 +2421,9 @@ 
 	{
 		$contact_property='';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+			return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
@@ -2309,12 +2438,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+					$contact_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
+				} else if ($mode == 'mobile') {
+					$contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2338,8 +2469,7 @@ 
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2349,8 +2479,7 @@ 
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2405,7 +2534,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2435,7 +2566,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$mod = new $module();
 
@@ -2462,18 +2595,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_client) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2496,18 +2637,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_fournisseur) {
+				return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+				return 1;
+			}
+			if ($mod->code_modifiable) {
+				return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2534,7 +2683,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -2542,8 +2693,7 @@ 
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2569,7 +2719,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 
 			$mod = new $module();
@@ -2577,8 +2729,7 @@ 
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2619,21 +2770,25 @@ 
 				// Defini code compta dans $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+					$this->code_compta = $mod->code;
+				} else if ($type == 'supplier') {
+					$this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
+		} else
 		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+				$this->code_compta = '';
+			} else if ($type == 'supplier') {
+				$this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -2658,13 +2813,13 @@ 
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
+		} else {
+			return -1;
 		}
-		else return -1;
 	}
 
 	/**
@@ -2744,22 +2899,26 @@ 
 
 		 //Verify duplicate entries
 		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		if($socid) {
+			$sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -2776,7 +2935,9 @@ 
 
 		$ok=1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			return 1;
+		}
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
@@ -2784,7 +2945,9 @@ 
 			$chaine=trim($this->idprof1);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (dol_strlen($chaine) != 9) return -1;
+			if (dol_strlen($chaine) != 9) {
+				return -1;
+			}
 
 			$sum = 0;
 
@@ -2804,7 +2967,9 @@ 
 				$sum = $sum + $ps;
 			}
 
-			if (substr($sum, -1) != 0) return -1;
+			if (substr($sum, -1) != 0) {
+				return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
@@ -2813,7 +2978,9 @@ 
 			$chaine=trim($this->idprof2);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (dol_strlen($chaine) != 14) return -1;
+			if (dol_strlen($chaine) != 14) {
+				return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
@@ -2824,53 +2991,61 @@ 
 			$string=preg_replace('/(\s)/','',$string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
+			for ($i = 0; $i < 9; $i ++) {
+						$num[$i] = substr($string, $i, 1);
+			}
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						return 0;
+			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 			return 1;
-			else
-			return -1;
+			} else {
+						return -1;
+			}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			for ($i = 1; $i < 8; $i += 2) {
+						$sum += substr((2 * $num[$i]),0,1) + substr((2 * $num[$i]),1,1);
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-			if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+						if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 			return 1;
-			else
-			return -1;
+			} else {
+						return -1;
+			}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-			if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+						if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 			return 2;
-			else
-			return -2;
+			} else {
+						return -2;
+			}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-			if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+						if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 			return 3;
-			else
-			return -3;
+			} else {
+						return -3;
+			}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-			if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+						if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
 			return 3;
-			else
-			return -3;
+			} else {
+						return -3;
+			}
 
 			//Can not be verified
 			return -4;
@@ -2899,17 +3074,27 @@ 
 		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return '';
+			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+				return '';
+			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') $url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;    // See also http://avis-situation-sirene.insee.fr/
+			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+				$url='http://www.societe.com/cgi-bin/search?champs='.$thirdparty->idprof1;
+			}
+			// See also http://avis-situation-sirene.insee.fr/
 			//if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) $url='http://www.companieshouse.gov.uk/WebCHeck/findinfolink/';     // Link no more valid
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$thirdparty->idprof1;
+			}
+			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$thirdparty->idprof1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+			}
 
-			if ($url) return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-		}
-		else
+			if ($url) {
+				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+			}
+		} else
 		{
 			return $hookmanager->resPrint;
 		}
@@ -2930,8 +3115,7 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
@@ -2982,8 +3166,7 @@ 
 
 			$this->db->free($result);
 
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -3000,9 +3183,13 @@ 
 
 		// Define if third party is treated as company (or not) when nature is unknown
 		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) $isacompany=0;
-		else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) $isacompany=1;
+		if (! empty($this->tva_intra)) {
+			$isacompany=1;
+		} else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_PRIVATE'))) {
+			$isacompany=0;
+		} else if (! empty($this->typent_code) && in_array($this->typent_code,array('TE_SMALL','TE_MEDIUM','TE_LARGE','TE_GROUP'))) {
+			$isacompany=1;
+		}
 
 		return $isacompany;
 	}
@@ -3027,8 +3214,7 @@ 
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -3047,9 +3233,10 @@ 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
+			if ($resql=$this->db->query($sql)) {
+				return 0;
+			}
+		} else
 		{
 			return 0;
 		}
@@ -3070,7 +3257,9 @@ 
 		global $user,$langs;
 
 		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		if (empty($name)) {
+			$name=$member->getFullName($langs);
+		}
 
 		$alias = $socalias?$socalias:'';
 
@@ -3107,16 +3296,14 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
@@ -3162,12 +3349,13 @@ 
 		{
 			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			if (! empty($tmp[1])) {
+				// If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
 				$country_code=$tmp[1];
-				$country_label=$tmp[2];
 			}
-			else                    // For backward compatibility
+				$country_label=$tmp[2];
+			} else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3178,7 +3366,9 @@ 
 		$this->country_id=$country_id;
 		$this->country_code=$country_code;
 		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		if (is_object($langs)) {
+			$this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		}
 
 		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3270,17 +3460,22 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+			$sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+			$sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+			$sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3300,8 +3495,9 @@ 
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3322,8 +3518,7 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
    			return (($obj->nb > 0)?true:false);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return false;
@@ -3399,36 +3594,51 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1);
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0);
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1);
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2);
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3);
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
@@ -3458,7 +3668,9 @@ 
 	function getOutstandingProposals($mode='customer')
 	{
 		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+			$table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3478,15 +3690,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3498,7 +3712,9 @@ 
 	function getOutstandingOrders($mode='customer')
 	{
 		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+			$table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3518,15 +3734,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+					// Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3538,7 +3756,9 @@ 
 	function getOutstandingBills($mode='customer')
 	{
 		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+			$table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -3547,8 +3767,11 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+			$sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+			$sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ". $this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
@@ -3567,8 +3790,7 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
+			} else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject=new Facture($this->db);
@@ -3585,18 +3807,19 @@ 
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
 					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != 2) {
+					// Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
+				}
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3640,9 +3863,9 @@ 
 				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
+		} else {
+					return 0;
 		}
-		else
-			return 0;
 	}
 
 	/**
@@ -3666,10 +3889,18 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut==0) {
+			return $langs->trans("NorProspectNorCustomer");
+		}
+		if ($statut==1) {
+			return $langs->trans("Customer");
+		}
+		if ($statut==2) {
+			return $langs->trans("Prospect");
+		}
+		if ($statut==3) {
+			return $langs->trans("ProspectCustomer");
+		}
 
 	}
 
@@ -3696,10 +3927,11 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (! $result) {
+				dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
+		} else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
 			if (! dol_strlen($modele))
@@ -3707,8 +3939,7 @@ 
 				if (! empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
+				} else
 				{
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;

htdocs/societe/card.php

Braces +290 added lines, -183 removed lines

@@ -42,16 +42,24 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->load("companies");
 $langs->load("commercial");
 $langs->load("bills");
 $langs->load("banks");
 $langs->load("users");
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+if (! empty($conf->categorie->enabled)) {
+	$langs->load("categories");
+}
+if (! empty($conf->incoterm->enabled)) {
+	$langs->load("incoterm");
+}
+if (! empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 $mesg=''; $error=0; $errors=array();
 
@@ -61,8 +69,12 @@ 
 $confirm		= GETPOST('confirm');
 
 $socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+if ($user->societe_id) {
+	$socid=$user->societe_id;
+}
+if (empty($socid) && $action == 'view') {
+	$action='create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -101,7 +113,9 @@ 
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -128,8 +142,7 @@ 
 			$langs->load('errors');
 			$langs->load('companies');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
+		} else
 		{
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
@@ -156,7 +169,9 @@ 
 				);
 				foreach ($listofproperties as $property)
 				{
-					if (empty($object->$property)) $object->$property = $soc_origin->$property;
+					if (empty($object->$property)) {
+						$object->$property = $soc_origin->$property;
+					}
 				}
 
 				// Concat some data
@@ -173,7 +188,9 @@ 
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+					    if (empty($object->array_options[$key])) {
+					    	$object->array_options[$key] = $val;
+					    }
 					}
 				}
 
@@ -286,8 +303,7 @@ 
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else
+				} else
 				{
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
@@ -332,7 +348,9 @@ 
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-        if ($ret < 0) $error++;
+        if ($ret < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -344,7 +362,9 @@ 
 			}
         }
 
-        if ($error) $action = 'edit_extras';
+        if ($error) {
+        	$action = 'edit_extras';
+        }
     }
 
     // Add new or update third party
@@ -376,20 +396,22 @@ 
 	        {
 	        		$ret=$object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas=$canvas;
+	        } else {
+				$object->canvas=$canvas;
+			}
 
-	        if (GETPOST("private") == 1)	// Ask to create a contact
+	        if (GETPOST("private") == 1) {
+	        	// Ask to create a contact
 	        {
 	            $object->particulier			= GETPOST("private");
+	        }
 
 	            $object->name				= dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha'));
 	            $object->civility_id			= GETPOST('civility_id');	// Note: civility id is a code, not an int
 	            // Add non official properties
 	            $object->name_bis			= GETPOST('name','alpha');
 	            $object->firstname			= GETPOST('firstname','alpha');
-	        }
-	        else
+	        } else
 	        {
 	            $object->name				= GETPOST('name', 'alpha');
 	        }
@@ -464,8 +486,11 @@ 
 				 $error++;
 			}
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        else if (! empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        if (GETPOST('deletephoto')) {
+	        	$object->logo = '';
+	        } else if (! empty($_FILES['photo']['name'])) {
+	        	$object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+	        }
 
 	        // Check parameters
 	        if (! GETPOST('cancel','alpha'))
@@ -517,8 +542,12 @@ 
 
                 $db->begin();
 
-                if (empty($object->client))      $object->code_client='';
-                if (empty($object->fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client)) {
+                	$object->code_client='';
+                }
+                if (empty($object->fournisseur)) {
+                	$object->code_fournisseur='';
+                }
 
                 $result = $object->create($user);
 
@@ -570,16 +599,14 @@ 
                                 if (! $result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
+                                } else
                                 {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
 						switch($_FILES['photo']['error'])
 						{
@@ -593,12 +620,13 @@ 
 						}
 	                }
                     // Gestion du logo de la société
-                }
-                else
+                } else
 				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				    	// TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
+				    }
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
@@ -613,21 +641,24 @@ 
 
                 	if (! empty($backtopage))
                 	{
-                	    if (preg_match('/\?/', $backtopage)) $backtopage.='&socid='.$object->id;
+                	    if (preg_match('/\?/', $backtopage)) {
+                	    	$backtopage.='&socid='.$object->id;
+                	    }
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                     	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                    		$url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+                    	} else if ($object->fournisseur == 1) {
+                    		$url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+                    	}
 
                 		header("Location: ".$url);
                     	exit;
                 	}
-                }
-                else
+                } else
                 {
                     $db->rollback();
                     $action='create';
@@ -644,8 +675,7 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
@@ -653,8 +683,12 @@ 
                 }
 
                 // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client='';
-                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
+                if (empty($object->client) && empty($object->oldcopy->code_client)) {
+                	$object->code_client='';
+                }
+                if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) {
+                	$object->code_fournisseur='';
+                }
                 //var_dump($object);exit;
 
                 $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
@@ -710,8 +744,7 @@ 
                             if (! $result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
+                            } else
                             {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
@@ -727,13 +760,11 @@ 
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
 					{
                         $errors[] = "ErrorBadImageFormat";
                     }
-                }
-                else
+                } else
                 {
 					switch($_FILES['photo']['error'])
 					{
@@ -768,21 +799,18 @@ 
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
+                	} else
                 	{
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
-                }
-                else
+                } else
                 {
                     $object->id = $socid;
                     $action= "edit";
                 }
             }
-        }
-        else
+        } else
         {
         	$action = ($action=='add'?'create':'edit');
         }
@@ -798,8 +826,7 @@ 
         {
             header("Location: ".DOL_URL_ROOT."/societe/list.php?delsoc=".urlencode($object->name));
             exit;
-        }
-        else
+        } else
         {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
@@ -850,11 +877,15 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
-}
+	if ($result <= 0) {
+		dol_print_error('',$object->error);
+	}
+	}
 
 $title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title=$object->name." - ".$langs->trans('Card');
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -867,8 +898,7 @@ 
     // -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
-}
-else
+} else
 {
     // -----------------------------------------
     // When used in standard mode
@@ -879,8 +909,12 @@ 
          *  Creation
          */
 		$private=GETPOST("private","int");
-		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) $private=1;
-    	if (empty($private)) $private=0;
+		if (! empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! isset($_GET['private']) && ! isset($_POST['private'])) {
+			$private=1;
+		}
+    	if (empty($private)) {
+    		$private=0;
+    	}
 
         // Load object modCodeTiers
         $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -892,7 +926,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+            	break;
+            }
         }
         $modCodeClient = new $module;
         // Load object modCodeFournisseur
@@ -905,7 +941,9 @@ 
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
+            if ($res) {
+            	break;
+            }
         }
         $modCodeFournisseur = new $module;
 
@@ -928,8 +966,7 @@ 
         if(empty($duplicate_code_error)) {
 	        $object->code_client		= GETPOST('code_client', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
-        }
-		else {
+        } else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'),'', 'warnings');
 		}
 
@@ -989,8 +1026,7 @@ 
                     if (! $result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
+                    } else
                     {
                         // Create thumbs
                         $object->addThumbs($newfile);
@@ -1078,7 +1114,9 @@ 
         print '<input type="hidden" name="type" value='.GETPOST("type",'alpha').'>';
         print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
         print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+        	print '<input type="hidden" name="code_auto" value="1">';
+        }
 
         dol_fiche_head(null, 'card', '', 0, '');
 
@@ -1089,17 +1127,18 @@ 
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName','name').'</span>';
-        }
-        else
+        } else
 		{
 			print '<span id="TypeName" class="fieldrequired">'.fieldLabel('ThirdPartyName','name').'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
 	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
-	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+	    	// Old not used prefix field
 	    {
 		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
 	    }
+	    }
 	    print '</tr>';
 
         // If javascript on, we show option individual
@@ -1123,17 +1162,27 @@ 
 	    print '<td class="maxwidthonsmartphone">';
 	    $selected=GETPOST('client','int')!=''?GETPOST('client','int'):$object->client;
         print '<select class="flat" name="client" id="customerprospect">';
-        if (GETPOST("type") == '') print '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+        if (GETPOST("type") == '') {
+        	print '<option value="-1">&nbsp;</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+        	print '<option value="2"'.($selected==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+        	print '<option value="3"'.($selected==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+        }
+        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+        	print '<option value="1"'.($selected==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+        }
         print '<option value="0"'.((string) $selected == '0'?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
         print '</select></td>';
 
         print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
         print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode=$object->code_client;
-        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+        if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) {
+        	$tmpcode=$modCodeClient->getNextValue($object,0);
+        }
         print '<input type="text" name="code_client" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
         print '</td><td>';
         $s=$modCodeClient->getToolTip($langs,$object,0);
@@ -1147,13 +1196,17 @@ 
             print '<tr>';
             print '<td>'.fieldLabel('Supplier','fournisseur',1).'</td><td>';
             $default = -1;
-            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
+            if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) {
+            	$default=1;
+            }
             print $form->selectyesno("fournisseur", (GETPOST('fournisseur','int')!=''?GETPOST('fournisseur','int'):(GETPOST("type",'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type",'alpha') == '' ? 1 : 0));
             print '</td>';
             print '<td>'.fieldLabel('SupplierCode','supplier_code').'</td><td>';
             print '<table class="nobordernopadding"><tr><td>';
             $tmpcode=$object->code_fournisseur;
-            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+            if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) {
+            	$tmpcode=$modCodeFournisseur->getNextValue($object,1);
+            }
             print '<input type="text" name="code_fournisseur" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
             print '</td><td>';
             $s=$modCodeFournisseur->getToolTip($langs,$object,1);
@@ -1191,7 +1244,9 @@ 
         // Country
         print '<tr><td>'.fieldLabel('Country','selectcountry_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
         print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+        	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // State
@@ -1200,14 +1255,16 @@ 
             if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
             {
                 print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-            else
+            } else
             {
                 print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
-            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
-            else print $countrynotdefined;
+            if ($object->country_id) {
+            	print $formcompany->select_state($object->state_id,$object->country_code);
+            } else {
+            	print $countrynotdefined;
+            }
             print '</td></tr>';
         }
 
@@ -1239,19 +1296,25 @@ 
             {
 	            $key='idprof'.$i;
 
-                if (($j % 2) == 0) print '<tr>';
+                if (($j % 2) == 0) {
+                	print '<tr>';
+                }
 
                 $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
                 print '<td>'.fieldLabel($idprof,$key, (empty($conf->global->$idprof_mandatory)?0:1)).'</td><td>';
 
                 print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
                 print '</td>';
-                if (($j % 2) == 1) print '</tr>';
+                if (($j % 2) == 1) {
+                	print '</tr>';
+                }
                 $j++;
             }
             $i++;
         }
-        if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+        if ($j % 2 == 1) {
+        	print '<td colspan="2"></td></tr>';
+        }
 
         // Vat is used
         print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
@@ -1277,8 +1340,7 @@ 
                 print "\n";
                 $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-            }
-            else
+            } else
             {
                 $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
             }
@@ -1297,14 +1359,12 @@ 
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
             print '</td></tr>';
 
-        }
-        elseif($mysoc->localtax1_assuj=="1")
+        } elseif($mysoc->localtax1_assuj=="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1:0),1);
             print '</td></tr>';
-        }
-        elseif($mysoc->localtax2_assuj=="1")
+        } elseif($mysoc->localtax2_assuj=="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value',(isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2)?$conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2:0),1);
@@ -1315,11 +1375,15 @@ 
         print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">'."\n";
         $sortparam=(empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+        	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td>';
         print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+        	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td></tr>';
 
         // Legal Form
@@ -1328,8 +1392,7 @@ 
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
+        } else
         {
             print $countrynotdefined;
         }
@@ -1429,8 +1492,7 @@ 
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
+        } else
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
@@ -1438,8 +1500,7 @@ 
         print '</div>'."\n";
 
         print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
+    } elseif ($action == 'edit')
     {
         /*
          * Edition
@@ -1465,7 +1526,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $modCodeClient = new $module($db);
             // We verified if the tag prefix is used
@@ -1482,7 +1545,9 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                	break;
+                }
             }
             $modCodeFournisseur = new $module($db);
             // On verifie si la balise prefix est utilisee
@@ -1558,10 +1623,10 @@ 
 
             if($object->localtax1_assuj==0){
             	$sub=0;
-            }else{$sub=1;}
+            } else{$sub=1;}
             if($object->localtax2_assuj==0){
             	$sub2=0;
-            }else{$sub2=1;}
+            } else{$sub2=1;}
 
             print "\n".'<script type="text/javascript">';
             print '$(document).ready(function () {
@@ -1618,7 +1683,9 @@ 
             print '<input type="hidden" name="action" value="update">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="socid" value="'.$object->id.'">';
-            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+            	print '<input type="hidden" name="code_auto" value="1">';
+            }
 
 
             dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
@@ -1643,16 +1710,17 @@ 
 	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+            if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+            	// Old not used prefix field
             {
                 print '<tr><td>'.fieldLabel('Prefix','prefix').'</td><td colspan="3">';
+            }
                 // It does not change the prefix mode using the auto numbering prefix
                 if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
                 {
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
-                }
-                else
+                } else
                 {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
@@ -1662,9 +1730,15 @@ 
             // Prospect/Customer
             print '<tr><td>'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
 	        print '<td class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+            	print '<option value="2"'.($object->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+            }
+            if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+            	print '<option value="3"'.($object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+            }
+            if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+            	print '<option value="1"'.($object->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
+            }
             print '<option value="0"'.($object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
             print '</select></td>';
             print '<td>'.fieldLabel('CustomerCode','customer_code').'</td><td>';
@@ -1673,15 +1747,18 @@ 
             if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
             {
                 $tmpcode=$object->code_client;
-                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
+                if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) {
+                	$tmpcode=$object->oldcopy->code_client;
+                }
+                // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+                if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) {
+                	$tmpcode=$modCodeClient->getNextValue($object,0);
+                }
                 print '<input type="text" name="code_client" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            }
-            else if ($object->codeclient_modifiable())
+            } else if ($object->codeclient_modifiable())
             {
                 print '<input type="text" name="code_client" id="customer_code" size="16" value="'.$object->code_client.'" maxlength="15">';
-            }
-            else
+            } else
             {
                 print $object->code_client;
                 print '<input type="hidden" name="code_client" value="'.$object->code_client.'">';
@@ -1706,15 +1783,18 @@ 
                 if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
                 {
                     $tmpcode=$object->code_fournisseur;
-                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
+                    if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) {
+                    	$tmpcode=$object->oldcopy->code_fournisseur;
+                    }
+                    // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+                    if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) {
+                    	$tmpcode=$modCodeFournisseur->getNextValue($object,1);
+                    }
                     print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                }
-                else if ($object->codefournisseur_modifiable())
+                } else if ($object->codefournisseur_modifiable())
                 {
                     print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else
+                } else
               {
                     print $object->code_fournisseur;
                     print '<input type="hidden" name="code_fournisseur" value="'.$object->code_fournisseur.'">';
@@ -1756,7 +1836,9 @@ 
             // Country
             print '<tr><td>'.fieldLabel('Country','selectcounty_id').'</td><td colspan="3">';
             print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // State
@@ -1765,8 +1847,7 @@ 
                 if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td>'.fieldLabel('Region-State','state_id').'</td><td colspan="3">';
-                }
-                else
+                } else
                 {
                     print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
                 }
@@ -1803,22 +1884,29 @@ 
                 {
 	                $key='idprof'.$i;
 
-	                if (($j % 2) == 0) print '<tr>';
+	                if (($j % 2) == 0) {
+	                	print '<tr>';
+	                }
 
 	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                if (empty($conf->global->$idprof_mandatory) || ! $object->isACompany())
-	                    print '<td>'.fieldLabel($idprof,$key).'</td><td>';
-                    else
-	                    print '<td><span class="fieldrequired">'.fieldLabel($idprof,$key).'</td><td>';
+	                if (empty($conf->global->$idprof_mandatory) || ! $object->isACompany()) {
+	                	                    print '<td>'.fieldLabel($idprof,$key).'</td><td>';
+	                } else {
+                    	                    print '<td><span class="fieldrequired">'.fieldLabel($idprof,$key).'</td><td>';
+                    }
 
 	                print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
                     print '</td>';
-                    if (($j % 2) == 1) print '</tr>';
+                    if (($j % 2) == 1) {
+                    	print '</tr>';
+                    }
                     $j++;
                 }
                 $i++;
             }
-            if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
+            if ($j % 2 == 1) {
+            	print '<td colspan="2"></td></tr>';
+            }
 
             // VAT is used
             print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td><td colspan="3">';
@@ -1849,8 +1937,7 @@ 
                 }
                 print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+            } elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
                 print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax1IsUsed",$mysoc->country_code),'localtax1assuj_value').'</td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
@@ -1862,8 +1949,7 @@ 
                 }
                 print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+            } elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
                 print '<tr><td>'.fieldLabel($langs->transcountry("LocalTax2IsUsed",$mysoc->country_code),'localtax2assuj_value').'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
@@ -1896,8 +1982,7 @@ 
                     print "\n";
                     $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
@@ -1909,11 +1994,15 @@ 
             // Type - Size
             print '<tr><td>'.fieldLabel('ThirdPartyType','typent_id').'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td>';
             print '<td>'.fieldLabel('Staff','effectif_id').'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+            	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print '</td></tr>';
 
             // Juridical type
@@ -2009,13 +2098,19 @@ 
             print '<tr class="hideonsmartphone">';
             print '<td>'.fieldLabel('Logo','photoinput').'</td>';
             print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe',$object);
+            if ($object->logo) {
+            	print $form->showphoto('societe',$object);
+            }
             $caneditfield=1;
             if ($caneditfield)
             {
-                if ($object->logo) print "<br>\n";
+                if ($object->logo) {
+                	print "<br>\n";
+                }
                 print '<table class="nobordernopadding">';
-                if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                if ($object->logo) {
+                	print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                }
                 //print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
                 print '</table>';
@@ -2036,14 +2131,15 @@ 
 
             print '</form>';
         }
-    }
-    else
+    } else
     {
     	/*
          * View
          */
 
-        if (!empty($object->id)) $res=$object->fetch_optionals();
+        if (!empty($object->id)) {
+        	$res=$object->fetch_optionals();
+        }
         //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2098,9 +2194,11 @@ 
     	}
 
     	// Prefix
-        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        	// Old not used prefix field
         {
             print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
+        }
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
         }
@@ -2111,7 +2209,9 @@ 
             print '<tr><td>';
             print $langs->trans('CustomerCode').'</td><td>';
             print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            if ($object->check_codeclient() <> 0) {
+            	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2123,7 +2223,9 @@ 
             print '<tr><td>';
             print $langs->trans('SupplierCode').'</td><td>';
             print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            if ($object->check_codefournisseur() <> 0) {
+            	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            }
             print '</td>';
             print $htmllogobar; $htmllogobar='';
             print '</tr>';
@@ -2135,7 +2237,9 @@ 
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td>'.$object->barcode;
             print '</td>';
-			if ($htmllogobar) $htmllogobar.=$form->showbarcode($object);
+			if ($htmllogobar) {
+				$htmllogobar.=$form->showbarcode($object);
+			}
             print $htmllogobar;
 			$htmllogobar='';
             print '</tr>';
@@ -2155,8 +2259,11 @@ 
                 print $object->$key;
                 if ($object->$key)
                 {
-                    if ($object->id_prof_check($i,$object) > 0) print ' &nbsp; '.$object->id_prof_url($i,$object);
-                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+                    if ($object->id_prof_check($i,$object) > 0) {
+                    	print ' &nbsp; '.$object->id_prof_url($i,$object);
+                    } else {
+                    	print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+                    }
                 }
                 print '</td>';
                 //if (($j % 2) == 1) print '</tr>';
@@ -2196,8 +2303,7 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }
-		        else
+		        } else
 		        {
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
@@ -2213,13 +2319,12 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
 		    }
-		}
-		elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
+		} elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
 		{
 		    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
 		    print yn($object->localtax1_assuj);
@@ -2234,14 +2339,13 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax1_value.'</td>';
 		        }
 		        print '</tr></form>';
 
 		    }
-		}
-		elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
+		} elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
 		{
 		    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
 		    print yn($object->localtax2_assuj);
@@ -2257,7 +2361,7 @@ 
 		            print '<td align="left">';
 		            $formcompany->select_localtax(2,$object->localtax2_value, "lt2");
 		            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-		        }else{
+		        } else{
 		            print '<td>'.$object->localtax2_value.'</td>';
 		        }
 		        print '</tr></form>';
@@ -2297,15 +2401,13 @@ 
                     print "\n";
                     $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-                }
-                else
+                } else
                 {
                     $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
                 }
             }
             print $s;
-        }
-        else
+        } else
         {
             print '&nbsp;';
         }
@@ -2351,8 +2453,11 @@ 
 
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
-        else print '&nbsp;';
+        if ($object->capital) {
+        	print price($object->capital,'',$langs,0,-1,-1, $conf->currency);
+        } else {
+        	print '&nbsp;';
+        }
         print '</td></tr>';
 
         // Default language
@@ -2375,16 +2480,18 @@ 
             print '<table width="100%" class="nobordernopadding"><tr><td>';
             print $langs->trans('IncotermLabel');
             print '<td><td align="right">';
-            if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
-            else print '&nbsp;';
+            if ($user->rights->societe->creer) {
+            	print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
+            } else {
+            	print '&nbsp;';
+            }
             print '</td></tr></table>';
             print '</td>';
             print '<td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-			}
-			else
+			} else
 			{
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
 			}
@@ -2413,14 +2520,15 @@ 
         	print '<table class="nobordernopadding" width="100%"><tr><td>';
         	print $langs->trans('ParentCompany');
         	print '</td>';
-        	if ($action != 'editparentcompany') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	if ($action != 'editparentcompany') {
+        		print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</a></td>';
+        	}
         	print '</tr></table>';
         	print '</td><td colspan="3">';
         	if ($action == 'editparentcompany')
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'editparentcompany','s.rowid <> '.$object->id,1);
-        	}
-        	else
+        	} else
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->parent,'none','s.rowid <> '.$object->id,1);
         	}
@@ -2443,8 +2551,7 @@ 
             {
                 $adh->ref=$adh->getFullName($langs);
                 print $adh->getNomUrl(1);
-            }
-            else
+            } else
             {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
@@ -2493,8 +2600,7 @@ 
 		        {
 		        	$langs->load("mails");
 		        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-		        }
-		        else
+		        } else
 				{
 		        	$langs->load("mails");
 		       		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
@@ -2512,11 +2618,12 @@ 
 
 		        if ($user->rights->societe->supprimer)
 		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {
+		            	// We can't use preloaded confirm form with jmobile
 		            {
 		                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
 		            }
-		            else
+		            } else
 					{
 		                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
 		            }