alxarafe / alixar

dolibarr/htdocs/stripe/config.php

Indentation +10 added lines, -10 removed lines

@@ -35,24 +35,24 @@
 global $stripearrayofkeysbyenv;

 

 $stripearrayofkeysbyenv = array(

-	0=>array(

-		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,

-		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY

-	),

-	1=>array(

-		"secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,

-		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY

-	)

+    0=>array(

+        "secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,

+        "publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY

+    ),

+    1=>array(

+        "secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,

+        "publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY

+    )

 );

 

 $stripearrayofkeys = array();

 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))

 {

-	$stripearrayofkeys = $stripearrayofkeysbyenv[0];	// Test

+    $stripearrayofkeys = $stripearrayofkeysbyenv[0];	// Test

 }

 else

 {

-	$stripearrayofkeys = $stripearrayofkeysbyenv[1];	// Live

+    $stripearrayofkeys = $stripearrayofkeysbyenv[1];	// Live

 }

 

 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);

Spacing +5 added lines, -5 removed lines

@@ -27,8 +27,8 @@ 
 *  \brief      Page to move config in api

 */

 

-require_once BASE_PATH . '/vendor/stripe/stripe-php/init.php';

-require_once BASE_PATH . '/vendor/stripe/stripe-php/lib/Stripe.php';

+require_once BASE_PATH.'/vendor/stripe/stripe-php/init.php';

+require_once BASE_PATH.'/vendor/stripe/stripe-php/lib/Stripe.php';

 

 global $stripe;

 global $conf;

@@ -46,13 +46,13 @@ 
 );

 

 $stripearrayofkeys = array();

-if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))

+if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))

 {

-	$stripearrayofkeys = $stripearrayofkeysbyenv[0];	// Test

+	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test

 }

 else

 {

-	$stripearrayofkeys = $stripearrayofkeysbyenv[1];	// Live

+	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live

 }

 

 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))

 {

 	$stripearrayofkeys = $stripearrayofkeysbyenv[0];	// Test

-}

-else

+} else

 {

 	$stripearrayofkeys = $stripearrayofkeysbyenv[1];	// Live

 }

dolibarr/htdocs/core/lib/functions.lib.php

Spacing +547 added lines, -547 removed lines

@@ -37,7 +37,7 @@ 
  * 	\brief			A set of functions for Dolibarr

  * 					This file contains all frequently used functions.

  */

-include_once DOL_BASE_PATH . '/core/lib/json.lib.php';

+include_once DOL_BASE_PATH.'/core/lib/json.lib.php';

 

 /**

  * Function to return value of a static property when class

@@ -52,7 +52,7 @@ 
  */

 function getStaticMember($class, $member)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

     /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -77,7 +77,7 @@ 
 

     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.');

+    dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');

     return null;

 }

 

@@ -94,9 +94,9 @@ 
  */

 function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

 {

-    require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+    require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-    $class = 'DoliDB' . ucfirst($type);

+    $class = 'DoliDB'.ucfirst($type);

     $dolidb = new $class($type, $host, $user, $pass, $name, $port);

     return $dolidb;

 }

@@ -152,7 +152,7 @@ 
  */

 function getBrowserInfo($user_agent)

 {

-    include_once BASE_PATH . '/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php';

+    include_once BASE_PATH.'/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php';

 

     $name = 'unknown';

     $version = '';

@@ -265,7 +265,7 @@ 
         $depth = $db->transaction_opened;

         $disconnectdone = $db->close();

     }

-    dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+    dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

 }

 

 /**

@@ -310,7 +310,7 @@ 
     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);

+        dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

     }

@@ -332,7 +332,7 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];

         // Clean $relativepathstring

         if (constant('DOL_URL_ROOT'))

-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

         //var_dump($relativepathstring);

@@ -340,8 +340,8 @@ 
         // Code for search criteria persistence.

         // Retrieve values if restore_lastsearch_values

         if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST

-            if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+            if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                 if (is_array($tmp)) {

                     foreach ($tmp as $key => $val) {

                         if ($key == $paramname) { // We are on the requested parameter

@@ -352,12 +352,12 @@ 
                 }

             }

             // If there is saved contextpage, page or limit

-            if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-            } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-            } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+            if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+            } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+            } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

             }

         }

         // Else, retreive default values if we are not doing a sort

@@ -425,7 +425,7 @@ 
                                         $qualified = 1;

 

                                     if ($qualified) {

-                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                         foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

                                             if ($out)

                                                 $out .= ', ';

@@ -461,11 +461,11 @@ 
                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                         // We made a search from quick search menu, do we still use default filter ?

                                         if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                         }

                                     } else {

-                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                         $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                     }

                                     break;

@@ -483,7 +483,7 @@ 
     // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

     if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

         $maxloop = 20;

-        $loopnb = 0;    // Protection against infinite loop

+        $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 = '';

@@ -528,7 +528,7 @@ 
             } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                 $newout = $conf->entity;

             } else

-                $newout = '';     // Key not found, we replace with empty string

+                $newout = ''; // Key not found, we replace with empty string

 

 

 

@@ -550,7 +550,7 @@ 
 

                 

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-            $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+            $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

         }

     }

 

@@ -668,15 +668,15 @@ 
                 else if (isset($_SERVER["SERVER_NAME"]))

                     return $_SERVER["SERVER_NAME"];

             }

-            return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+            return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+            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);

         }

-        return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+        return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

     }

 }

 

@@ -692,12 +692,12 @@ 
  */

 function dol_include_once($relpath, $classname = '')

 {

-    global $conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

+    global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

 

     $fullpath = dol_buildpath($relpath);

 

     if (!file_exists($fullpath)) {

-        dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+        dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

         return false;

     }

 

@@ -726,14 +726,14 @@ 
 

     if ($type == 0 /* empty($type) */) { // For a filesystem path

         //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-        $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+        $res = DOL_BASE_PATH.'/'.$path; // Standard default path

         if (isset($conf->file->dol_document_root)) {

             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;

+                if (file_exists($dirroot.'/'.$path)) {

+                    $res = $dirroot.'/'.$path;

                     return $res;

                 }

             }

@@ -750,11 +750,11 @@ 
         // using proxy, rewriting, virtual path, etc...

         $res = '';

         if ($type == 1)

-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value

+            $res = /* DOL_URL_ROOT */ DOL_BASE_URI.'/'.$path; // Standard value

         if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

+            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH.'/'.$path; // Standard value

         if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+            $res = DOL_URL_ROOT.'/'.$path;

 

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

@@ -762,33 +762,33 @@ 
                     global $dolibarr_main_url_root;

 

                     // Define $urlwithroot

-                    $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                    $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;  // This is to use external domain name found into config file

+                    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+                    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

                     //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                    $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                    $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                 }

                 continue;

             }

-            preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+            preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

             if (!empty($regs[1])) {

                 //print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";

-                if (file_exists($dirroot . '/' . $regs[1])) {

+                if (file_exists($dirroot.'/'.$regs[1])) {

                     if ($type == 1) {

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT) . $conf->file->dol_url_root[$key] . '/' . $path;

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;

                     }

                     if ($type == 2) {

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . $conf->file->dol_url_root[$key] . '/' . $path;

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;

                     }

                     if ($type == 3) {

                         global $dolibarr_main_url_root;

 

                         // Define $urlwithroot

-                        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                        $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;  // This is to use external domain name found into config file

+                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+                        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

                         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . $conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                     }

                     break;

                 }

@@ -816,7 +816,7 @@ 
     if (empty($native)) {

         $myclone = unserialize(serialize($object));

     } 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)

+        $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)

     }

 

     return $myclone;

@@ -937,7 +937,7 @@ 
  */

 function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

 {

-    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

+    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

     $forbidden_chars_to_remove = array();

     if (is_array($badcharstoreplace))

         $forbidden_chars_to_replace = $badcharstoreplace;

@@ -1000,12 +1000,12 @@ 
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

 {

     // 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

+    $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'));

-    return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+    return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

 }

 

 /**

@@ -1076,14 +1076,14 @@ 
         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

         // 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

-            $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+            $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 html log tag enabled and url parameter log defined, we show output log on HTML comments

         if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

             print "\n\n<!-- Log start\n";

-            print $message . "\n";

+            print $message."\n";

             print "Log end -->\n";

         }

 

@@ -1097,7 +1097,7 @@ 
 

         // 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']);

+            $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'];

@@ -1106,10 +1106,10 @@ 
             $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']);

+            $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'];

+            $data['ip'] = '???@'.$_SERVER['LOGNAME'];

         // Loop on each log handler and send output

         foreach ($conf->loghandlers as $loghandlerinstance) {

             if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

@@ -1161,10 +1161,10 @@ 
 {

     global $conf, $langs, $hookmanager;

 

-    $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+    $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.

+        $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

@@ -1175,8 +1175,8 @@ 
         $limittitle = 30;

         $out .= '<a class="tabTitle">';

         if ($picto)

-            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

-        $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

+            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';

+        $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

         $out .= '</a>';

     }

 

@@ -1216,23 +1216,23 @@ 
         }

 

         if ($i < $limittoshow || $isactive) {

-            $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+            $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

             if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                 if (!empty($links[$i][0])) {

-                    $out .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                    $out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                 } else {

-                    $out .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                    $out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                 }

             } else if (!empty($links[$i][1])) {

                 //print "x $i $active ".$links[$i][2]." z";

                 if ($isactive) {

-                    $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $out .= $links[$i][1];

-                    $out .= '</a>' . "\n";

+                    $out .= '</a>'."\n";

                 } else {

-                    $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabunactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $out .= $links[$i][1];

-                    $out .= '</a>' . "\n";

+                    $out .= '</a>'."\n";

                 }

             }

             $out .= '</div>';

@@ -1245,14 +1245,14 @@ 
             $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' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                    $outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                 else

-                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                    $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

             }

             else if (!empty($links[$i][1])) {

-                $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                $outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" 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.

-                $outmore .= '</a>' . "\n";

+                $outmore .= '</a>'."\n";

             }

             $outmore .= '</div>';

 

@@ -1268,24 +1268,24 @@ 
         $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

         $tabsname = str_replace("@", "", $picto);

-        $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-        $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . $langs->trans("More") . '... (' . $nbintab . ')</a>';

-        $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+        $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+        $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';

+        $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

         $out .= $outmore;

         $out .= '</div>';

         $out .= '<div></div>';

         $out .= "</div>\n";

 

         $out .= "<script>";

-        $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-        $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+        $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+        $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

         $out .= "</script>";

     }

 

     $out .= "</div>\n";

 

     if (!$notab || $notab == -1)

-        $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        $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"

@@ -1394,7 +1394,7 @@ 
         if ($conf->browser->layout == 'phone')

             $maxvisiblephotos = 1;

         if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

         else {

             if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

@@ -1403,18 +1403,18 @@ 
             //elseif ($conf->browser->layout != 'phone') {    // Show no photo link

             $nophoto = '/public/theme/common/nophoto.png';

             // $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>';

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

             //}

         }

     } elseif ($object->element == 'ticket') {

         $width = 80;

         $cssclass = 'photoref';

-        $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

+        $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->track_id);

         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

         if ($conf->browser->layout == 'phone')

             $maxvisiblephotos = 1;

         if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

         else {

             if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

@@ -1423,7 +1423,7 @@ 
             //elseif ($conf->browser->layout != 'phone') {    // Show no photo link

             $nophoto = '/public/theme/common/nophoto.png';

             //$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>';

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

             //}

         }

     } else {

@@ -1433,25 +1433,25 @@ 
                 // Check if a preview file is available

                 if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                     $objectref = dol_sanitizeFileName($object->ref);

-                    $dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity]) . "/";

+                    $dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity])."/";

                     if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

                         $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);

-                        $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                        $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                     } else {

                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                     }

                     if (empty($subdir))

                         $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

 

-                    $filepath = $dir_output . $subdir . "/";

+                    $filepath = $dir_output.$subdir."/";

 

-                    $file = $filepath . $objectref . ".pdf";

-                    $relativepath = $subdir . '/' . $objectref . '.pdf';

+                    $file = $filepath.$objectref.".pdf";

+                    $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                     // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                    $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                    $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                    $relativepathimage = $relativepath . '_preview.png';

+                    $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                    $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                    $relativepathimage = $relativepath.'_preview.png';

 

                     // Si fichier PDF existe

                     if (file_exists($file)) {

@@ -1460,7 +1460,7 @@ 
                         if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!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.

-                                include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+                                include_once DOL_BASE_PATH.'/core/lib/files.lib.php';

                                 $ret = dol_convert_file($file, 'png', $fileimage);

                                 if ($ret < 0)

                                     $error++;

@@ -1473,14 +1473,14 @@ 
                         // Si fichier png PDF d'1 page trouve

                         if (file_exists($fileimage)) {

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                            $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                            $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                             $phototoshow .= '</div></div>';

                         }

                         // Si fichier png PDF de plus d'1 page trouve

                         elseif (file_exists($fileimagebis)) {

-                            $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                            $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                            $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                            $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                             $phototoshow .= '</div></div>';

                         }

                     }

@@ -1507,10 +1507,10 @@ 
                     $picto = $object->picto;

                     if ($object->element == 'project' && !$object->public)

                         $picto = 'project'; // instead of projectpub

-                    $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

+                    $nophoto = img_picto('', 'object_'.$picto, '', false, 1);

                 }

                 $morehtmlleft .= '<!-- No photo to show -->';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                 $morehtmlleft .= '</div>';

             }

@@ -1518,7 +1518,7 @@ 
     }

 

     if ($showbarcode)

-        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        $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)) {

@@ -1531,14 +1531,14 @@ 
         if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

             $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

         } else {

-            $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+            $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

         }

         $morehtmlstatus .= ' &nbsp; ';

         //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';

         if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

             $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

         } else {

-            $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+            $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

         }

     } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

         $tmptxt = $object->getLibStatut(6, $object->totalpaye);

@@ -1565,7 +1565,7 @@ 
         if ($object->progress >= 100)

             $object->fk_statut = 3;

         $tmptxt = $object->getLibStatut(5);

-        $morehtmlstatus .= $tmptxt;  // No status on task

+        $morehtmlstatus .= $tmptxt; // No status on task

     }

     else { // Generic case

         $tmptxt = $object->getLibStatut(6);

@@ -1579,18 +1579,18 @@ 
         if (method_exists($object, 'getVentilExportCompta')) {

             $accounted = $object->getVentilExportCompta();

             $langs->load("accountancy");

-            $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

+            $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

         }

     }

 

     // Add alias for thirdparty

     if (!empty($object->name_alias))

-        $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        $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>';

+            $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') {

@@ -1600,11 +1600,11 @@ 
     }

     if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

         $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-        $morehtmlref .= $langs->trans("TechnicalID") . ': ' . $object->id;

+        $morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;

         $morehtmlref .= '</div>';

     }

 

-    print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+    print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

     print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

     print '</div>';

     print '<div class="underrefbanner clearboth"></div>';

@@ -1626,7 +1626,7 @@ 
     if ($fieldrequired)

         $ret .= '<span class="fieldrequired">';

     if (($conf->dol_use_jmobile != 4))

-        $ret .= '<label for="' . $fieldkey . '">';

+        $ret .= '<label for="'.$fieldkey.'">';

     $ret .= $langs->trans($langkey);

     if (($conf->dol_use_jmobile != 4))

         $ret .= '</label>';

@@ -1645,9 +1645,9 @@ 
 function dol_bc($var, $moreclass = '')

 {

     global $bc;

-    $ret = ' ' . $bc[$var];

+    $ret = ' '.$bc[$var];

     if ($moreclass)

-        $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

     return $ret;

 }

 

@@ -1667,50 +1667,50 @@ 
     global $conf, $langs;

 

     $ret = '';

-    $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

+    $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

     // Address

     if (empty($mode)) {

         $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

-        $ret .= ($ret ? $sep : '' ) . $object->town;

+        $ret .= ($ret ? $sep : '').$object->town;

         if ($object->state) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

         if ($object->zip)

-            $ret .= ($ret ? ", " : '') . $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;

+        $ret .= ($ret ? $sep : '').$object->town;

         if ($object->state) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

         if ($object->zip)

-            $ret .= ($ret ? $sep : '' ) . $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) : '');

+        $ret .= ($ret ? $sep : '').$object->zip;

+        $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

         if ($object->state) {

-            $ret .= "\n" . $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

-        $ret .= ($ret ? $sep : '' ) . $object->zip;

-        $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

-        $ret .= ($object->departement_id ? (' (' . ($object->departement_id) . ')') : '');

+        $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

-        $ret .= $object->zip ? (($ret ? $sep : '' ) . $object->zip) : '';

-        $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '' )) . $object->town) : '');

+        $ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

+        $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');

         if ($object->state && in_array($object->country_code, $countriesusingstate)) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

     }

     if (!is_object($outputlangs))

         $outputlangs = $langs;

     if ($withcountry) {

         $langs->load("dict");

-        $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

+        $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

     }

 

     return $ret;

@@ -1765,13 +1765,13 @@ 
         if (is_string($tzoutput)) {

             if ($tzoutput == 'tzserver') {

                 $to_gmt = false;

-                $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                 $offsettz = 0;

                 $offsetdst = 0;

             } 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'

-                $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                 $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

             }

         }

@@ -1817,9 +1817,9 @@ 
     else if ($format == 'dayxcard')

         $format = '%Y%m%d';

     else if ($format == 'dayrfc')

-        $format = '%Y-%m-%d';             // DATE_RFC3339

+        $format = '%Y-%m-%d'; // DATE_RFC3339

     else if ($format == 'dayhourrfc')

-        $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

+        $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

     else if ($format == 'standard')

         $format = '%Y-%m-%d %H:%M:%S';

 

@@ -1830,7 +1830,7 @@ 
 

     // If date undefined or "", we return ""

     if (dol_strlen($time) == 0)

-        return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1868,7 +1868,7 @@ 
     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

         // 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);

+        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] : '');

@@ -1886,7 +1886,7 @@ 
 

             $ret = adodb_strftime($format, $timetouse, $to_gmt);

         } else

-            $ret = 'Bad value ' . $time . ' for date';

+            $ret = 'Bad value '.$time.' for date';

     }

 

     if (preg_match('/__b__/i', $format)) {

@@ -1895,11 +1895,11 @@ 
         $month = adodb_strftime('%m', $timetouse);

         $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

         if ($encodetooutput) {

-            $monthtext = $outputlangs->transnoentities('Month' . $month);

-            $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+            $monthtext = $outputlangs->transnoentities('Month'.$month);

+            $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

         } else {

-            $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-            $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+            $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+            $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

         }

         //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

         $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1910,8 +1910,8 @@ 
     if (preg_match('/__a__/i', $format)) {

         $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

-        $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-        $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+        $w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+        $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

         $ret = str_replace('__A__', $dayweek, $ret);

         $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

     }

@@ -1958,9 +1958,9 @@ 
 

     $usealternatemethod = false;

     if ($timestamp <= 0)

-        $usealternatemethod = true;    // <= 1970

+        $usealternatemethod = true; // <= 1970

     if ($timestamp >= 2145913200)

-        $usealternatemethod = true;  // >= 2038

+        $usealternatemethod = true; // >= 2038

 

     if ($usealternatemethod) {

         $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2020,23 +2020,23 @@ 
 

     if (method_exists('DateTime', 'getTimestamp')) {

         if (empty($gm) || $gm === 'server') {

-            $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+            $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

             $localtz = new DateTimeZone($default_timezone);

         } 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'

+            $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) {

-                dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                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) {

-            $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+            $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

             try {

                 $localtz = new DateTimeZone($timezone);

             } catch (Exception $e) {

-                dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

             }

         }

 

@@ -2075,8 +2075,8 @@ 
     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_BASE_PATH . '/core/lib/date.lib.php';

-        $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

+        require_once DOL_BASE_PATH.'/core/lib/date.lib.php';

+        $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time

         $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

     }

     /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2122,9 +2122,9 @@ 
     }

     // Use long or short text unit

     if (empty($shortunit)) {

-        $ret .= ' ' . $textunitlong;

+        $ret .= ' '.$textunitlong;

     } else {

-        $ret .= ' ' . $textunitshort;

+        $ret .= ' '.$textunitshort;

     }

 

     return $ret;

@@ -2152,13 +2152,13 @@ 
     $link .= $url;

     $link .= '"';

     if ($target)

-        $link .= ' target="' . $target . '"';

+        $link .= ' target="'.$target.'"';

     $link .= '>';

     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>';

+    return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';

 }

 

 /**

@@ -2199,9 +2199,9 @@ 
             $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>';

+                $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>';

+                $newemail = '<div>'.$newemail.' '.$link.'</div>';

         }

     }

     else {

@@ -2211,7 +2211,7 @@ 
         }

     }

 

-    $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+    $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

     if ($hookmanager) {

         $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

         $reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);

@@ -2241,26 +2241,26 @@ 
 

     if (!empty($type)) {

         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

-        $newskype .= img_picto($langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+        $newskype .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

         $newskype .= $value;

         if ($type == 'skype') {

             $newskype .= '&nbsp;';

             $newskype .= '<a href="skype:';

             $newskype .= $value;

-            $newskype .= '?call" alt="' . $langs->trans("Call") . '&nbsp;' . $value . '" title="' . $langs->trans("Call") . '&nbsp;' . $value . '">';

-            $newskype .= '<img src="' . DOL_URL_ROOT . '/theme/common/skype_callbutton.png" border="0">';

+            $newskype .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.$langs->trans("Call").'&nbsp;'.$value.'">';

+            $newskype .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';

             $newskype .= '</a><a href="skype:';

             $newskype .= $value;

-            $newskype .= '?chat" alt="' . $langs->trans("Chat") . '&nbsp;' . $value . '" title="' . $langs->trans("Chat") . '&nbsp;' . $value . '">';

-            $newskype .= '<img class="paddingleft" src="' . DOL_URL_ROOT . '/theme/common/skype_chatbutton.png" border="0">';

+            $newskype .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';

+            $newskype .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';

             $newskype .= '</a>';

         }

         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

             $addlink = '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=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            $newskype .= ($link ? ' ' . $link : '');

+                $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+            $newskype .= ($link ? ' '.$link : '');

         }

         $newskype .= '</div>';

     }

@@ -2305,165 +2305,165 @@ 
     if (strtoupper($countrycode) == "FR") {

         // 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);

+            $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) {

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

         } 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);

+            $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) {

-            $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);

+            $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) {

-            $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);

+            $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") {

         if (dol_strlen($phone) == 10) {

-            $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+            $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

         }

     } 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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } 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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

         } elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

         }

     } 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);

+            $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) {//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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

         }

     } 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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } 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);

+            $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") {// 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);

+            $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") {//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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

         }

     } 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);

+            $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

         }

     } 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);

+            $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) {//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);

+            $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) {//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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

         }

     } 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);

+            $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") {//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);

+            $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) {//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);

+            $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") {//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);

+            $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) {//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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } 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);

+            $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") {//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);

+            $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) {//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);

+            $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") {//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);

+            $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) {//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);

+            $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) {//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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

         }

     } 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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } 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);

+            $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) {//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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } 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);

+            $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") {//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);

+            $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") {//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);

+            $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") {//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);

+            $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") {//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);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } 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);

+            $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) {// +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);

+            $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") {//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);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } 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);

+            $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") {//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);

+            $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") {//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);

+            $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") {//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);

+            $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) {//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);

+            $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") {//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);

+            $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 ($conf->browser->layout == '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>';

+            $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

             if (empty($user->clicktodial_loaded))

                 $user->fetch_clicktodial();

@@ -2487,10 +2487,10 @@ 
                 '__PASS__' => $clicktodial_password);

             $url = make_substitutions($url, $substitarray);

             $newphonesav = $newphone;

-            $newphone = '<a href="' . $url . '"';

+            $newphone = '<a href="'.$url.'"';

             if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET))

                 $newphone .= ' target="_blank"';

-            $newphone .= '>' . $newphonesav . '</a>';

+            $newphone .= '>'.$newphonesav.'</a>';

         }

 

         //if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2500,9 +2500,9 @@ 
             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>';

+                $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>';

+                $newphone = '<div>'.$newphone.' '.$link.'</div>';

         }

     }

 

@@ -2533,7 +2533,7 @@ 
             $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;

+        $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

         if ($adddivfloat)

             $rep .= '</div>';

         else

@@ -2561,15 +2561,15 @@ 
         $ret .= $ip;

     }

 

-    echo ('<p>DOL_BASE_PATH: ' . DOL_BASE_PATH . '/DOL_BASE_URI: ' . DOL_BASE_URI . '</p>');

+    echo ('<p>DOL_BASE_PATH: '.DOL_BASE_PATH.'/DOL_BASE_URI: '.DOL_BASE_URI.'</p>');

 

     if ($mode != 2) {

         $countrycode = dolGetCountryCodeFromIp($ip);

         if ($countrycode) { // If success, countrycode is us, fr, ...

-            if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

-                $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

+            if (file_exists(DOL_BASE_PATH.'/theme/common/flags/'.$countrycode.'.png')) {

+                $ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

             } else

-                $ret .= ' (' . $countrycode . ')';

+                $ret .= ' ('.$countrycode.')';

         }

     }

 

@@ -2607,7 +2607,7 @@ 
         //$ip='24.24.24.24';

         //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-        include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+        include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

         $geoip = new DolGeoIP('country', $datafile);

         //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

         //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2634,7 +2634,7 @@ 
         $datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

         //$ip='24.24.24.24';

         //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-        include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+        include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

         $geoip = new DolGeoIP('country', $datafile);

         $countrycode = $geoip->getCountryCodeFromIP($ip);

         $ret = $countrycode;

@@ -2689,12 +2689,12 @@ 
                 $showomap = 1;

 

             if ($showgmap) {

-                $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

-                $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_URL_ROOT . '/theme/common/gmap.png"></a>';

+                $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);

+                $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';

             }

             if ($showomap) {

-                $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_URL_ROOT . '/theme/common/gmap.png"></a>';

+                $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';

             }

         }

     }

@@ -2840,7 +2840,7 @@ 
     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 ...

-            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

+            return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

         else

         //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

             return $string;

@@ -2850,21 +2850,21 @@ 
         if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

             $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);

+            return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

         } else

             return $string;

     }

     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 ...

-            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+            return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

         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);

+            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

@@ -2898,7 +2898,7 @@ 
     $url = DOL_BASE_URI;

 

     $theme = $conf->theme;

-    $path = 'theme/' . $theme;

+    $path = 'theme/'.$theme;

 

     // Define fullpathpicto to use into src

     if ($pictoisfullpath) {

@@ -2947,7 +2947,7 @@ 
                 $fakey = 'fa-pencil';

                 $facolor = '#444';

             } elseif ($pictowithoutext == 'filter') {

-                $fakey = 'fa-' . $pictowithoutext;

+                $fakey = 'fa-'.$pictowithoutext;

             } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                 $fakey = 'fa-arrows';

             } elseif ($pictowithoutext == 'listlight') {

@@ -2986,15 +2986,15 @@ 
             } elseif ($pictowithoutext == 'jabber') {

                 $fakey = 'fa-comment-o';

             } else {

-                $fakey = 'fa-' . $pictowithoutext;

+                $fakey = 'fa-'.$pictowithoutext;

                 $facolor = '#444';

                 $marginleftonlyshort = 0;

             }

 

             if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                $morecss .= ($morecss ? ' ' : '').$reg[1];

             }

-            $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+            $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 $enabledisablehtml .= $titlealt;

             }

@@ -3004,11 +3004,11 @@ 
         }

 

         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

+            $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

+            $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

+            $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)

@@ -3028,15 +3028,15 @@ 
                 continue;

             }

             // 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)) {

+            if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                 //$url = DOL_URL_ROOT . $conf->file->dol_url_root[$type];

-                $url = DOL_BASE_URI . $conf->file->dol_url_root[$type];

+                $url = DOL_BASE_URI.$conf->file->dol_url_root[$type];

                 break;

             }

         }

 

         // $url is '' or '/custom', $path is current theme or

-        $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+        $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

     }

 

     if ($srconly) {

@@ -3044,7 +3044,7 @@ 
     }

 

     // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-    return '<img src="' . $fullpathpicto . '" alt="' . dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+    return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

 }

 

 /**

@@ -3062,7 +3062,7 @@ 
  */

 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

 {

-    return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+    return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

 }

 

 /**

@@ -3083,7 +3083,7 @@ 
         $picto .= '.png';

 

     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;

-    $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;

+    $path = DOL_BASE_URI.'/theme/'.$conf->theme.'/img/weather/'.$picto;

 

     return img_picto($titlealt, $path, $moreatt, 1);

 }

@@ -3109,10 +3109,10 @@ 
         $path = $picto;

     else {

         //$path = DOL_URL_ROOT . '/theme/common/' . $picto;

-        $path = DOL_BASE_URI . '/theme/common/' . $picto;

+        $path = DOL_BASE_URI.'/theme/common/'.$picto;

 

         if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

-            $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;

+            $themepath = DOL_BASE_PATH.'theme/'.$conf->theme.'/img/'.$picto;

 

             if (file_exists($themepath))

                 $path = $themepath;

@@ -3150,14 +3150,14 @@ 
             $numaction = 3;

             $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');

         } else {

-            $titlealt = $langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+            $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

             $numaction = 0;

         }

     }

     if (!is_numeric($numaction))

         $numaction = 0;

 

-    return img_picto($titlealt, 'stcomm' . $numaction . '.png');

+    return img_picto($titlealt, 'stcomm'.$numaction.'.png');

 }

 

 /**

@@ -3174,7 +3174,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Show');

 

-    return img_picto($titlealt, 'pdf' . $size . '.png');

+    return img_picto($titlealt, 'pdf'.$size.'.png');

 }

 

 /**

@@ -3226,7 +3226,7 @@ 
     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 : ''));

+    return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));

 }

 

 /**

@@ -3244,7 +3244,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('View');

 

-    $moreatt = ($float ? 'style="float: right" ' : '') . $other;

+    $moreatt = ($float ? 'style="float: right" ' : '').$other;

 

     return img_picto($titlealt, 'view.png', $moreatt);

 }

@@ -3317,7 +3317,7 @@ 
             $usealttitle = $langs->trans('Info');

     }

 

-    return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

+    return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');

 }

 

 /**

@@ -3351,7 +3351,7 @@ 
         $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) : ''));

+    return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));

 }

 

 /**

@@ -3385,7 +3385,7 @@ 
         $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>';

+    return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

 }

 

 /**

@@ -3403,7 +3403,7 @@ 
         $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>';

+    return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

 }

 

 /**

@@ -3421,7 +3421,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Down');

 

-    return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

+    return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');

 }

 

 /**

@@ -3439,7 +3439,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Up');

 

-    return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

+    return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');

 }

 

 /**

@@ -3522,7 +3522,7 @@ 
         $brand = 'credit-card';

     }

 

-    return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+    return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

 }

 

 /**

@@ -3535,17 +3535,17 @@ 
  */

 function img_mime($file, $titlealt = '', $morecss = '')

 {

-    require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

     $mimetype = dol_mimetype($file, '', 1);

     $mimeimg = dol_mimetype($file, '', 2);

     $mimefa = dol_mimetype($file, '', 4);

 

     if (empty($titlealt))

-        $titlealt = 'Mime type: ' . $mimetype;

+        $titlealt = 'Mime type: '.$mimetype;

 

     //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

-    return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

+    return '<i class="fa fa-'.$mimefa.' paddingright"></i>';

 }

 

 /**

@@ -3560,7 +3560,7 @@ 
  */

 function img_phone($titlealt = 'default', $option = 0)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     global $conf, $langs;

 

@@ -3591,8 +3591,8 @@ 
 

     $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

-    $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-    $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+    $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+    $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

     return $input;

 }

@@ -3613,8 +3613,8 @@ 
 

     $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

-    $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-    $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+    $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+    $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

     return $input;

 }

@@ -3634,10 +3634,10 @@ 
     global $conf, $langs;

 

     if ($infoonimgalt) {

-        return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+        return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

     }

 

-    return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+    return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

 }

 

 /**

@@ -3662,7 +3662,7 @@ 
 

     // Si erreur intervenue avant chargement langue

     if (!$langs) {

-        require_once DOL_BASE_PATH . '/core/class/translate.class.php';

+        require_once DOL_BASE_PATH.'/core/class/translate.class.php';

         $langs = new Translate('', $conf);

         $langs->load("main");

     }

@@ -3670,51 +3670,51 @@ 
     $langs->loadLangs(array('main', 'errors'));

 

     if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

-        $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

+        $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";

-        $out .= $langs->trans("InformationToHelpDiagnose") . ":<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";

+        $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";

+            $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";

+            $out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";

         }

-        $out .= "<b>" . $langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+        $out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

         if (function_exists("php_uname")) {

-            $out .= "<b>" . $langs->trans("OS") . ":</b> " . php_uname() . "<br>\n";

+            $out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";

         }

-        $out .= "<b>" . $langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+        $out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

         $out .= "<br>\n";

-        $out .= "<b>" . $langs->trans("RequestedUrl") . ":</b> " . dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-        $out .= "<b>" . $langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-        $out .= "<b>" . $langs->trans("MenuManager") . ":</b> " . (isset($conf->standard_menu) ? $conf->standard_menu : '') . "<br>\n";

+        $out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+        $out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+        $out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? $conf->standard_menu : '')."<br>\n";

         $out .= "<br>\n";

-        $syslog .= "url=" . dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-        $syslog .= ", query_string=" . dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+        $syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+        $syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);

     } else {                              // Mode CLI

-        $out .= '> ' . $langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-        $syslog .= "pid=" . dol_getmypid();

+        $out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+        $syslog .= "pid=".dol_getmypid();

     }

 

     if (is_object($db)) {

         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 .= "<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

             // No dol_escape_htmltag for output, we are in CLI mode

-            $out .= '> ' . $langs->transnoentities("DatabaseTypeManager") . ":\n" . $db->type . "\n";

-            $out .= '> ' . $langs->transnoentities("RequestLastAccessInError") . ":\n" . ($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-            $out .= '> ' . $langs->transnoentities("ReturnCodeLastAccessInError") . ":\n" . ($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-            $out .= '> ' . $langs->transnoentities("InformationLastAccessInError") . ":\n" . ($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

+            $out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";

+            $out .= '> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+            $out .= '> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+            $out .= '> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

         }

-        $syslog .= ", sql=" . $db->lastquery();

-        $syslog .= ", db_error=" . $db->lasterror();

+        $syslog .= ", sql=".$db->lastquery();

+        $syslog .= ", db_error=".$db->lasterror();

     }

 

     if ($error || $errors) {

@@ -3734,31 +3734,31 @@ 
             if (empty($msg))

                 continue;

             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

+                $out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";

             } else {                        // Mode CLI

-                $out .= '> ' . $langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                $out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";

             }

-            $syslog .= ", msg=" . $msg;

+            $syslog .= ", msg=".$msg;

         }

     }

     if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

         xdebug_print_function_stack();

-        $out .= '<b>XDebug informations:</b>' . "<br>\n";

-        $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-        $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-        $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+        $out .= '<b>XDebug informations:</b>'."<br>\n";

+        $out .= 'File: '.xdebug_call_file()."<br>\n";

+        $out .= 'Line: '.xdebug_call_line()."<br>\n";

+        $out .= 'Function: '.xdebug_call_function()."<br>\n";

         $out .= "<br>\n";

     }

 

     if (empty($dolibarr_main_prod))

         print $out;

     else {

-        print $langs->trans("DolibarrHasDetectedError") . '. ';

+        print $langs->trans("DolibarrHasDetectedError").'. ';

         print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");

         define("MAIN_CORE_ERROR", 1);

     }

     //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-    dol_syslog("Error " . $syslog, LOG_ERR);

+    dol_syslog("Error ".$syslog, LOG_ERR);

 }

 

 /**

@@ -3781,13 +3781,13 @@ 
     $langs->load("errors");

     $now = dol_now();

 

-    print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

-    print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

+    print '<br><div class="center login_main_message"><div class="'.$morecss.'">';

+    print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d'));

     if ($errormessage)

-        print '<br><br>' . $errormessage;

+        print '<br><br>'.$errormessage;

     if (is_array($errormessages) && count($errormessages)) {

         foreach ($errormessages as $mesgtoshow) {

-            print '<br><br>' . $mesgtoshow;

+            print '<br><br>'.$mesgtoshow;

         }

     }

     print '</div></div>';

@@ -3845,16 +3845,16 @@ 
     }

 

     $tmpsortfield = explode(',', $sortfield);

-    $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+    $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

     $tmpfield = explode(',', $field);

-    $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+    $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

     //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 . '>';

+        $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

     } else {

-        $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+        $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

     }

 

     if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3862,7 +3862,7 @@ 
         $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

         $options = preg_replace('/&+/i', '&', $options);

         if (!preg_match('/^&/', $options)) {

-            $options = '&' . $options;

+            $options = '&'.$options;

         }

 

         $sortordertouseinlink = '';

@@ -3880,7 +3880,7 @@ 
             }

         }

         $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-        $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+        $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

     }

 

     if ($tooltip) {

@@ -3898,7 +3898,7 @@ 
         $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

         $options = preg_replace('/&+/i', '&', $options);

         if (!preg_match('/^&/', $options)) {

-            $options = '&' . $options;

+            $options = '&'.$options;

         }

 

         if (!$sortorder || $field1 != $sortfield1) {

@@ -3908,19 +3908,19 @@ 
             if (preg_match('/^DESC/', $sortorder)) {

                 //$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",1).'</a>';

-                $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

             }

             if (preg_match('/^ASC/', $sortorder)) {

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

             }

         }

     }

 

     $out .= $sortimg;

 

-    $out .= '</' . $tag . '>';

+    $out .= '</'.$tag.'>';

 

     return $out;

 }

@@ -3935,9 +3935,9 @@ 
  */

 function print_titre($title)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-    print '<div class="titre">' . $title . '</div>';

+    print '<div class="titre">'.$title.'</div>';

 }

 

 /**

@@ -3980,20 +3980,20 @@ 
     }

 

     $return .= "\n";

-    $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+    $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

     if ($picto) {

-        $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+        $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

     }

     $return .= '<td class="nobordernopadding valignmiddle">';

-    $return .= '<div class="titre inline-block">' . $titre . '</div>';

+    $return .= '<div class="titre inline-block">'.$titre.'</div>';

     $return .= '</td>';

     if (dol_strlen($morehtmlcenter)) {

-        $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+        $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

     }

     if (dol_strlen($morehtmlright)) {

-        $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+        $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

     }

-    $return .= '</tr></table>' . "\n";

+    $return .= '</tr></table>'."\n";

 

     return $return;

 }

@@ -4041,29 +4041,29 @@ 
     //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

     print "\n";

-    print "<!-- Begin title '" . $titre . "' -->\n";

-    print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+    print "<!-- Begin title '".$titre."' -->\n";

+    print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

     // 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 opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

-    print '<div class="titre inline-block">' . $titre;

+    print '<div class="titre inline-block">'.$titre;

     if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-        print ' (' . $totalnboflines . ')';

+        print ' ('.$totalnboflines.')';

     print '</div></td>';

 

     // Center

     if ($morehtmlcenter) {

-        print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+        print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

     }

 

     // Right

     print '<td class="nobordernopadding valignmiddle" align="right">';

     if ($sortfield)

-        $options .= "&sortfield=" . urlencode($sortfield);

+        $options .= "&sortfield=".urlencode($sortfield);

     if ($sortorder)

-        $options .= "&sortorder=" . urlencode($sortorder);

+        $options .= "&sortorder=".urlencode($sortorder);

     // Show navigation bar

     $pagelist = '';

     if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4081,40 +4081,40 @@ 
             }

 

             if ($cpt >= 1) {

-                $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

+                $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>';

+                    $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>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';

             }

 

             do {

                 if ($cpt == $page) {

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . '</span></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';

                 } else {

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . $cpt . $options . '">' . ($cpt + 1) . '</a></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

                 }

                 $cpt++;

             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

             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>';

+                    $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>';

+                    $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 {

-            $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

+            $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";

         }

     }

 

-    print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+    print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

     print '</td>';

 

-    print '</tr></table>' . "\n";

+    print '</tr></table>'."\n";

     print "<!-- End title -->\n\n";

 }

 

@@ -4145,12 +4145,12 @@ 
             $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

 

         print '<li class="pagination">';

-        print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

+        print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';

         $tmpchoice = explode(',', $pagesizechoices);

-        $tmpkey = $limit . ':' . $limit;

+        $tmpkey = $limit.':'.$limit;

         if (!in_array($tmpkey, $tmpchoice))

             $tmpchoice[] = $tmpkey;

-        $tmpkey = $conf->liste_limit . ':' . $conf->liste_limit;

+        $tmpkey = $conf->liste_limit.':'.$conf->liste_limit;

         if (!in_array($tmpkey, $tmpchoice))

             $tmpchoice[] = $tmpkey;

         asort($tmpchoice, SORT_NUMERIC);

@@ -4165,7 +4165,7 @@ 
                     $selected = ' selected="selected"';

                     $found = true;

                 }

-                print '<option name="' . $key . '"' . $selected . '>' . dol_escape_htmltag($val) . '</option>' . "\n";

+                print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

             }

         }

         print '</select>';

@@ -4184,20 +4184,20 @@ 
         print '</li>';

     }

     if ($page > 0) {

-        print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . dol_escape_htmltag($langs->trans("Previous")) . '"></i></a></li>';

+        print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';

     }

     if ($betweenarrows) {

         print $betweenarrows;

     }

     if ($nextpage > 0) {

-        print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . dol_escape_htmltag($langs->trans("Next")) . '"></i></a></li>';

+        print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';

     }

     if ($afterarrows) {

         print '<li class="paginationafterarrows">';

         print $afterarrows;

         print '</li>';

     }

-    print '</ul></div>' . "\n";

+    print '</ul></div>'."\n";

 }

 

 /**

@@ -4219,8 +4219,8 @@ 
         $addpercent = true;

     }

     if (preg_match('/\((.*)\)/', $rate, $reg)) {

-        $morelabel = ' (' . $reg[1] . ')';

-        $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+        $morelabel = ' ('.$reg[1].')';

+        $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

     }

     if (preg_match('/\*/', $rate)) {

         $rate = str_replace('*', '', $rate);

@@ -4229,10 +4229,10 @@ 
 

     // 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 ? '%' : '');

+        $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 ? '%' : '');

+        $ret = $rate.($addpercent ? '%' : '');

     }

     if (($info_bits & 1) && $usestarfornpr >= 0)

         $ret .= ' *';

@@ -4326,10 +4326,10 @@ 
             $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

         else {

             $tmpcur = $outlangs->getCurrencySymbol($currency_code);

-            $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

+            $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);

         }

     }

-    $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+    $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

     return $output;

 }

@@ -4383,7 +4383,7 @@ 
         // Now make replace (the main goal of function)

         if ($thousand != ',' && $thousand != '.')

             $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-        $amount = str_replace(' ', '', $amount);  // To avoid spaces

+        $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);

     }

@@ -4412,14 +4412,14 @@ 
             $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, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+            $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

         }

         //print "TT".$amount.'<br>';

         // 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

-        $amount = str_replace(' ', '', $amount);  // To avoid spaces

+        $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);

     }

@@ -4440,7 +4440,7 @@ 
  */

 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

 {

-    require_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

     if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

         $dimension = $dimension * 1000000;

@@ -4456,7 +4456,7 @@ 
         $unit = $unit + 3;

     }

 

-    $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+    $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

     return $ret;

 }

@@ -4480,7 +4480,7 @@ 
     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);

+    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)"

@@ -4511,7 +4511,7 @@ 
         if ($local == 2) {

             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

             if (!$mysoc->localtax2_assuj)

-                return 0;  // If main vat is 0, IRPF may be different than 0.

+                return 0; // If main vat is 0, IRPF may be different than 0.

             if ($thirdparty_seller->id == $mysoc->id) {

                 if (!$thirdparty_buyer->localtax2_assuj)

                     return 0;

@@ -4565,13 +4565,13 @@ 
 

     // By default, search value of local tax on line of common tax

     $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-    $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";

+    $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

+        $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

     else

-        $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        $sql .= " AND t.recuperableonly ='".$vatnpr."'";

     dol_syslog("get_localtax", LOG_DEBUG);

     $resql = $db->query($sql);

 

@@ -4617,10 +4617,10 @@ 
 {

     global $db, $mysoc;

     $sql = "SELECT t.localtax1, t.localtax2 ";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-    $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-    $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-    $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+    $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+    $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+    $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

     $sql .= "  )";

 

     $resql = $db->query($sql);

@@ -4650,13 +4650,13 @@ 
 {

     global $db, $mysoc;

 

-    dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+    dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

     // 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";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

     if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

+        $sql .= " WHERE t.rowid = ".(int) $vatrate;

     else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

@@ -4665,13 +4665,13 @@ 
             $vatratecode = $reg[2];

         }

 

-        $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+        $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."'";    // vat in spain use the buyer country ??

           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $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 . "'";

+            $sql .= " AND t.code = '".$vatratecode."'";

     }

 

     $resql = $db->query($sql);

@@ -4707,13 +4707,13 @@ 
 {

     global $db, $mysoc;

 

-    dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+    dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

     // 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";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

     if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

+        $sql .= " WHERE t.rowid = ".(int) $vatrate;

     else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

@@ -4722,14 +4722,14 @@ 
             $vatratecode = $reg[2];

         }

 

-        $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+        $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 ??

+            $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";

+            $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 . "'";

+            $sql .= " AND t.code = '".$vatratecode."'";

     }

 

     $resql = $db->query($sql);

@@ -4761,7 +4761,7 @@ 
 {

     global $db, $conf, $mysoc;

 

-    require_once DOL_BASE_PATH . '/product/class/product.class.php';

+    require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

     $ret = 0;

     $found = 0;

@@ -4776,12 +4776,12 @@ 
                 $product->get_buyprice($idprodfournprice, 0, 0, 0);

                 $ret = $product->vatrate_supplier;

                 if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                    $ret .= ' ('.$product->default_vat_code.')';

             }

             else {

-                $ret = $product->tva_tx;    // Default vat of product we defined

+                $ret = $product->tva_tx; // Default vat of product we defined

                 if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                    $ret .= ' ('.$product->default_vat_code.')';

             }

             $found = 1;

         }

@@ -4795,8 +4795,8 @@ 
         if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

             // If vat of product for the country not found or not defined, we return the first higher vat of country.

             $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-            $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 .= " 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.code ASC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4806,16 +4806,16 @@ 
                 if ($obj) {

                     $ret = $obj->vat_rate;

                     if ($obj->default_vat_code)

-                        $ret .= ' (' . $obj->default_vat_code . ')';

+                        $ret .= ' ('.$obj->default_vat_code.')';

                 }

                 $db->free($sql);

             } else

                 dol_print_error($db);

         } else

-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

     }

 

-    dol_syslog("get_product_vat_for_country: ret=" . $ret);

+    dol_syslog("get_product_vat_for_country: ret=".$ret);

     return $ret;

 }

 

@@ -4833,7 +4833,7 @@ 
     global $db, $mysoc;

 

     if (!class_exists('Product')) {

-        require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        require_once DOL_BASE_PATH.'product/class/product.class.php';

     }

 

     $ret = 0;

@@ -4858,8 +4858,8 @@ 
     if (!$found) {

         // 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 .= " 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";

         $sql .= $db->plimit(1);

 

@@ -4876,7 +4876,7 @@ 
             dol_print_error($db);

     }

 

-    dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+    dol_syslog("get_product_localtax_for_country: ret=".$ret);

     return $ret;

 }

 

@@ -4900,7 +4900,7 @@ 
 {

     global $conf;

 

-    require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/company.lib.php';

 

     // Note: possible values for tva_assuj are 0/1 or franchise/reel

     $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4911,7 +4911,7 @@ 
     $buyer_country_code = $thirdparty_buyer->country_code;

     $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-    dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+    dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

     // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

     // we use the buyer VAT.

@@ -4977,14 +4977,14 @@ 
 

     if ($idprodfournprice > 0) {

         if (!class_exists('ProductFournisseur'))

-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

         $prodprice = new ProductFournisseur($db);

         $prodprice->fetch_product_fournisseur_price($idprodfournprice);

         return $prodprice->fourn_tva_npr;

     }

     elseif ($idprod > 0) {

         if (!class_exists('Product'))

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         $prod = new Product($db);

         $prod->fetch($idprod);

         return $prod->tva_npr;

@@ -5063,7 +5063,7 @@ 
         if ($case == 2)

             $result = '<input type="checkbox" value="1" checked disabled>';

         if ($case == 3)

-            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

         $classname = 'ok';

     }

@@ -5074,7 +5074,7 @@ 
         if ($case == 2)

             $result = '<input type="checkbox" value="0" disabled>';

         if ($case == 3)

-            $result = '<input type="checkbox" value="0" disabled> ' . $result;

+            $result = '<input type="checkbox" value="0" disabled> '.$result;

 

         if ($color == 2)

             $classname = 'ok';

@@ -5082,7 +5082,7 @@ 
             $classname = 'error';

     }

     if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        return '<font class="'.$classname.'">'.$result.'</font>';

     return $result;

 }

 

@@ -5116,13 +5116,13 @@ 
             $num = preg_replace('/([^0-9])/i', '', $num);

         else

             $num = preg_replace('/^.*\-/i', '', $num);

-        $num = substr("000" . $num, -$level);

+        $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);

+            $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);

+            $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

     }

     else {

         // TODO

@@ -5153,7 +5153,7 @@ 
 {

     global $conf;

 

-    dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+    dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

     $dir_osencoded = dol_osencode($dir);

     if (@is_dir($dir_osencoded))

@@ -5165,15 +5165,15 @@ 
     $ccdir = '';

     if (!empty($dataroot)) {

         // Remove data root from loop

-        $dir = str_replace($dataroot . '/', '', $dir);

-        $ccdir = $dataroot . '/';

+        $dir = str_replace($dataroot.'/', '', $dir);

+        $ccdir = $dataroot.'/';

     }

 

     $cdir = explode("/", $dir);

     $num = count($cdir);

     for ($i = 0; $i < $num; $i++) {

         if ($i > 0)

-            $ccdir .= '/' . $cdir[$i];

+            $ccdir .= '/'.$cdir[$i];

         else

             $ccdir .= $cdir[$i];

         if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5204,20 +5204,20 @@ 
         if ($ccdir) {

             $ccdir_osencoded = dol_osencode($ccdir);

             if (!@is_dir($ccdir_osencoded)) {

-                dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                 umask(0);

                 $dirmaskdec = octdec($newmask);

                 if (empty($newmask)) {

                     $dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);

                 }

-                $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                 if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                     // 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);

+                    dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                     $nberr++;

                 } else {

-                    dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                    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++;

                 }

@@ -5265,9 +5265,9 @@ 
     } else {

         $pattern = "/<[^<>]+>/";

         // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-        $temp = preg_replace($pattern, "", $temp);    // pass 1

+        $temp = preg_replace($pattern, "", $temp); // pass 1

         // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-        $temp = preg_replace($pattern, "", $temp);    // pass 2

+        $temp = preg_replace($pattern, "", $temp); // pass 2

         // $temp after pass 2: 0000-021

     }

 

@@ -5323,8 +5323,8 @@ 
 {

     $temp = $stringtoclean;

     foreach ($disallowed_tags as $tagtoremove) {

-        $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-        $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+        $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+        $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

     }

     return $temp;

 }

@@ -5341,12 +5341,12 @@ 
 {

     if ($nboflines == 1) {

         if (dol_textishtml($text)) {

-            $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+            $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 {

             $firstline = preg_replace('/[\n\r].*/', '', $text);

         }

-        return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+        return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

     } else {

         $ishtml = 0;

         if (dol_textishtml($text)) {

@@ -5362,7 +5362,7 @@ 
             $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.

+            $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 = '';

@@ -5376,7 +5376,7 @@ 
             $i++;

         }

         unset($a);

-        return $firstline . (($i < $nba) ? '...' : '');

+        return $firstline.(($i < $nba) ? '...' : '');

     }

 }

 

@@ -5447,9 +5447,9 @@ 
 function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

 {

     $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-    $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+    $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

     $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

     return $ret;

 }

@@ -5462,7 +5462,7 @@ 
  */

 function dol_htmlcleanlastbr($stringtodecode)

 {

-    $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+    $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

     return $ret;

 }

 

@@ -5559,7 +5559,7 @@ 
         $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.

+        $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);

@@ -5590,7 +5590,7 @@ 
  */

 function dol_microtime_float()

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     return microtime(true);

 }

@@ -5636,9 +5636,9 @@ 
         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)

+            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 true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

         return false;

     }

@@ -5863,7 +5863,7 @@ 
                 if ($object->fetch_optionals() > 0) {

                     if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                         foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                            $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                            $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                         }

                     }

                 }

@@ -5875,7 +5875,7 @@ 
                 $paymenturl = '';

             } else {

                 // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

-                require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

+                require_once DOL_BASE_PATH.'/core/lib/payments.lib.php';

                 $outputlangs->loadLangs(array('paypal', 'other'));

                 $typeforonlinepayment = 'free';

                 if (is_object($object) && $object->element == 'commande')

@@ -5936,7 +5936,7 @@ 
 

     //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

     if (empty($exclude) || !in_array('date', $exclude)) {

-        include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+        include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

         $tmp = dol_getdate(dol_now(), true);

         $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -5946,13 +5946,13 @@ 
 

         $substitutionarray = array_merge($substitutionarray, array(

             '__DAY__' => (string) $tmp['mday'],

-            '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-            '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-            '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+            '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+            '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+            '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

             '__MONTH__' => (string) $tmp['mon'],

-            '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-            '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-            '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

             '__YEAR__' => (string) $tmp['year'],

             '__PREVIOUS_DAY__' => (string) $tmp2['day'],

             '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -6011,7 +6011,7 @@ 
             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);

+            $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

         }

     }

 

@@ -6027,13 +6027,13 @@ 
             $newval = '*****forbidden*****';

         else

             $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

-        $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

+        $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

+            $value = ''; // Protection

         if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

             $value = ''; // Protection

 

@@ -6059,7 +6059,7 @@ 
 {

     global $conf, $user;

 

-    require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

     // Add a substitution key for each extrafields, using key __EXTRA_XXX__

     // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6089,11 +6089,11 @@ 
             if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                 $module = $reg[1];

 

-                dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                 // Include the user's functions file

-                require_once $dir . $substitfile['name'];

+                require_once $dir.$substitfile['name'];

                 // Call the user's function, and only if it is defined

-                $function_name = $module . "_" . $callfunc;

+                $function_name = $module."_".$callfunc;

                 if (function_exists($function_name))

                     $function_name($substitutionarray, $outputlangs, $object, $parameters);

             }

@@ -6135,13 +6135,13 @@ 
         $outputlangs = $langs;

 

     if ($date_start && $date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

     if ($date_start && !$date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

     if (!$date_start && $date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

 

     return $out;

@@ -6221,7 +6221,7 @@ 
         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

     } else {

         if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+            dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

         if (empty($mesgs))

             setEventMessage($mesg, $style);

         else {

@@ -6290,7 +6290,7 @@ 
 

     // If inline message with no format, we add it.

     if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-        $divstart = '<div class="' . $style . ' clearboth">';

+        $divstart = '<div class="'.$style.' clearboth">';

         $divend = '</div>';

     }

 

@@ -6317,14 +6317,14 @@ 
         if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

             $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: function (){} } );

 						}

 					});

@@ -6519,11 +6519,11 @@ 
 {

     global $conf;

 

-    $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+    $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

+        $tmp = 'utf-8'; // By default for other

     if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING))

         $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6555,16 +6555,16 @@ 
 

     // Check in cache

     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-        return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+        return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

     }

 

     dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-    $sql = "SELECT " . $fieldid . " as valuetoget";

-    $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

-    $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

+    $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) . ")";

+        $sql .= " AND entity IN (".getEntity($tablename).")";

 

     $resql = $db->query($sql);

     if ($resql) {

@@ -6591,12 +6591,12 @@ 
 {

     global $user, $conf, $langs;

     global $leftmenu;

-    global $rights;    // To export to dol_eval function

+    global $rights; // To export to dol_eval function

     //print $strRights."<br>\n";

     $rights = true;

     if ($strRights != '') {

-        $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-        dol_eval($str);  // The dol_eval must contains all the global $xxx used into a condition

+        $str = 'if(!('.$strRights.')) { $rights = false; }';

+        dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition

     }

     return $rights;

 }

@@ -6619,14 +6619,14 @@ 
     global $object;

     global $mysoc;

 

-    global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object

-    global $soc;       // For backward compatibility

+    global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object

+    global $soc; // For backward compatibility

     //print $s."<br>\n";

     if ($returnvalue) {

         if ($hideerrors)

-            return @eval('return ' . $s . ';');

+            return @eval('return '.$s.';');

         else

-            return eval('return ' . $s . ';');

+            return eval('return '.$s.';');

     }

     else {

         if ($hideerrors)

@@ -6680,7 +6680,7 @@ 
         $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

     }

 

-    return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+    return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

 }

 

 /**

@@ -6878,16 +6878,16 @@ 
         'zu-ZA',

     );

 

-    $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+    $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

     if (in_array($buildprimarykeytotest, $locales))

-        return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        return strtolower($countrycode).'_'.strtoupper($countrycode);

 

     foreach ($locales as $locale) {

         $locale_language = locale_get_primary_language($locale);

         $locale_region = locale_get_region($locale);

         if (strtoupper($countrycode) == $locale_region) {

             //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-            return strtolower($locale_language) . '_' . strtoupper($locale_region);

+            return strtolower($locale_language).'_'.strtoupper($locale_region);

         }

     }

 

@@ -6948,7 +6948,7 @@ 
                             $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][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                        $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

@@ -7019,43 +7019,43 @@ 
     global $micro_start_time;

 

     if ($zone == 'private')

-        print "\n" . '<!-- Common footer for private page -->' . "\n";

+        print "\n".'<!-- Common footer for private page -->'."\n";

     else

-        print "\n" . '<!-- Common footer for public page -->' . "\n";

+        print "\n".'<!-- Common footer for public page -->'."\n";

 

     // A div to store page_y POST parameter so we can read it using javascript

     print "\n<!-- A div to store page_y POST paramater -->\n";

-    print '<div id="page_y" style="display: none;">' . $_POST['page_y'] . '</div>' . "\n";

+    print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";

 

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+    $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";

+            print $conf->global->MAIN_HTML_FOOTER."\n";

 

         print "\n";

         if (!empty($conf->use_javascript_ajax)) {

-            print '<script type="text/javascript" language="javascript">' . "\n";

-            print 'jQuery(document).ready(function() {' . "\n";

+            print '<script type="text/javascript" language="javascript">'."\n";

+            print 'jQuery(document).ready(function() {'."\n";

 

             if ($zone == 'private' && empty($conf->dol_use_jmobile)) {

                 print "\n";

-                print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                 print 'jQuery(".menuhider").click(function() {';

-                print '  console.log("We click on .menuhider");' . "\n";

+                print '  console.log("We click on .menuhider");'."\n";

                 //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                 print "  $('.side-nav').toggle()\n";

                 print "  $('.login_block').toggle()\n";

-                print '});' . "\n";

+                print '});'."\n";

             }

 

             // Management of focus and mandatory for fields

             if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                 $relativepathstring = $_SERVER["PHP_SELF"];

                 // Clean $relativepathstring

                 if (constant('DOL_URL_ROOT'))

-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+                    $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7078,9 +7078,9 @@ 
                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

                                 // Set focus on field

-                                print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                             }

                         }

                     }

@@ -7104,16 +7104,16 @@ 
                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

                                 // Add property 'required' on input

-                                print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                             }

                         }

                     }

                 }

             }

 

-            print '});' . "\n";

+            print '});'."\n";

 

             // Google Analytics

             // TODO Add a hook here

@@ -7121,15 +7121,15 @@ 
                 if (($conf->dol_use_jmobile != 4)) {

                     print "\n";

                     print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                    print '  var _gaq = _gaq || [];' . "\n";

-                    print '  _gaq.push([\'_setAccount\', \'' . $conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                    print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                    print '' . "\n";

-                    print '  (function() {' . "\n";

-                    print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                    print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                    print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                    print '  })();' . "\n";

+                    print '  var _gaq = _gaq || [];'."\n";

+                    print '  _gaq.push([\'_setAccount\', \''.$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                    print '  _gaq.push([\'_trackPageview\']);'."\n";

+                    print ''."\n";

+                    print '  (function() {'."\n";

+                    print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                    print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                    print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                    print '  })();'."\n";

                 }

             }

 

@@ -7139,27 +7139,27 @@ 
                 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 . ' - ';

-                print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                    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.

                     $micro_end_time = microtime(true);

-                    print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                    print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                 }

                 if (function_exists("memory_get_usage")) {

-                    print ' - Mem: ' . memory_get_usage();

+                    print ' - Mem: '.memory_get_usage();

                 }

                 if (function_exists("xdebug_memory_usage")) {

-                    print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                    print ' - XDebug mem: ' . xdebug_memory_usage();

-                    print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                    print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                    print ' - XDebug mem: '.xdebug_memory_usage();

+                    print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                 }

                 if (function_exists("zend_loader_file_encoded")) {

-                    print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                    print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                 }

-                print '");' . "\n";

+                print '");'."\n";

             }

 

-            print "\n" . '</script>' . "\n";

+            print "\n".'</script>'."\n";

         }

 

         // Add Xdebug coverage of code

@@ -7173,7 +7173,7 @@ 
             print "<!-- Start of log output\n";

             //print '<div class="hidden">'."\n";

             foreach ($conf->logbuffer as $logline) {

-                print $logline . "<br>\n";

+                print $logline."<br>\n";

             }

             //print '</div>'."\n";

             print "End of log output -->\n";

@@ -7216,8 +7216,8 @@ 
  */

 function dol_set_focus($selector)

 {

-    print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-    print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+    print "\n".'<!-- Set focus onto a specific field -->'."\n";

+    print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

 }

 

 /**

@@ -7262,7 +7262,7 @@ 
         $value = preg_replace('/\*/', '%', $value); // Replace * with %

     }

     if ($mode == 1) {

-        $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote($langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+        $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

     }

 

     $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7291,14 +7291,14 @@ 
                 if ($newcrit != '') {

                     $numnewcrit = price2num($newcrit);

                     if (is_numeric($numnewcrit)) {

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                     } else {

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                        $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                     }

                     $i2++; // a criteria was added to string

                 }

             } else if ($mode == 2) {

-                $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                 $i2++; // a criteria was added to string

             } else if ($mode == 3) {

                 $tmparray = explode(',', trim($crit));

@@ -7307,10 +7307,10 @@ 
                     foreach ($tmparray as $val) {

                         if ($val) {

                             $listofcodes .= ($listofcodes ? ',' : '');

-                            $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                            $listofcodes .= "'".$db->escape(trim($val))."'";

                         }

                     }

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                     $i2++; // a criteria was added to string

                 }

             } else if ($mode == 4) {

@@ -7319,10 +7319,10 @@ 
                     $listofcodes = '';

                     foreach ($tmparray as $val) {

                         if ($val) {

-                            $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                            $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                            $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                            $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                            $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                            $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                            $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                            $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                             $newres .= ')';

                             $i2++;

                         }

@@ -7339,9 +7339,9 @@ 
                     $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

-                        $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                        $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                     } else {

-                        $newres .= $field . " LIKE '";

+                        $newres .= $field." LIKE '";

 

                         $tmpcrit = trim($tmpcrit);

                         $tmpcrit2 = $tmpcrit;

@@ -7360,7 +7360,7 @@ 
                         $newres .= $tmpafter;

                         $newres .= "'";

                         if ($tmpcrit2 == '') {

-                            $newres .= ' OR ' . $field . " IS NULL";

+                            $newres .= ' OR '.$field." IS NULL";

                         }

                     }

 

@@ -7371,10 +7371,10 @@ 
             $i++;

         }

         if ($newres)

-            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

         $j++;

     }

-    $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+    $res = ($nofirstand ? "" : " AND ")."(".$res.")";

     //print 'xx'.$res.'yy';

     return $res;

 }

@@ -7393,8 +7393,8 @@ 
     $url = $object->getLastMainDocLink($object->element);

 

     if ($url) {

-        $out .= img_picto('', 'object_globe.png') . ' ' . $langs->trans("DirectDownloadLink") . '<br>';

-        $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+        $out .= img_picto('', 'object_globe.png').' '.$langs->trans("DirectDownloadLink").'<br>';

+        $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

         $out .= ajax_autoselect("directdownloadlink", 0);

     }

     return $out;

@@ -7435,7 +7435,7 @@ 
     if ($extName)

         $subdir = 'thumbs/';

 

-    return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+    return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

 }

 

 /**

@@ -7461,14 +7461,14 @@ 
 

     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) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), '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')) . '\')';

+        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 '';

 }

@@ -7485,11 +7485,11 @@ 
     global $langs;

     $out = '<script type="text/javascript">

                jQuery(document).ready(function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

     if ($addlink)

-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+        $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';

     return $out;

 }

 

@@ -7870,9 +7870,9 @@ 
 

     if (!isset($dictvalues[$tablename])) {

         $dictvalues[$tablename] = array();

-        $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+        $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

         if ($checkentity)

-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -7910,14 +7910,14 @@ 
             $g = $tmp[1];

             $b = $tmp[2];

         } else {

-            $hexr = $stringcolor[0] . $stringcolor[1];

-            $hexg = $stringcolor[2] . $stringcolor[3];

-            $hexb = $stringcolor[4] . $stringcolor[5];

+            $hexr = $stringcolor[0].$stringcolor[1];

+            $hexg = $stringcolor[2].$stringcolor[3];

+            $hexb = $stringcolor[4].$stringcolor[5];

             $r = hexdec($hexr);

             $g = hexdec($hexg);

             $b = hexdec($hexb);

         }

-        $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+        $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

         if ($bright > 0.6)

             $res = 1;

     }

@@ -7953,11 +7953,11 @@ 
             return 0; // Entry is for menus all excluded to external users

     }

     if (!$menuentry['perms'] && $type_user)

-        return 0;            // No permissions and user is external

+        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

+        return 2; // No permissions and user is external

     return 1;

 }

 

Braces +1463 added lines, -1051 removed lines

@@ -75,8 +75,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;

 }

@@ -127,8 +128,9 @@ 
     } 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;

     }

@@ -307,32 +309,35 @@ 
 {

     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);

         // Enable this line to know who call the GETPOST with '' $check parameter.

         //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);

@@ -381,14 +386,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $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) {

                                     //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -415,20 +423,24 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $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);

                                             }

@@ -448,14 +460,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $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) {

                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -527,8 +542,10 @@ 
                 $newout = $user->fk_user;

             } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                 $newout = $conf->entity;

-            } else

-                $newout = '';     // Key not found, we replace with empty string

+            } else {
+                            $newout = '';
+            }
+            // Key not found, we replace with empty string

 

 

 

@@ -564,18 +581,20 @@ 
             }

             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)) {

                 $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':

@@ -584,27 +603,31 @@ 
         case 'aZ':

             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 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

             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':  // Recommended for most scalar parameters

             $out = dol_string_nohtmltag($out, 0);

@@ -614,16 +637,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;

     }

@@ -663,10 +688,11 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) { // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

-                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"];
+                }
             }

             return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

         }

@@ -739,22 +765,27 @@ 
             }

         }

         if ($returnemptyifnotfound) {        // Not found into alternate dir

-            if ($returnemptyifnotfound == 1 || !file_exists($res))

-                return '';

+            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 */ DOL_BASE_URI . '/' . $path;   // Standard value

-        if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

-        if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+        if ($type == 1) {
+                    $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;
+        }
+        // Standard value

+        if ($type == 2) {
+                    $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $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", ...)

             if ($key == 'main') {

@@ -834,13 +865,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;
+    }
+    }

 

 /**

  * 	Clean a string to use it as a file name

@@ -939,8 +972,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));

@@ -977,9 +1011,9 @@ 
     if (empty($mode)) {

         $substitjs["'"] = "\\'";

         $substitjs['"'] = "\\'";

-    } else if ($mode == 1)

-        $substitjs["'"] = "\\'";

-    else if ($mode == 2) {

+    } else if ($mode == 1) {
+            $substitjs["'"] = "\\'";
+    } else if ($mode == 2) {

         $substitjs['"'] = '\\"';

     } else if ($mode == 3) {

         $substitjs["'"] = "\\'";

@@ -1001,10 +1035,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

 }

 

@@ -1055,8 +1091,9 @@ 
     global $conf, $user;

 

     // If syslog module enabled

-    if (empty($conf->syslog->enabled))

-        return;

+    if (empty($conf->syslog->enabled)) {
+            return;
+    }
 

     if ($ident < 0) {

         foreach ($conf->loghandlers as $loghandlerinstance) {

@@ -1070,8 +1107,9 @@ 
         if (!in_array($level, $logLevels, true)) {

             throw new Exception('Incorrect log level');

         }

-        if ($level > $conf->global->SYSLOG_LEVEL)

-            return;

+        if ($level > $conf->global->SYSLOG_LEVEL) {
+                    return;
+        }
 

         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

         // If adding log inside HTML page is required

@@ -1096,24 +1134,30 @@ 
         );

 

         // 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);

@@ -1169,13 +1213,15 @@ 
 

     // 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>';

     }

@@ -1184,12 +1230,14 @@ 
     $maxkey = -1;

     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;

@@ -1202,8 +1250,9 @@ 
     for ($i = 0; $i <= $maxkey; $i++) {

         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--;
+            }
         }

     }

 

@@ -1244,12 +1293,12 @@ 
             }

             $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' . ($morecss ? ' ' . $morecss : '') . '" 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])) {

+                if (!empty($links[$i][0])) {
+                                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" 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])) {

                 $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" 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.

                 $outmore .= '</a>' . "\n";

@@ -1260,8 +1309,9 @@ 
         }

         $displaytab = $i;

     }

-    if ($popuptab)

-        $outmore .= '</div>';

+    if ($popuptab) {
+            $outmore .= '</div>';
+    }
 

     if ($displaytab > $limittoshow) {

         $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1284,8 +1334,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"

@@ -1315,11 +1366,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.

@@ -1350,40 +1402,55 @@ 
     $showimage = 1;

     $entity = (empty($object->entity) ? $conf->entity : $object->entity);

     $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') {

@@ -1391,11 +1458,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);

         $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

-        if ($conf->browser->layout == 'phone')

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

             if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1411,11 +1479,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

-        if ($conf->browser->layout == 'phone')

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

             if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1440,8 +1509,10 @@ 
                     } else {

                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                     }

-                    if (empty($subdir))

-                        $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                    if (empty($subdir)) {
+                                            $subdir = 'errorgettingsubdirofobject';
+                    }
+                    // Protection to avoid to return empty path

 

                     $filepath = $dir_output . $subdir . "/";

 

@@ -1462,14 +1533,16 @@ 
                             if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                 include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                 $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)) {

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1505,8 +1578,10 @@ 
                     $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 -->';

@@ -1517,8 +1592,9 @@ 
         }

     }

 

-    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)) {

@@ -1542,35 +1618,37 @@ 
         }

     } 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') {

-        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);

-    }

-    elseif ($object->element == 'project_task') {

+    } 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->frequency == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(2);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        }
+    } elseif ($object->element == 'project_task') {

         $object->fk_statut = 1;

-        if ($object->progress > 0)

-            $object->fk_statut = 2;

-        if ($object->progress >= 100)

-            $object->fk_statut = 3;

+        if ($object->progress > 0) {
+                    $object->fk_statut = 2;
+        }
+        if ($object->progress >= 100) {
+                    $object->fk_statut = 3;
+        }
         $tmptxt = $object->getLibStatut(5);

         $morehtmlstatus .= $tmptxt;  // No status on task

-    }

-    else { // Generic case

+    } 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;

     }

 

@@ -1584,13 +1662,15 @@ 
     }

 

     // 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') {

@@ -1623,15 +1703,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;

 }

 

@@ -1646,8 +1730,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;

 }

 

@@ -1678,18 +1763,18 @@ 
         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) {

@@ -1706,8 +1791,9 @@ 
             $ret .= ($ret ? ", " : '') . $object->state;

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
     if ($withcountry) {

         $langs->load("dict");

         $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1728,9 +1814,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).

@@ -1776,10 +1863,12 @@ 
             }

         }

     }

-    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) {

@@ -1788,40 +1877,46 @@ 
     }  // 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')

-    // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-        $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') {
+        // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+        $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) {

         $format = str_replace('%Y', '%y', $format);

@@ -1829,8 +1924,10 @@ 
     }

 

     // 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)

 

 

 

@@ -1885,8 +1982,9 @@ 
             $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)) {

@@ -1957,10 +2055,14 @@ 
     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);

@@ -1995,27 +2097,36 @@ 
     global $conf;

     //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')) {

@@ -2072,8 +2183,10 @@ 
 

     // 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.

+    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_BASE_PATH . '/core/lib/date.lib.php';

         $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2107,8 +2220,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)) {

@@ -2143,19 +2257,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>';

@@ -2179,13 +2297,15 @@ 
 

     $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);

@@ -2198,13 +2318,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)) {

             $langs->load("errors");

             $newemail .= img_warning($langs->trans("ErrorBadEMail", $email));

@@ -2236,8 +2357,9 @@ 
 

     $newskype = $value;

 

-    if (empty($value))

-        return '&nbsp;';

+    if (empty($value)) {
+            return '&nbsp;';
+    }
 

     if (!empty($type)) {

         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2258,13 +2380,13 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

             $addlink = '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=' . $addlink . '&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=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
             $newskype .= ($link ? ' ' . $link : '');

         }

         $newskype .= '</div>';

-    }

-    else {

+    } else {

         $langs->load("errors");

         $newskype .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));

     }

@@ -2294,12 +2416,14 @@ 
     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") {

@@ -2465,15 +2589,18 @@ 
             $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

-            if (empty($user->clicktodial_loaded))

-                $user->fetch_clicktodial();

+            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) : '');

@@ -2488,8 +2615,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>';

         }

 

@@ -2497,12 +2625,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>';
+            }
         }

     }

 

@@ -2529,15 +2660,17 @@ 
                 $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;

@@ -2568,8 +2701,9 @@ 
         if ($countrycode) { // If success, countrycode is us, fr, ...

             if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

                 $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-            } else

-                $ret .= ' (' . $countrycode . ')';

+            } else {
+                            $ret .= ' (' . $countrycode . ')';
+            }
         }

     }

 

@@ -2667,26 +2801,33 @@ 
             $out .= $hookmanager->resPrint;

         }

         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) {

                 $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2698,11 +2839,12 @@ 
             }

         }

     }

-    if ($noprint)

-        return $out;

-    else

-        print $out;

-}

+    if ($noprint) {
+            return $out;
+    } else {
+            print $out;
+    }
+    }

 

 /**

  * 	Return true if email syntax is ok

@@ -2713,10 +2855,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,10 +2882,12 @@ 
             $mxhosts = array();

             $weight = array();

             getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-            if (count($mxhosts) > 1)

-                return 1;

-            if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                return 1;

+            if (count($mxhosts) > 1) {
+                            return 1;
+            }
+            if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                            return 1;
+            }
 

             return 0;

         }

@@ -2770,11 +2916,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 if mbstring module is not enabled for better compatibility.

@@ -2790,8 +2937,9 @@ 
 {

     global $langs;

 

-    if (empty($stringencoding))

-        $stringencoding = $langs->charset_output;

+    if (empty($stringencoding)) {
+            $stringencoding = $langs->charset_output;
+    }
 

     $ret = '';

     if (empty($trunconbytes)) {

@@ -2827,49 +2975,56 @@ 
 {

     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 ...

-            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-        else

-        //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-            return $string;

-    }

-    elseif ($trunc == 'middle') {

+        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;

+            return $string;
+        }
+    } 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)) {

             $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;

-    }

-    elseif ($trunc == 'left') {

+        } else {
+                    return $string;
+        }
+    } 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 ...

-            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-        else

-            return $string;

-    }

-    elseif ($trunc == 'wrap') {

+        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') {

         $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;

-    } else

-        return 'BadParam3CallingDolTrunc';

-}

+        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';
+    }
+    }

 

 /**

  * 	Show picto whatever it's its name (generic function)

@@ -3079,8 +3234,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;

     $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;

@@ -3102,20 +3258,22 @@ 
 {

     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;

         $path = DOL_BASE_URI . '/theme/common/' . $picto;

 

         if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

             $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;

 

-            if (file_exists($themepath))

-                $path = $themepath;

+            if (file_exists($themepath)) {
+                            $path = $themepath;
+            }
         }

     }

 

@@ -3154,8 +3312,9 @@ 
             $numaction = 0;

         }

     }

-    if (!is_numeric($numaction))

-        $numaction = 0;

+    if (!is_numeric($numaction)) {
+            $numaction = 0;
+    }
 

     return img_picto($titlealt, 'stcomm' . $numaction . '.png');

 }

@@ -3171,8 +3330,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');

 }

@@ -3188,8 +3348,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);

 }

@@ -3205,8 +3366,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);

 }

@@ -3223,8 +3385,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 : ''));

 }

@@ -3241,8 +3404,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('View');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('View');
+    }
 

     $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3260,8 +3424,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);

     //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3277,8 +3442,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);

 }

 

@@ -3293,8 +3459,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);

 }

@@ -3311,10 +3478,11 @@ 
     global $conf, $langs;

 

     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' : '')) . '"');

@@ -3330,8 +3498,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;"');

 }

@@ -3347,8 +3516,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) : ''));

@@ -3364,8 +3534,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"');

 }

@@ -3381,8 +3552,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>';

@@ -3399,8 +3571,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>';

@@ -3418,8 +3591,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 : "") . '"');

 }

@@ -3436,8 +3610,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 : "") . '"');

 }

@@ -3454,8 +3629,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);

 }

@@ -3472,8 +3648,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);

 }

@@ -3489,11 +3666,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 '-';

 }

@@ -3541,8 +3720,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>';

@@ -3564,13 +3744,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);

 }

@@ -3586,8 +3768,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);

 

@@ -3608,8 +3791,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);

 

@@ -3671,14 +3855,16 @@ 
 

     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";

         }

@@ -3721,18 +3907,20 @@ 
         $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 (empty($msg)) {
+                            continue;
+            }
             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                 $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

             } else {                        // Mode CLI

@@ -3750,9 +3938,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");

         define("MAIN_CORE_ERROR", 1);

@@ -3775,16 +3963,18 @@ 
 {

     global $langs, $conf;

 

-    if (empty($email))

-        $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;

+    if (empty($email)) {
+            $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    }
 

     $langs->load("errors");

     $now = dol_now();

 

     print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

     print $langs->trans("ErrorContactEMail", $email, $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) {

             print '<br><br>' . $mesgtoshow;

@@ -4027,12 +4217,15 @@ 
     $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 {

@@ -4046,11 +4239,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 opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+    if ($picto && $titre) {
+            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $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

@@ -4060,10 +4255,12 @@ 
 

     // 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)) {

@@ -4071,10 +4268,11 @@ 
             // 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;

@@ -4082,10 +4280,11 @@ 
 

             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 {

@@ -4098,14 +4297,14 @@ 
             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

             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>";

         }

     }

@@ -4141,18 +4340,21 @@ 
         $pagesizechoices = '10:10,15:15,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) {

@@ -4228,14 +4430,15 @@ 
     }

 

     // 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;

 }

@@ -4260,11 +4463,14 @@ 
     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)

@@ -4272,17 +4478,21 @@ 
     $thousand = ' ';

 

     // If $outlangs not forced, we use use language

-    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 (!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 = ' ';
+    }
     //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

     //print "amount=".$amount."-";

     $amount = str_replace(',', '.', $amount); // should be useless

@@ -4294,8 +4504,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) {

         $nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;

@@ -4306,8 +4517,9 @@ 
     }

 

     // If force rounding

-    if ($forcerounding >= 0)

-        $nbdecimal = $forcerounding;

+    if ($forcerounding >= 0) {
+            $nbdecimal = $forcerounding;
+    }
 

     // Format number

     $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4318,13 +4530,14 @@ 
     // Add symbol of currency if requested

     $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);

         }

@@ -4358,14 +4571,17 @@ 
     // 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

@@ -4381,8 +4597,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);

@@ -4391,19 +4609,23 @@ 
     // Now, make a rounding if required

     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;

+        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;
+        }
         //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

         // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

@@ -4417,8 +4639,10 @@ 
         //print "TT".$amount.'<br>';

         // 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);

@@ -4477,8 +4701,9 @@ 
 {

     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);

 

@@ -4496,37 +4721,43 @@ 
     // 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 ($local == 1) {

-            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                return 0;

+            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_seller->localtax1_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
             }

         }

 

         if ($local == 2) {

             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-            if (!$mysoc->localtax2_assuj)

-                return 0;  // If main vat is 0, IRPF may be different than 0.

+            if (!$mysoc->localtax2_assuj) {
+                            return 0;
+            }
+            // If main vat is 0, IRPF may be different than 0.

             if ($thirdparty_seller->id == $mysoc->id) {

-                if (!$thirdparty_buyer->localtax2_assuj)

-                    return 0;

-            }

-            else {

-                if (!$thirdparty_seller->localtax2_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax2_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax2_assuj) {
+                                    return 0;
+                }
             }

         }

-    }

-    else {

-        if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-            return 0;

-        if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-            return 0;

+    } else {

+        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.

@@ -4568,19 +4799,23 @@ 
     $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;

@@ -4626,10 +4861,11 @@ 
     $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;

@@ -4655,9 +4891,9 @@ 
     // 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)"

@@ -4670,19 +4906,22 @@ 
           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

         $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();

-    } else

-        dol_print_error($db);

+        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);
+    }
 

     return array();

 }

@@ -4712,9 +4951,9 @@ 
     // 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 "x.x (yy)"

@@ -4723,13 +4962,17 @@ 
         }

 

         $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);

@@ -4775,17 +5018,17 @@ 
             if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                 $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

         }

@@ -4805,14 +5048,18 @@ 
                 $obj = $db->fetch_object($resql);

                 if ($obj) {

                     $ret = $obj->vat_rate;

-                    if ($obj->default_vat_code)

-                        $ret .= ' (' . $obj->default_vat_code . ')';

+                    if ($obj->default_vat_code) {
+                                            $ret .= ' (' . $obj->default_vat_code . ')';
+                    }
                 }

                 $db->free($sql);

-            } else

-                dol_print_error($db);

-        } else

-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            } else {
+                            dol_print_error($db);
+            }
+        } else {
+                    $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+        }
+        // Forced value if autodetect fails

     }

 

     dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4867,13 +5114,15 @@ 
         if ($resql) {

             $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);

@@ -4976,15 +5225,16 @@ 
     global $db;

 

     if ($idprodfournprice > 0) {

-        if (!class_exists('ProductFournisseur'))

-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+        if (!class_exists('ProductFournisseur')) {
+                    require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+        }
         $prodprice = new ProductFournisseur($db);

         $prodprice->fetch_product_fournisseur_price($idprodfournprice);

         return $prodprice->fourn_tva_npr;

-    }

-    elseif ($idprod > 0) {

-        if (!class_exists('Product'))

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+    } elseif ($idprod > 0) {

+        if (!class_exists('Product')) {
+                    require_once DOL_BASE_PATH . 'product/class/product.class.php';
+        }
         $prod = new Product($db);

         $prod->fetch($idprod);

         return $prod->tva_npr;

@@ -5010,30 +5260,35 @@ 
 {

     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 ($mysoc->country_code == 'ES') {

-            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                return 0;

-        }

-        else {

+            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                            return 0;
+            }
+        } 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;

-        }

-    }

-    elseif ($local == 2) { //I Localtax 2

+            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

         // 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) {
+                    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) {

@@ -5058,31 +5313,38 @@ 
     $classname = '';

     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 ($color == 2)

-            $classname = 'ok';

-        else

-            $classname = 'error';

-    }

-    if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        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) {
+            return '<font class="' . $classname . '">' . $result . '</font>';
+    }
     return $result;

 }

 

@@ -5108,23 +5370,27 @@ 
     $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

         // Here, object->id, object->ref and modulepart are required.

@@ -5135,8 +5401,9 @@ 
         }

     }

 

-    if (empty($withoutslash) && !empty($path))

-        $path .= '/';

+    if (empty($withoutslash) && !empty($path)) {
+            $path .= '/';
+    }
 

     return $path;

 }

@@ -5156,8 +5423,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;

@@ -5172,12 +5440,15 @@ 
     $cdir = explode("/", $dir);

     $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

 

 

 

@@ -5256,8 +5527,9 @@ 
  */

 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

 {

-    if ($removelinefeed == 2)

-        $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+    if ($removelinefeed == 2) {
+            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+    }
     $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

     if ($strip_tags) {

@@ -5274,8 +5546,9 @@ 
     $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

     // Supprime aussi les retours

-    if ($removelinefeed == 1)

-        $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+    if ($removelinefeed == 1) {
+            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+    }
 

     // et les espaces doubles

     while (strpos($temp, "  ")) {

@@ -5361,18 +5634,21 @@ 
         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 = '';

         $i = 0;

         $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);

@@ -5421,15 +5697,18 @@ 
     $newstring = $stringtoencode;

     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)

+        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 {

-        if ($removelasteolbr)

-            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+    } else {

+        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

@@ -5531,8 +5810,9 @@ 
  */

 function dol_nboflines($s, $maxchar = 0)

 {

-    if ($s == '')

-        return 0;

+    if ($s == '') {
+            return 0;
+    }
     $arraystring = explode("\n", $s);

     $nb = count($arraystring);

 

@@ -5551,15 +5831,18 @@ 
 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);

@@ -5606,39 +5889,47 @@ 
 function dol_textishtml($msg, $option = 0)

 {

     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\/>/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\/>/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;

     }

@@ -5790,12 +6081,14 @@ 
             $birthday = dol_print_date($object->birth, 'day');

 

             $substitutionarray['__MEMBER_ID__'] = $object->id;

-            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;

@@ -5843,10 +6136,12 @@ 
                 $dateplannedstart = '';

                 $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');

@@ -5856,8 +6151,9 @@ 
 

             // Create dynamic tags for __EXTRAFIELD_FIELD__

             if ($object->table_element && $object->id > 0) {

-                if (!is_object($extrafields))

-                    $extrafields = new ExtraFields($db);

+                if (!is_object($extrafields)) {
+                                    $extrafields = new ExtraFields($db);
+                }
                 $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                 if ($object->fetch_optionals() > 0) {

@@ -5878,12 +6174,15 @@ 
                 require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                 $outputlangs->loadLangs(array('paypal', 'other'));

                 $typeforonlinepayment = 'free';

-                if (is_object($object) && $object->element == 'commande')

-                    $typeforonlinepayment = 'order';

-                if (is_object($object) && $object->element == 'facture')

-                    $typeforonlinepayment = 'invoice';

-                if (is_object($object) && $object->element == 'member')

-                    $typeforonlinepayment = 'member';

+                if (is_object($object) && $object->element == 'commande') {
+                                    $typeforonlinepayment = 'order';
+                }
+                if (is_object($object) && $object->element == 'facture') {
+                                    $typeforonlinepayment = 'invoice';
+                }
+                if (is_object($object) && $object->element == 'member') {
+                                    $typeforonlinepayment = 'member';
+                }
                 $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                 $paymenturl = $url;

             }

@@ -5893,16 +6192,19 @@ 
 

             if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+            }
             if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+            }
             if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+            }
         }

     }

     if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5912,18 +6214,22 @@ 
         $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 : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+        }
 

         $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency)) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
 

         // TODO Add keys for foreign multicurrency

         // For backward compatibility

@@ -5993,23 +6299,27 @@ 
 {

     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)) {

         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);

         }

@@ -6019,23 +6329,29 @@ 
     // it is also converted.

     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

     }

@@ -6081,8 +6397,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) {

@@ -6094,8 +6411,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);
+                }
             }

         }

     }

@@ -6131,8 +6449,9 @@ 
 

     $out = '';

 

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     if ($date_start && $date_end) {

         $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6161,20 +6480,22 @@ 
 

     $ret = '';

     // If order not defined, we use the setup

-    if ($nameorder < 0)

-        $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+    if ($nameorder < 0) {
+            $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+    }
     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 {

         $ret .= $lastname;

-        if ($firstname && $lastname)

-            $ret .= ' ';

+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $firstname;

     }

     return $ret;

@@ -6194,13 +6515,14 @@ 
 {

     //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 ($mesgs)

-            $_SESSION['dol_events'][$style][] = $mesgs;

-    }

-    else {      // If mesgs is an array

+        if ($mesgs) {
+                    $_SESSION['dol_events'][$style][] = $mesgs;
+        }
+    } else {      // If mesgs is an array

         foreach ($mesgs as $mesg) {

-            if ($mesg)

-                $_SESSION['dol_events'][$style][] = $mesg;

+            if ($mesg) {
+                            $_SESSION['dol_events'][$style][] = $mesg;
+            }
         }

     }

 }

@@ -6220,13 +6542,16 @@ 
     if (empty($mesg) && empty($mesgs)) {

         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

     } 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 (!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

             setEventMessage($mesgs, $style);

         }

     }

@@ -6245,22 +6570,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']);

     }

 }

@@ -6301,8 +6629,9 @@ 
             foreach ($mesgarray as $message) {

                 $ret++;

                 $out .= $langs->trans($message);

-                if ($ret < count($mesgarray))

-                    $out .= "<br>\n";

+                if ($ret < count($mesgarray)) {
+                                    $out .= "<br>\n";
+                }
             }

         }

         if ($mesgstring) {

@@ -6368,8 +6697,9 @@ 
  */

 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $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;

@@ -6384,14 +6714,17 @@ 
                 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) {

         // Remove div from texts

@@ -6410,9 +6743,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).

@@ -6452,15 +6786,17 @@ 
         $sizearray = count($array);

         if ($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();

@@ -6486,23 +6822,38 @@ 
     // We must use here a binary strlen function (so not dol_strlen)

     $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

+        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;

+            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                            return false;
+            }
         }

     }

     return true;

@@ -6520,15 +6871,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 ($tmp == 'iso-8859-1')

-        return utf8_decode($str);

+    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);
+    }
     return $str;

 }

 

@@ -6550,8 +6907,9 @@ 
     global $cache_codes;

 

     // If key empty

-    if ($key == '')

-        return '';

+    if ($key == '') {
+            return '';
+    }
 

     // Check in cache

     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6563,20 +6921,21 @@ 
     $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) . ")";
+    }
 

     $resql = $db->query($sql);

     if ($resql) {

         $obj = $db->fetch_object($resql);

-        if ($obj)

-            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-        else

-            $cache_codes[$tablename][$key][$fieldid] = '';

+        if ($obj) {
+                    $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+        } else {
+                    $cache_codes[$tablename][$key][$fieldid] = '';
+        }
         $db->free($resql);

         return $cache_codes[$tablename][$key][$fieldid];

-    }

-    else {

+    } else {

         return -1;

     }

 }

@@ -6623,16 +6982,17 @@ 
     global $soc;       // For backward compatibility

     //print $s."<br>\n";

     if ($returnvalue) {

-        if ($hideerrors)

-            return @eval('return ' . $s . ';');

-        else

-            return eval('return ' . $s . ';');

-    }

-    else {

-        if ($hideerrors)

-            @eval($s);

-        else

-            eval($s);

+        if ($hideerrors) {
+                    return @eval('return ' . $s . ';');
+        } else {
+                    return eval('return ' . $s . ';');
+        }
+    } else {

+        if ($hideerrors) {
+                    @eval($s);
+        } else {
+                    eval($s);
+        }
     }

 }

 

@@ -6658,8 +7018,9 @@ 
 {

     global $langs;

 

-    if (empty($codelang))

-        return '';

+    if (empty($codelang)) {
+            return '';
+    }
 

     if ($codelang == 'auto') {

         return '<span class="fa fa-globe"></span>';

@@ -6673,9 +7034,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];

     }

@@ -6693,15 +7054,20 @@ 
 {

     global $mysoc;

 

-    if (strtoupper($countrycode) == 'MQ')

-        return 'fr_CA';

-    if (strtoupper($countrycode) == 'SE')

-        return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+    if (strtoupper($countrycode) == 'MQ') {
+            return 'fr_CA';
+    }
+    if (strtoupper($countrycode) == 'SE') {
+            return 'sv_SE';
+    }
+    // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

     if (strtoupper($countrycode) == 'CH') {

-        if ($mysoc->country_code == 'FR')

-            return 'fr_CH';

-        if ($mysoc->country_code == 'DE')

-            return 'de_CH';

+        if ($mysoc->country_code == 'FR') {
+                    return 'fr_CH';
+        }
+        if ($mysoc->country_code == 'DE') {
+                    return 'de_CH';
+        }
     }

 

     // Locale list taken from:

@@ -6879,8 +7245,9 @@ 
     );

 

     $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-    if (in_array($buildprimarykeytotest, $locales))

-        return strtolower($countrycode) . '_' . strtoupper($countrycode);

+    if (in_array($buildprimarykeytotest, $locales)) {
+            return strtolower($countrycode) . '_' . strtoupper($countrycode);
+    }
 

     foreach ($locales as $locale) {

         $locale_language = locale_get_primary_language($locale);

@@ -6934,18 +7301,21 @@ 
 

             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 ($values[0] != $type)

-                        continue;

+                    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][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6953,30 +7323,32 @@ 
                         $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])) {

-                if ($values[0] != $type)

-                    continue;

+            } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                if ($values[0] != $type) {
+                                    continue;
+                }
                 $tabname = str_replace('-', '', $values[1]);

                 foreach ($head as $key => $val) {

                     $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -7018,10 +7390,11 @@ 
     global $action;

     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";
+    }
 

     // A div to store page_y POST parameter so we can read it using javascript

     print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7030,8 +7403,9 @@ 
     $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)) {

@@ -7054,8 +7428,9 @@ 
                 print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                 $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);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7066,14 +7441,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $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) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7092,14 +7470,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $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) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7138,8 +7519,9 @@ 
                 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.

                     $micro_end_time = microtime(true);

@@ -7269,8 +7651,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);

@@ -7333,8 +7716,9 @@ 
                 $tmpcrits = explode('|', $crit);

                 $i3 = 0;

                 foreach ($tmpcrits as $tmpcrit) {

-                    if (empty($tmpcrit))

-                        continue;

+                    if (empty($tmpcrit)) {
+                                            continue;
+                    }
 

                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7370,8 +7754,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 . ")";

@@ -7411,29 +7796,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 (!$extImgTarget)

-        return $file;

+    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;
+    }
 

     $subdir = '';

-    if ($extName)

-        $subdir = 'thumbs/';

+    if ($extName) {
+            $subdir = 'thumbs/';
+    }
 

     return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

 }

@@ -7451,8 +7844,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';

@@ -7460,18 +7854,20 @@ 
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

     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) . ($param ? '&' . $param : ''), '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) . ($param ? '&' . $param : ''), '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 '';
+    }
+    }

 

 /**

  * Make content of an input box selected when we click into input field.

@@ -7488,8 +7884,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;

 }

 

@@ -7871,8 +8268,9 @@ 
     if (!isset($dictvalues[$tablename])) {

         $dictvalues[$tablename] = array();

         $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-        if ($checkentity)

-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+        if ($checkentity) {
+                    $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+        }
 

         $resql = $db->query($sql);

         if ($resql) {

@@ -7884,11 +8282,14 @@ 
         }

     }

 

-    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 '';

     }

 }

@@ -7918,8 +8319,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;

 }

@@ -7938,8 +8340,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']);

         $found = 0;

@@ -7949,15 +8353,23 @@ 
                 break;

             }

         }

-        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;               // No permissions and user is external

+        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;
+    }
+    // No permissions and user is external

     return 1;

 }

 

dolibarr/htdocs/core/modules/modWebsite.class.php

Indentation +70 added lines, -70 removed lines

@@ -32,90 +32,90 @@ 
 {

 

     /**

-	 *   Constructor. Define names, constants, directories, boxes, permissions

-	 *

-	 *   @param      DoliDB		$db      Database handler

+     *   Constructor. Define names, constants, directories, boxes, permissions

+     *

+     *   @param      DoliDB		$db      Database handler

      */

     function __construct($db)

     {

-    	global $langs,$conf;

+        global $langs,$conf;

 

         $this->db = $db;

         $this->numero = 10000;

 

-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'

-		// It is used to group modules in module setup page

+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'

+        // It is used to group modules in module setup page

         $this->family = "portal";

         $this->module_position = '50';

         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)

         $this->name = preg_replace('/^mod/i','',get_class($this));

         $this->description = "Enable to build and serve public web sites with CMS features";

-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version

+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version

         $this->version = 'dolibarr';

         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)

         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);

         // Name of image file used for this module.

         $this->picto='globe';

 

-		// Data directories to create when module is enabled

-		$this->dirs = array("/website/temp");

+        // Data directories to create when module is enabled

+        $this->dirs = array("/website/temp");

 

         // Config pages

         $this->config_page_url = array('website.php');

 

         // Dependencies

-		$this->hidden = ! empty($conf->global->MODULE_WEBSITE_DISABLED);	// A condition to disable module

-		$this->depends = array('modFckeditor');		// List of modules id that must be enabled if this module is enabled

+        $this->hidden = ! empty($conf->global->MODULE_WEBSITE_DISABLED);	// A condition to disable module

+        $this->depends = array('modFckeditor');		// List of modules id that must be enabled if this module is enabled

         $this->requiredby = array();	// List of modules id to disable if this one is disabled

-		$this->conflictwith = array();	// List of modules id this module is in conflict with

-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module

+        $this->conflictwith = array();	// List of modules id this module is in conflict with

+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module

         $this->langfiles = array("website");

 

         // Constants

-       	$this->const = array();

+            $this->const = array();

 

         // New pages on tabs

-       	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1

+            //$this->tabs[] = array();  					// To add a new tab identified by code tabname1

 

         // Boxes

         $this->boxes = array();

 

-		// Permissions

-		$this->rights = array();		// Permission array used by this module

-		$this->rights_class = 'website';

-		$r=0;

-

-		$this->rights[$r][0] = 10001;

-		$this->rights[$r][1] = 'Read website content';

-		$this->rights[$r][3] = 0;

-		$this->rights[$r][4] = 'read';

-		$r++;

-

-		$this->rights[$r][0] = 10002;

-		$this->rights[$r][1] = 'Create/modify website content';

-		$this->rights[$r][3] = 0;

-		$this->rights[$r][4] = 'write';

-		$r++;

-

-		$this->rights[$r][0] = 10003;

-		$this->rights[$r][1] = 'Delete website content';

-		$this->rights[$r][3] = 0;

-		$this->rights[$r][4] = 'delete';

-		$r++;

+        // Permissions

+        $this->rights = array();		// Permission array used by this module

+        $this->rights_class = 'website';

+        $r=0;

+

+        $this->rights[$r][0] = 10001;

+        $this->rights[$r][1] = 'Read website content';

+        $this->rights[$r][3] = 0;

+        $this->rights[$r][4] = 'read';

+        $r++;

+

+        $this->rights[$r][0] = 10002;

+        $this->rights[$r][1] = 'Create/modify website content';

+        $this->rights[$r][3] = 0;

+        $this->rights[$r][4] = 'write';

+        $r++;

+

+        $this->rights[$r][0] = 10003;

+        $this->rights[$r][1] = 'Delete website content';

+        $this->rights[$r][3] = 0;

+        $this->rights[$r][4] = 'delete';

+        $r++;

 

         // Main menu entries

         $r=0;

         $this->menu[$r]=array(	'fk_menu'=>'0',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode

-						        'type'=>'top',			                // This is a Left menu entry

-						        'titre'=>'WebSites',

+                                'type'=>'top',			                // This is a Left menu entry

+                                'titre'=>'WebSites',

                                 'mainmenu'=>'website',

-						        'url'=>'/website/index.php',

-						        'langs'=>'website',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

-						        'position'=>100,

-						        'enabled'=>'$conf->website->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.

-						        'perms'=>'$user->rights->website->read',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules

-						        'target'=>'',

-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both

+                                'url'=>'/website/index.php',

+                                'langs'=>'website',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

+                                'position'=>100,

+                                'enabled'=>'$conf->website->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.

+                                'perms'=>'$user->rights->website->read',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules

+                                'target'=>'',

+                                'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both

         $r++;

 

         // Exports

@@ -147,34 +147,34 @@ 
      */

     function init($options='')

     {

-    	global $conf,$langs;

+        global $conf,$langs;

 

-    	// Remove permissions and default values

-    	$this->remove($options);

+        // Remove permissions and default values

+        $this->remove($options);

 

-    	// Copy flags and octicons directoru

-    	$dirarray=array('common/flags', 'common/octicons');

-    	foreach($dirarray as $dir)

-    	{

-	    	$src = DOL_DOCUMENT_ROOT . '/theme/' . $dir;

+        // Copy flags and octicons directoru

+        $dirarray=array('common/flags', 'common/octicons');

+        foreach($dirarray as $dir)

+        {

+            $src = DOL_DOCUMENT_ROOT . '/theme/' . $dir;

             $dest = DOL_DATA_ROOT . '/medias/image/' . $dir;

 

             if (is_dir($src))

-	    	{

-	    		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	    		dol_mkdir($dest);

-	    		$result=dolCopyDir($src,$dest,0,0);

-	    		if ($result < 0)

-	    		{

-	    			$langs->load("errors");

-	    			$this->error=$langs->trans('ErrorFailToCopyDir',$src,$dest);

-	    			return 0;

-	    		}

-	    	}

-    	}

-

-    	$sql = array();

-

-    	return $this->_init($sql, $options);

+            {

+                require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+                dol_mkdir($dest);

+                $result=dolCopyDir($src,$dest,0,0);

+                if ($result < 0)

+                {

+                    $langs->load("errors");

+                    $this->error=$langs->trans('ErrorFailToCopyDir',$src,$dest);

+                    return 0;

+                }

+            }

+        }

+

+        $sql = array();

+

+        return $this->_init($sql, $options);

     }

 }

Spacing +35 added lines, -35 removed lines

@@ -22,7 +22,7 @@ 
  *  \ingroup    websites

  *  \brief      Description and activation file for module Website

  */

-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';

+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

 

 

 /**

@@ -38,7 +38,7 @@ 
      */

     function __construct($db)

     {

-    	global $langs,$conf;

+    	global $langs, $conf;

 

         $this->db = $db;

         $this->numero = 10000;

@@ -48,14 +48,14 @@ 
         $this->family = "portal";

         $this->module_position = '50';

         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)

-        $this->name = preg_replace('/^mod/i','',get_class($this));

+        $this->name = preg_replace('/^mod/i', '', get_class($this));

         $this->description = "Enable to build and serve public web sites with CMS features";

 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version

         $this->version = 'dolibarr';

         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)

         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);

         // Name of image file used for this module.

-        $this->picto='globe';

+        $this->picto = 'globe';

 

 		// Data directories to create when module is enabled

 		$this->dirs = array("/website/temp");

@@ -64,11 +64,11 @@ 
         $this->config_page_url = array('website.php');

 

         // Dependencies

-		$this->hidden = ! empty($conf->global->MODULE_WEBSITE_DISABLED);	// A condition to disable module

-		$this->depends = array('modFckeditor');		// List of modules id that must be enabled if this module is enabled

-        $this->requiredby = array();	// List of modules id to disable if this one is disabled

-		$this->conflictwith = array();	// List of modules id this module is in conflict with

-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module

+		$this->hidden = !empty($conf->global->MODULE_WEBSITE_DISABLED); // A condition to disable module

+		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled

+        $this->requiredby = array(); // List of modules id to disable if this one is disabled

+		$this->conflictwith = array(); // List of modules id this module is in conflict with

+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module

         $this->langfiles = array("website");

 

         // Constants

@@ -81,9 +81,9 @@ 
         $this->boxes = array();

 

 		// Permissions

-		$this->rights = array();		// Permission array used by this module

+		$this->rights = array(); // Permission array used by this module

 		$this->rights_class = 'website';

-		$r=0;

+		$r = 0;

 

 		$this->rights[$r][0] = 10001;

 		$this->rights[$r][1] = 'Read website content';

@@ -104,35 +104,35 @@ 
 		$r++;

 

         // Main menu entries

-        $r=0;

-        $this->menu[$r]=array(	'fk_menu'=>'0',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode

-						        'type'=>'top',			                // This is a Left menu entry

+        $r = 0;

+        $this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode

+						        'type'=>'top', // This is a Left menu entry

 						        'titre'=>'WebSites',

                                 'mainmenu'=>'website',

 						        'url'=>'/website/index.php',

-						        'langs'=>'website',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

+						        'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

 						        'position'=>100,

-						        'enabled'=>'$conf->website->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.

-						        'perms'=>'$user->rights->website->read',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules

+						        'enabled'=>'$conf->website->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.

+						        'perms'=>'$user->rights->website->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules

 						        'target'=>'',

-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both

+						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both

         $r++;

 

         // Exports

-        $r=1;

+        $r = 1;

 

-        $this->export_code[$r]=$this->rights_class.'_'.$r;

-        $this->export_label[$r]='MyWebsitePages';	// Translation key (used only if key ExportDataset_xxx_z not found)

-        $this->export_icon[$r]='globe';

-        $keyforclass = 'WebsitePage'; $keyforclassfile='/website/class/websitepage.class.php'; $keyforelement='Website';

+        $this->export_code[$r] = $this->rights_class.'_'.$r;

+        $this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)

+        $this->export_icon[$r] = 'globe';

+        $keyforclass = 'WebsitePage'; $keyforclassfile = '/website/class/websitepage.class.php'; $keyforelement = 'Website';

         include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';

         //$keyforselect='myobject'; $keyforelement='myobject'; $keyforaliasextra='extra';

         //include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';

         //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)

-        $this->export_sql_start[$r]='SELECT DISTINCT ';

-        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';

-        $this->export_sql_end[$r] .=' WHERE t.fk_website = p.rowid';

-        $this->export_sql_end[$r] .=' AND p.entity IN ('.getEntity('website').')';

+        $this->export_sql_start[$r] = 'SELECT DISTINCT ';

+        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';

+        $this->export_sql_end[$r] .= ' WHERE t.fk_website = p.rowid';

+        $this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('website').')';

         $r++;

     }

 

@@ -145,29 +145,29 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')

      *      @return     int             	1 if OK, 0 if KO

      */

-    function init($options='')

+    function init($options = '')

     {

-    	global $conf,$langs;

+    	global $conf, $langs;

 

     	// Remove permissions and default values

     	$this->remove($options);

 

     	// Copy flags and octicons directoru

-    	$dirarray=array('common/flags', 'common/octicons');

-    	foreach($dirarray as $dir)

+    	$dirarray = array('common/flags', 'common/octicons');

+    	foreach ($dirarray as $dir)

     	{

-	    	$src = DOL_DOCUMENT_ROOT . '/theme/' . $dir;

-            $dest = DOL_DATA_ROOT . '/medias/image/' . $dir;

+	    	$src = DOL_DOCUMENT_ROOT.'/theme/'.$dir;

+            $dest = DOL_DATA_ROOT.'/medias/image/'.$dir;

 

             if (is_dir($src))

 	    	{

 	    		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 	    		dol_mkdir($dest);

-	    		$result=dolCopyDir($src,$dest,0,0);

+	    		$result = dolCopyDir($src, $dest, 0, 0);

 	    		if ($result < 0)

 	    		{

 	    			$langs->load("errors");

-	    			$this->error=$langs->trans('ErrorFailToCopyDir',$src,$dest);

+	    			$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);

 	    			return 0;

 	    		}

 	    	}