alxarafe / alixar

index.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 define('BASE_PATH', __DIR__);
 define('DEBUG', true);
 
-require_once BASE_PATH . '/vendor/autoload.php';
+require_once BASE_PATH.'/vendor/autoload.php';
 
 use Alixar\Helpers\AlixarDispatcher;
 

dolibarr/htdocs/filefunc.inc.php

Spacing +40 added lines, -40 removed lines

@@ -35,7 +35,7 @@ 
 }
 
 if (!defined('DOL_VERSION')) {
-    define('DOL_VERSION', '10.0.0-alpha');  // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+    define('DOL_VERSION', '10.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
@@ -78,11 +78,11 @@ 
 $result = @include_once $conffile; // Keep @ because with some error reporting this break the redirect done when file not found
 
 if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) {    // If install not done and we are in a web session
-    header('Location: ' . BASE_URI . '?controller=install&method=index'); // Changed for Alixar
+    header('Location: '.BASE_URI.'?controller=install&method=index'); // Changed for Alixar
     exit;
 
     if (!empty($_SERVER["CONTEXT_PREFIX"])) {    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
-        $path = $_SERVER["CONTEXT_PREFIX"];       // example '/dolibarr/' when using an apache alias.
+        $path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
         if (!preg_match('/\/$/', $path))
             $path .= '/';
     }
@@ -111,7 +111,7 @@ 
         }
     }
 
-    header("Location: " . $path . "install/index.php");
+    header("Location: ".$path."install/index.php");
     exit;
 }
 
@@ -135,7 +135,7 @@ 
 $dolibarr_main_document_root_alt = (empty($dolibarr_main_document_root_alt) ? '' : trim($dolibarr_main_document_root_alt));
 
 if (empty($dolibarr_main_db_port)) {
-    $dolibarr_main_db_port = 3306;  // For compatibility with old configs, if not defined, we take 'mysql' type
+    $dolibarr_main_db_port = 3306; // For compatibility with old configs, if not defined, we take 'mysql' type
 }
 
 if (empty($dolibarr_main_db_type)) {
@@ -150,7 +150,7 @@ 
     $dolibarr_main_db_prefix = 'llx_';
 }
 if (empty($dolibarr_main_db_character_set)) {
-    $dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : '');  // Old installation
+    $dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : ''); // Old installation
 }
 if (empty($dolibarr_main_db_collation)) {
     $dolibarr_main_db_collation = ($dolibarr_main_db_type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
@@ -199,13 +199,13 @@ 
     // Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
 if (empty($dolibarr_main_db_host)) {
-    print '<div align="center">Dolibarr setup is not yet complete.<br><br>' . "\n";
-    print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...</div>' . "\n";
+    print '<div align="center">Dolibarr setup is not yet complete.<br><br>'."\n";
+    print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...</div>'."\n";
     die;
 }
 if (empty($dolibarr_main_url_root)) {
-    print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>' . "\n";
-    print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)' . "\n";
+    print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>'."\n";
+    print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)'."\n";
     die;
 }
 if (empty($dolibarr_main_data_root)) {
@@ -215,30 +215,30 @@ 
 }
 
 // Define some constants
-define('DOL_CLASS_PATH', 'class/');         // Filesystem path to class dir (defined only for some code that want to be compatible with old versions without this parameter)
-define('DOL_DATA_ROOT', $dolibarr_main_data_root);     // Filesystem data (documents)
-define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);   // Filesystem core php (htdocs)
+define('DOL_CLASS_PATH', 'class/'); // Filesystem path to class dir (defined only for some code that want to be compatible with old versions without this parameter)
+define('DOL_DATA_ROOT', $dolibarr_main_data_root); // Filesystem data (documents)
+define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem core php (htdocs)
 // Try to autodetect DOL_MAIN_URL_ROOT and DOL_URL_ROOT.
 // Note: autodetect works only in case 1, 2, 3 and 4 of phpunit test CoreTest.php. For case 5, 6, only setting value into conf.php will works.
 $tmp = '';
 $found = 0;
 $real_dolibarr_main_document_root = str_replace('\\', '/', realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 if (!empty($_SERVER["DOCUMENT_ROOT"])) {
-    $pathroot = $_SERVER["DOCUMENT_ROOT"];                                                      // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
+    $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 } else {
     $pathroot = 'NOTDEFINED';
 }
-$paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"]));        // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
+$paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.
 $concatpath = '';
 foreach ($paths as $tmppath) { // We check to find (B+start of C)=A
     if (empty($tmppath)) {
         continue;
     }
-    $concatpath .= '/' . $tmppath;
+    $concatpath .= '/'.$tmppath;
     //if ($tmppath) $concatpath.='/'.$tmppath;
     //print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
-    if ($real_dolibarr_main_document_root == @realpath($pathroot . $concatpath)) {    // @ avoid warning when safe_mode is on.
+    if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath)) {    // @ avoid warning when safe_mode is on.
         //print "Found relative url = ".$concatpath;
         $tmp3 = $concatpath;
         $found = 1;
@@ -250,19 +250,19 @@ 
 if (!$found) {
     $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
 } else {
-    $tmp = 'http' . (((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's') . '://' . $_SERVER["SERVER_NAME"] . ((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':' . $_SERVER["SERVER_PORT"]) . ($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/') . $tmp3 : '');
+    $tmp = 'http'.(((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's').'://'.$_SERVER["SERVER_NAME"].((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':'.$_SERVER["SERVER_PORT"]).($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/').$tmp3 : '');
 }
 //print "tmp1=".$tmp1." tmp2=".$tmp2." tmp3=".$tmp3." tmp=".$tmp."\n";
 if (!empty($dolibarr_main_force_https)) {
     $tmp = preg_replace('/^http:/i', 'https:', $tmp);
 }
-define('DOL_MAIN_URL_ROOT', $tmp);           // URL absolute root (https://sss/dolibarr, ...)
+define('DOL_MAIN_URL_ROOT', $tmp); // URL absolute root (https://sss/dolibarr, ...)
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
-$suburi = strstr($uri, '/');            // $suburi contains url without domain:port
+$suburi = strstr($uri, '/'); // $suburi contains url without domain:port
 if ($suburi == '/') {
-    $suburi = '';           // If $suburi is /, it is now ''
+    $suburi = ''; // If $suburi is /, it is now ''
 }
-define('DOL_URL_ROOT', $suburi);           // URL relative root ('', '/dolibarr', ...)
+define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 //print DOL_MAIN_URL_ROOT.'-'.DOL_URL_ROOT."\n";
 // Define prefix MAIN_DB_PREFIX
 define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
@@ -274,46 +274,46 @@ 
  */
 // Path to root libraries
 if (!defined('ADODB_PATH')) {
-    define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ? DOL_BASE_PATH . '/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH . '/'));
+    define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ? DOL_BASE_PATH . '/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/'));
 }
 if (!defined('FPDF_PATH')) {
-    define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ? DOL_BASE_PATH . '/includes/fpdf/' : $dolibarr_lib_FPDF_PATH . '/');
+    define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ? DOL_BASE_PATH . '/includes/fpdf/' : $dolibarr_lib_FPDF_PATH.'/');
 } // Used only for package that can't include tcpdf
 if (!defined('TCPDF_PATH')) {
-    define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ? DOL_BASE_PATH . '/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH . '/');
+    define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ? DOL_BASE_PATH . '/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
 }
 if (!defined('FPDI_PATH')) {
-    define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ? DOL_BASE_PATH . '/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH . '/');
+    define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ? DOL_BASE_PATH . '/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH.'/');
 }
 if (!defined('TCPDI_PATH')) {
-    define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ? DOL_BASE_PATH . '/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH . '/');
+    define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ? DOL_BASE_PATH . '/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/');
 }
 if (!defined('NUSOAP_PATH')) {
-    define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ? DOL_BASE_PATH . '/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH . '/'));
+    define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ? DOL_BASE_PATH . '/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/'));
 }
 if (!defined('PHPEXCEL_PATH')) {
-    define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ? DOL_BASE_PATH . '/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH . '/'));
+    define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ? DOL_BASE_PATH . '/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH.'/'));
 }
 if (!defined('GEOIP_PATH')) {
-    define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ? DOL_BASE_PATH . '/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH . '/'));
+    define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ? DOL_BASE_PATH . '/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH.'/'));
 }
 if (!defined('ODTPHP_PATH')) {
-    define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ? DOL_BASE_PATH . '/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH . '/'));
+    define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ? DOL_BASE_PATH . '/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/'));
 }
 if (!defined('ODTPHP_PATHTOPCLZIP')) {
-    define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ? DOL_BASE_PATH . '/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP . '/'));
+    define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ? DOL_BASE_PATH . '/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'));
 }
 if (!defined('JS_CKEDITOR')) {
-    define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR . '/'));
+    define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/'));
 }
 if (!defined('JS_JQUERY')) {
-    define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY . '/'));
+    define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/'));
 }
 if (!defined('JS_JQUERY_UI')) {
-    define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI . '/'));
+    define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/'));
 }
 if (!defined('JS_JQUERY_FLOT')) {
-    define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT . '/'));
+    define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT.'/'));
 }
 // Other required path
 if (!defined('DOL_DEFAULT_TTF')) {
@@ -329,10 +329,10 @@ 
  */
 
 if (!defined('ADODB_DATE_VERSION')) {
-    include_once ADODB_PATH . 'adodb-time.inc.php';
+    include_once ADODB_PATH.'adodb-time.inc.php';
 }
 
-if (!file_exists(DOL_BASE_PATH . "/core/lib/functions.lib.php")) {
+if (!file_exists(DOL_BASE_PATH."/core/lib/functions.lib.php")) {
     print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
     print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
     exit;
@@ -340,8 +340,8 @@ 
 
 
 // Included by default
-include_once DOL_BASE_PATH . '/core/lib/functions.lib.php';
-include_once DOL_BASE_PATH . '/core/lib/security.lib.php';
+include_once DOL_BASE_PATH.'/core/lib/functions.lib.php';
+include_once DOL_BASE_PATH.'/core/lib/security.lib.php';
 //print memory_get_usage();
 // If password is encoded, we decode it
 if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {

dolibarr/htdocs/home/home.php

Spacing +95 added lines, -95 removed lines

@@ -31,8 +31,8 @@ 
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
 $_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home';
@@ -47,7 +47,7 @@ 
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM)) {
     //header("Location: " . DOL_URL_ROOT . "/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    header('Location: ' . BASE_URI . '?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
+    header('Location: '.BASE_URI.'?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
     exit;
 }
 /*
@@ -61,7 +61,7 @@ 
   }
  */
 if (GETPOST('addbox')) { // Add box (when submit is done from a form when ajax disabled)
-    require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
     $zone = GETPOST('areacode', 'aZ09');
     $userid = GETPOST('userid', 'int');
     $boxorder = GETPOST('boxorder', 'aZ09');
@@ -81,14 +81,14 @@ 
     $form = new Form($db);
 
 // Title
-$title = $langs->trans("HomeArea") . ' - Dolibarr ' . DOL_VERSION;
+$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-    $title = $langs->trans("HomeArea") . ' - ' . $conf->global->MAIN_APPLICATION_TITLE;
+    $title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
 
 llxHeader('', $title);
 
 
-$resultboxes = FormOther::getBoxesArea($user, "0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+$resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 
 print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'title_home');
@@ -123,16 +123,16 @@ 
 
 if (empty($user->societe_id)) {
     $boxstat .= '<div class="box">';
-    $boxstat .= '<table summary="' . dol_escape_htmltag($langs->trans("DolibarrStateBoard")) . '" class="noborder boxtable boxtablenobottom nohover" width="100%">';
+    $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover" width="100%">';
     $boxstat .= '<tr class="liste_titre">';
-    $boxstat .= '<th class="liste_titre">' . $langs->trans("DolibarrStateBoard") . '</th>';
+    $boxstat .= '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
     $boxstat .= '</tr>';
     $boxstat .= '<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
 
     $object = new stdClass();
     $parameters = array();
     $action = '';
-    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     $boxstat .= $hookmanager->resPrint;
 
     if (empty($reshook)) {
@@ -160,25 +160,25 @@ 
         );
         // Class file containing the method load_state_board for each line
         $includes = array(
-            DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
-            DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
-            DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
-            DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
-            DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
-            DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
-            DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
-            DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
-            DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
-            DOL_DOCUMENT_ROOT . "/don/class/don.class.php"
+            DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+            DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+            DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+            DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+            DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+            DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+            DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+            DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+            DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+            DOL_DOCUMENT_ROOT."/don/class/don.class.php"
         );
         // Name class containing the method load_state_board for each line
         $classes = array('User',
@@ -289,25 +289,25 @@ 
           );
          */
         $links = array(
-            BASE_URI . '/?controller=user&method=list',
-            BASE_URI . '/?controller=societe&method=list&type=c&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=p&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=f&mainmenu=companies',
-            BASE_URI . '/?controller=contact&method=list&mainmenu=companies',
-            BASE_URI . '/?controller=adherents&method=list&statut=1&mainmenu=members',
-            BASE_URI . '/?controller=product&method=list&type=0&mainmenu=products',
-            BASE_URI . '/?controller=product&method=list&type=1&mainmenu=products',
-            BASE_URI . '/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
-            BASE_URI . '/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
-            BASE_URI . '/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
-            BASE_URI . '/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
-            BASE_URI . '/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
-            BASE_URI . '/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
-            BASE_URI . '/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
-            BASE_URI . '/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
-            BASE_URI . '/?controller=projet&method=list&mainmenu=project',
-            BASE_URI . '/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
-            BASE_URI . '/?controller=don&method=list&leftmenu=donations'
+            BASE_URI.'/?controller=user&method=list',
+            BASE_URI.'/?controller=societe&method=list&type=c&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=p&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=f&mainmenu=companies',
+            BASE_URI.'/?controller=contact&method=list&mainmenu=companies',
+            BASE_URI.'/?controller=adherents&method=list&statut=1&mainmenu=members',
+            BASE_URI.'/?controller=product&method=list&type=0&mainmenu=products',
+            BASE_URI.'/?controller=product&method=list&type=1&mainmenu=products',
+            BASE_URI.'/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
+            BASE_URI.'/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
+            BASE_URI.'/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
+            BASE_URI.'/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
+            BASE_URI.'/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
+            BASE_URI.'/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
+            BASE_URI.'/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
+            BASE_URI.'/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
+            BASE_URI.'/?controller=projet&method=list&mainmenu=project',
+            BASE_URI.'/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
+            BASE_URI.'/?controller=don&method=list&leftmenu=donations'
         );
         // Translation lang files
         $langfile = array("users",
@@ -352,10 +352,10 @@ 
                     $langs->load($langfile[$key]);
                 $text = $langs->trans($titres[$key]);
                 //$sep=($conf->dol_use_jmobile?'<br>':' ');
-                $boxstat .= '<a href="' . $links[$key] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+                $boxstat .= '<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
                 $boxstat .= '<div class="boxstats">';
-                $boxstat .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-                $boxstat .= '<span class="boxstatsindicator">' . img_object("", $icons[$key], 'class="inline-block"') . ' ' . ($board->nb[$val] ? $board->nb[$val] : 0) . '</span>';
+                $boxstat .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+                $boxstat .= '<span class="boxstatsindicator">'.img_object("", $icons[$key], 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
                 $boxstat .= '</div>';
                 $boxstat .= '</a>';
             }
@@ -389,11 +389,11 @@ 
 $dashboardlines = array();
 
 // Do not include sections without management permission
-require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
 if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
     $board = new ActionComm($db);
 
     $dashboardlines[] = $board->load_board($user);
@@ -401,21 +401,21 @@ 
 
 // Number of project opened
 if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $board = new Project($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
 if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
     $board = new Task($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board = new Propal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -424,7 +424,7 @@ 
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
     $board = new SupplierProposal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -433,21 +433,21 @@ 
 
 // Number of customer orders a deal
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
     $board = new Commande($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
 if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
     $board = new CommandeFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
 if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
     $board = new Contrat($db);
     $dashboardlines[] = $board->load_board($user, "inactives");
     // Number of active services (expired)
@@ -455,23 +455,23 @@ 
 }
 // Number of invoices customers (has paid)
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
     $board = new Facture($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
 if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
     $board = new FactureFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
     $board = new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+    $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
     if ($nb > 0) {
         $dashboardlines[] = $board->load_board($user);
     }
@@ -479,28 +479,28 @@ 
 
 // Number of cheque to send
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
     $board = new RemiseCheque($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
 if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
     $board = new Adherent($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'toapprove');
 }
 
 // Number of expense reports to pay
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'topay');
 }
@@ -508,7 +508,7 @@ 
 $object = new stdClass();
 $parameters = array();
 $action = '';
-$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook == 0) {
     $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
 }
@@ -538,20 +538,20 @@ 
 //var_dump($totallate);
 $boxwork = '';
 $boxwork .= '<div class="box">';
-$boxwork .= '<table summary="' . dol_escape_htmltag($langs->trans("WorkingBoard")) . '" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">' . "\n";
+$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
 $boxwork .= '<tr class="liste_titre">';
-$boxwork .= '<th class="liste_titre">' . $langs->trans("DolibarrWorkBoard") . '</th>';
-$boxwork .= '</tr>' . "\n";
+$boxwork .= '<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork .= '</tr>'."\n";
 
 if ($showweather) {
     $boxwork .= '<tr class="nohover">';
-    $boxwork .= '<td class="nohover' . ($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '') . ' center valignmiddle">';
+    $boxwork .= '<td class="nohover'.($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '').' center valignmiddle">';
     $text = '';
     if ($totallate > 0)
-        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate", $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
+        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
     else
         $text = $langs->transnoentitiesnoconv("NoItemLate");
-    $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
+    $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
     //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
     $options = 'height="64px"';
     $boxwork .= showWeather($totallate, $text, $options);
@@ -569,23 +569,23 @@ 
             $nbworkboardempty++;
 
         $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
-        $textlate .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
+        $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
 
         $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $sep = ($conf->dol_use_jmobile ? '<br>' : ' ');
-        $boxwork .= '<span class="boxstatstext" title="' . dol_escape_htmltag($board->label) . '">' . $board->img . ' ' . $board->label . '</span><br>';
-        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . $board->nbtodo . '</span></a>';
+        $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
+        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
         if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . price($board->total) . '</span></a>';
+            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
         }
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0) {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-            $boxwork .= '<a title="' . dol_escape_htmltag($textlate) . '" class="valignmiddle dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '" href="' . ((!$board->url_late) ? $board->url : $board->url_late ) . '">';
+            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
             //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"') . '';
-            $boxwork .= '<span class="dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '">';
+            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"').'';
+            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
             $boxwork .= '</span>';
             $boxwork .= '</a>';
@@ -614,7 +614,7 @@ 
 
 $boxwork .= '</td></tr>';
 
-$boxwork .= '</table>';   // End table array of working board
+$boxwork .= '</table>'; // End table array of working board
 $boxwork .= '</div>';
 
 print '</div></div></div><div class="clearboth"></div>';
@@ -660,11 +660,11 @@ 
     $message = '';
 
     // Check if install lock file is present
-    $lockfile = DOL_DATA_ROOT . '/install.lock';
-    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT . "/install")) {
+    $lockfile = DOL_DATA_ROOT.'/install.lock';
+    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
         $langs->load("errors");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT) . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     // Conf files must be in read only mode
@@ -672,7 +672,7 @@ 
         $langs->load("errors");
         //$langs->load("other");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly") . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     if ($message) {
@@ -707,20 +707,20 @@ 
     $used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
 
     $level0 = $offset;
-    if (!empty($conf->global->{$used_conf . '0'})) {
-        $level0 = $conf->global->{$used_conf . '0'};
+    if (!empty($conf->global->{$used_conf.'0'})) {
+        $level0 = $conf->global->{$used_conf.'0'};
     }
     $level1 = $offset + 1 * $factor;
-    if (!empty($conf->global->{$used_conf . '1'})) {
-        $level1 = $conf->global->{$used_conf . '1'};
+    if (!empty($conf->global->{$used_conf.'1'})) {
+        $level1 = $conf->global->{$used_conf.'1'};
     }
     $level2 = $offset + 2 * $factor;
-    if (!empty($conf->global->{$used_conf . '2'})) {
-        $level2 = $conf->global->{$used_conf . '2'};
+    if (!empty($conf->global->{$used_conf.'2'})) {
+        $level2 = $conf->global->{$used_conf.'2'};
     }
     $level3 = $offset + 3 * $factor;
-    if (!empty($conf->global->{$used_conf . '3'})) {
-        $level3 = $conf->global->{$used_conf . '3'};
+    if (!empty($conf->global->{$used_conf.'3'})) {
+        $level3 = $conf->global->{$used_conf.'3'};
     }
 
     if ($totallate <= $level0)

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

Spacing +546 added lines, -546 removed lines

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

@@ -51,7 +51,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', '<'))

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

 }

 

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

 }

@@ -151,7 +151,7 @@ 
  */

 function getBrowserInfo($user_agent)

 {

-    include_once DOL_BASE_PATH . '/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php';

+    include_once DOL_BASE_PATH.'/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php';

 

     $name = 'unknown';

     $version = '';

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

 }

 

 /**

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

     }

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

@@ -339,8 +339,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

@@ -351,12 +351,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

@@ -424,7 +424,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 .= ', ';

@@ -460,11 +460,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;

@@ -482,7 +482,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 = '';

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

 

 

 

@@ -545,7 +545,7 @@ 
 

                 

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

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

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

         }

     }

 

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

     }

 }

 

@@ -687,12 +687,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;

     }

 

@@ -721,14 +721,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;

                 }

             }

@@ -745,11 +745,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') {

@@ -757,33 +757,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;

                 }

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

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

@@ -995,12 +995,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

 }

 

 /**

@@ -1071,14 +1071,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";

         }

 

@@ -1092,7 +1092,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'];

@@ -1101,10 +1101,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)

@@ -1156,10 +1156,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

@@ -1170,8 +1170,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>';

     }

 

@@ -1211,23 +1211,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>';

@@ -1240,14 +1240,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>';

 

@@ -1263,24 +1263,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"

@@ -1389,7 +1389,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 = '';

@@ -1398,18 +1398,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 = '';

@@ -1418,7 +1418,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 {

@@ -1428,25 +1428,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)) {

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

@@ -1468,14 +1468,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>';

                         }

                     }

@@ -1502,10 +1502,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>';

             }

@@ -1513,7 +1513,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)) {

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

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

@@ -1574,18 +1574,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') {

@@ -1595,11 +1595,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>';

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

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

 }

 

@@ -1662,50 +1662,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;

@@ -1760,13 +1760,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

             }

         }

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

 

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

 

 

 

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

@@ -1877,7 +1877,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)) {

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

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

     }

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

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

             }

         }

 

@@ -2066,8 +2066,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

@@ -2113,9 +2113,9 @@ 
     }

     // Use long or short text unit

     if (empty($shortunit)) {

-        $ret .= ' ' . $textunitlong;

+        $ret .= ' '.$textunitlong;

     } else {

-        $ret .= ' ' . $textunitshort;

+        $ret .= ' '.$textunitshort;

     }

 

     return $ret;

@@ -2143,13 +2143,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>';

 }

 

 /**

@@ -2190,9 +2190,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 {

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

@@ -2232,26 +2232,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>';

     }

@@ -2296,165 +2296,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();

@@ -2478,10 +2478,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)

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

         }

     }

 

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

@@ -2553,10 +2553,10 @@ 
     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_URL_ROOT */ 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_URL_ROOT */ DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

             } else

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

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

         }

     }

 

@@ -2594,7 +2594,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";

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

@@ -2676,12 +2676,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>';

             }

         }

     }

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

@@ -2837,21 +2837,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

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

 

     $theme = $conf->theme;

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

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

 

     // Define fullpathpicto to use into src

     if ($pictoisfullpath) {

@@ -2934,7 +2934,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') {

@@ -2973,15 +2973,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;

             }

@@ -2991,11 +2991,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)

@@ -3015,22 +3015,22 @@ 
                 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) {

         return $fullpathpicto;

     }

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

 }

 

 /**

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

 }

 

 /**

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

 }

@@ -3094,10 +3094,10 @@ 
     if ($pictoisfullpath)

         $path = $picto;

     else {

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

+        $path = DOL_URL_ROOT.'/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;

@@ -3135,14 +3135,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');

 }

 

 /**

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

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

 

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

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

 }

 

 /**

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

 }

 

 /**

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

 }

@@ -3302,7 +3302,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' : '')).'"');

 }

 

 /**

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

 }

 

 /**

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

 }

 

 /**

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

 }

 

 /**

@@ -3406,7 +3406,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 : "").'"');

 }

 

 /**

@@ -3424,7 +3424,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 : "").'"');

 }

 

 /**

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

 }

 

 /**

@@ -3520,17 +3520,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>';

 }

 

 /**

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

 

@@ -3576,8 +3576,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;

 }

@@ -3598,8 +3598,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;

 }

@@ -3619,10 +3619,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>');

 }

 

 /**

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

     }

@@ -3655,51 +3655,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) {

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

 }

 

 /**

@@ -3766,13 +3766,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>';

@@ -3830,16 +3830,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

@@ -3847,7 +3847,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 = '';

@@ -3865,7 +3865,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) {

@@ -3883,7 +3883,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) {

@@ -3893,19 +3893,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;

 }

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

 }

 

 /**

@@ -3965,20 +3965,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;

 }

@@ -4026,29 +4026,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)) {

@@ -4066,40 +4066,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";

 }

 

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

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

@@ -4169,20 +4169,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";

 }

 

 /**

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

@@ -4214,10 +4214,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 .= ' *';

@@ -4311,10 +4311,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;

 }

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

     }

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

     }

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

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

 }

@@ -4465,7 +4465,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)"

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

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

 

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

@@ -4635,13 +4635,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 = '';

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

@@ -4692,13 +4692,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 = '';

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

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

@@ -4761,12 +4761,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;

         }

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

 

@@ -4791,16 +4791,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;

 }

 

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

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

 

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

 }

 

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

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

@@ -4962,14 +4962,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;

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

     }

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

@@ -5067,7 +5067,7 @@ 
             $classname = 'error';

     }

     if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        return '<font class="'.$classname.'">'.$result.'</font>';

     return $result;

 }

 

@@ -5101,13 +5101,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

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

@@ -5150,15 +5150,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))

@@ -5185,20 +5185,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++;

                 }

@@ -5246,9 +5246,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

     }

 

@@ -5304,8 +5304,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;

 }

@@ -5322,12 +5322,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)) {

@@ -5343,7 +5343,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 = '';

@@ -5357,7 +5357,7 @@ 
             $i++;

         }

         unset($a);

-        return $firstline . (($i < $nba) ? '...' : '');

+        return $firstline.(($i < $nba) ? '...' : '');

     }

 }

 

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

 }

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

 }

 

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

@@ -5571,7 +5571,7 @@ 
  */

 function dol_microtime_float()

 {

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

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

 

     return microtime(true);

 }

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

     }

@@ -5844,7 +5844,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];

                         }

                     }

                 }

@@ -5856,7 +5856,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')

@@ -5917,7 +5917,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']);

@@ -5927,13 +5927,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'],

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

         }

     }

 

@@ -6008,13 +6008,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

 

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

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

             }

@@ -6116,13 +6116,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;

@@ -6202,7 +6202,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 {

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

     }

 

@@ -6298,14 +6298,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 (){} } );

 						}

 					});

@@ -6500,11 +6500,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;

 

@@ -6536,16 +6536,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) {

@@ -6572,12 +6572,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;

 }

@@ -6600,14 +6600,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)

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

 }

 

 /**

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

         }

     }

 

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

@@ -7000,43 +7000,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']));

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

                             }

                         }

                     }

@@ -7085,16 +7085,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

@@ -7102,15 +7102,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";

                 }

             }

 

@@ -7120,27 +7120,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

@@ -7154,7 +7154,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";

@@ -7197,8 +7197,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";

 }

 

 /**

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

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

@@ -7288,10 +7288,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) {

@@ -7300,10 +7300,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++;

                         }

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

@@ -7341,7 +7341,7 @@ 
                         $newres .= $tmpafter;

                         $newres .= "'";

                         if ($tmpcrit2 == '') {

-                            $newres .= ' OR ' . $field . " IS NULL";

+                            $newres .= ' OR '.$field." IS NULL";

                         }

                     }

 

@@ -7352,10 +7352,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;

 }

@@ -7374,8 +7374,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;

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

 }

 

 /**

@@ -7442,14 +7442,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 '';

 }

@@ -7466,11 +7466,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;

 }

 

@@ -7851,9 +7851,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) {

@@ -7891,14 +7891,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;

     }

@@ -7934,11 +7934,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;

 }

 

dolibarr/htdocs/core/lib/security2.lib.php

Spacing +140 added lines, -140 removed lines

@@ -34,9 +34,9 @@ 
  */
 function dol_getwebuser($mode)
 {
-    $t='?';
-    if ($mode=='user')  $t=getenv('APACHE_RUN_USER');   // $_ENV['APACHE_RUN_USER'] is empty
-    if ($mode=='group') $t=getenv('APACHE_RUN_GROUP');
+    $t = '?';
+    if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
+    if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
     return $t;
 }
 
@@ -49,56 +49,56 @@ 
  *	@param		array	$authmode			Array list of selected authentication mode array('http', 'dolibarr', 'xxx'...)
  *  @return		string						Login or ''
  */
-function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode)
+function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode)
 {
-	global $conf,$langs;
+	global $conf, $langs;
     //global $dolauthmode;    // To return authentication finally used
 
 	// Check parameters
-	if ($entitytotest == '') $entitytotest=1;
+	if ($entitytotest == '') $entitytotest = 1;
 
-    dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',',$authmode));
+    dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
 	$login = '';
 
 	// Validation of login/pass/entity with standard modules
 	if (empty($login))
 	{
-	    $test=true;
-    	foreach($authmode as $mode)
+	    $test = true;
+    	foreach ($authmode as $mode)
     	{
-    		if ($test && $mode && ! $login)
+    		if ($test && $mode && !$login)
     		{
     		    // Validation of login/pass/entity for mode $mode
-    		    $mode=trim($mode);
-        		$authfile='functions_'.$mode.'.php';
-        		$fullauthfile='';
+    		    $mode = trim($mode);
+        		$authfile = 'functions_'.$mode.'.php';
+        		$fullauthfile = '';
 
-    		    $dirlogin=array_merge(array("/core/login"),(array) $conf->modules_parts['login']);
-    		    foreach($dirlogin as $reldir)
+    		    $dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
+    		    foreach ($dirlogin as $reldir)
     		    {
-    		        $dir=dol_buildpath($reldir,0);
-    		        $newdir=dol_osencode($dir);
+    		        $dir = dol_buildpath($reldir, 0);
+    		        $newdir = dol_osencode($dir);
 
     		        // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/',$newdir)?'':'/').$authfile;
-    		        if (is_file($tmpnewauthfile)) $fullauthfile=$tmpnewauthfile;
+    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
+    		        if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
     		    }
 
-    		    $result=false;
-    		    if ($fullauthfile) $result=include_once $fullauthfile;
+    		    $result = false;
+    		    if ($fullauthfile) $result = include_once $fullauthfile;
     			if ($fullauthfile && $result)
     			{
     				// Call function to check user/password
-    				$function='check_user_password_'.$mode;
-    				$login=call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
+    				$function = 'check_user_password_'.$mode;
+    				$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
     				if ($login)	// Login is successfull
     				{
-    					$test=false;            // To stop once at first login success
-    					$conf->authmode=$mode;	// This properties is defined only when logged to say what mode was successfully used
-    					$dol_tz=GETPOST('tz');
-    					$dol_dst=GETPOST('dst');
-    					$dol_screenwidth=GETPOST('screenwidth');
-    					$dol_screenheight=GETPOST('screenheight');
+    					$test = false; // To stop once at first login success
+    					$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
+    					$dol_tz = GETPOST('tz');
+    					$dol_dst = GETPOST('dst');
+    					$dol_screenwidth = GETPOST('screenwidth');
+    					$dol_screenheight = GETPOST('screenheight');
     				}
     			}
     			else
@@ -108,7 +108,7 @@ 
     				// Load translation files required by the page
                     $langs->loadLangs(array('other', 'main', 'errors'));
 
-    				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
+    				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
     			}
     		}
     	}
@@ -118,7 +118,7 @@ 
 }
 
 
-if (! function_exists('dol_loginfunction'))
+if (!function_exists('dol_loginfunction'))
 {
     /**
      * Show Dolibarr default login page.
@@ -129,27 +129,27 @@ 
      * @param       Societe     $mysoc      Company object
      * @return      void
      */
-    function dol_loginfunction($langs,$conf,$mysoc)
+    function dol_loginfunction($langs, $conf, $mysoc)
 	{
-		global $dolibarr_main_demo,$db;
-		global $smartphone,$hookmanager;
+		global $dolibarr_main_demo, $db;
+		global $smartphone, $hookmanager;
 
-		$langs->loadLangs(array("main","other","help","admin"));
+		$langs->loadLangs(array("main", "other", "help", "admin"));
 
 		// Instantiate hooks of thirdparty module only if not already define
         $hookmanager->initHooks(array('mainloginpage'));
 
         $main_authentication = $conf->file->main_authentication;
 
-        $session_name=session_name();	// Get current session name
+        $session_name = session_name(); // Get current session name
 
 		$dol_url_root = DOL_URL_ROOT;
 
 		// Title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		$title=$appli.' '.constant('DOL_VERSION');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-		$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
+		$appli = constant('DOL_APPLICATION_TITLE');
+		$title = $appli.' '.constant('DOL_VERSION');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_APPLICATION_TITLE;
+		$titletruedolibarrversion = constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
 
 		// Note: $conf->css looks like '/theme/eldy/style.css.php'
 		/*
@@ -170,13 +170,13 @@ 
 		*/
 
 		// Select templates dir
-		if (! empty($conf->modules_parts['tpl']))	// Using this feature slow down application
+		if (!empty($conf->modules_parts['tpl']))	// Using this feature slow down application
 		{
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
-			foreach($dirtpls as $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl/'));
+			foreach ($dirtpls as $reldir)
 			{
-				$tmp=dol_buildpath($reldir.'login.tpl.php');
-				if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+				$tmp = dol_buildpath($reldir.'login.tpl.php');
+				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
 			}
 		}
 		else
@@ -185,115 +185,115 @@ 
 		}
 
 		// Set cookie for timeout management
-		$prefix=dol_getprefix('');
-		$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-		if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+		$prefix = dol_getprefix('');
+		$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
+		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
 
-		if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
+		if (GETPOST('urlfrom', 'alpha')) $_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');
 		else unset($_SESSION["urlfrom"]);
 
-		if (! GETPOST("username",'alpha')) $focus_element='username';
-		else $focus_element='password';
+		if (!GETPOST("username", 'alpha')) $focus_element = 'username';
+		else $focus_element = 'password';
 
-		$demologin='';
-		$demopassword='';
-		if (! empty($dolibarr_main_demo))
+		$demologin = '';
+		$demopassword = '';
+		if (!empty($dolibarr_main_demo))
 		{
-			$tab=explode(',',$dolibarr_main_demo);
-			$demologin=$tab[0];
-			$demopassword=$tab[1];
+			$tab = explode(',', $dolibarr_main_demo);
+			$demologin = $tab[0];
+			$demopassword = $tab[1];
 		}
 
 		// Execute hook getLoginPageOptions (for table)
-		$parameters=array('entity' => GETPOST('entity','int'));
-		$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
-		if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
+		$parameters = array('entity' => GETPOST('entity', 'int'));
+		$reshook = $hookmanager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
+		if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 			$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
 		} else {
 			$morelogincontent = $hookmanager->resPrint;
 		}
 
 		// Execute hook getLoginPageExtraOptions (eg for js)
-		$parameters=array('entity' => GETPOST('entity','int'));
-		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
+		$parameters = array('entity' => GETPOST('entity', 'int'));
+		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$moreloginextracontent = $hookmanager->resPrint;
 
 		// Login
-		$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
+		$login = (!empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username", "alpha") ? GETPOST("username", "alpha") : $demologin));
 		$password = $demopassword;
 
 		// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
-		$width=0;
-		$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+		$width = 0;
+		$urllogo = DOL_BASE_URI.'/theme/login_logo.png';
 
-        if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+        if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
 		}
-		elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+		elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
-			$width=128;
+			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
+			$width = 128;
 		}
-		elseif (is_readable(DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png')) {
-			$urllogo = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png';
+		elseif (is_readable(DOL_BASE_URI.'/theme/'.$conf->theme.'/img/dolibarr_logo.png')) {
+			$urllogo = DOL_BASE_URI.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
         }
-		elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-			$urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+		elseif (is_readable(DOL_BASE_URI.'/theme/dolibarr_logo.png')) {
+			$urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
         }
 
 		// Security graphical code
-		$captcha=0;
-		$captcha_refresh='';
-		if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		$captcha = 0;
+		$captcha_refresh = '';
+		if (function_exists("imagecreatefrompng") && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
-			$captcha=1;
-			$captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+			$captcha = 1;
+			$captcha_refresh = img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"');
 		}
 
 		// Extra link
-		$forgetpasslink=0;
-		$helpcenterlink=0;
+		$forgetpasslink = 0;
+		$helpcenterlink = 0;
 		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
 		{
 			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
 			{
-				$forgetpasslink=1;
+				$forgetpasslink = 1;
 			}
 
 			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
 			{
-				$helpcenterlink=1;
+				$helpcenterlink = 1;
 			}
 		}
 
 		// Home message
-		$main_home='';
-		if (! empty($conf->global->MAIN_HOME))
+		$main_home = '';
+		if (!empty($conf->global->MAIN_HOME))
 		{
-		    $substitutionarray=getCommonSubstitutionArray($langs);
+		    $substitutionarray = getCommonSubstitutionArray($langs);
 		    complete_substitutions_array($substitutionarray, $langs);
 		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
 
-			$main_home=dol_htmlcleanlastbr($texttoshow);
+			$main_home = dol_htmlcleanlastbr($texttoshow);
 		}
 
 		// Google AD
-		$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
+		$main_google_ad_client = ((!empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) ? 1 : 0);
 
 		// Set jquery theme
-		$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+		$dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
+		$favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 		$jquerytheme = 'base';
-		if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+		if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 
 		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
+		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
+		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int');
+		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int');
+		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
 
 		// Include login page template
 		include $template_dir.'login.tpl.php';
@@ -311,23 +311,23 @@ 
  *									non defini=>renvoi un salt pour cryptage par defaut
  *	@return		string				Salt string
  */
-function makesalt($type=CRYPT_SALT_LENGTH)
+function makesalt($type = CRYPT_SALT_LENGTH)
 {
 	dol_syslog("makesalt type=".$type);
-	switch($type)
+	switch ($type)
 	{
 		case 12:	// 8 + 4
-			$saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;
 		case 8:		// 8 (Pour compatibilite, ne devrait pas etre utilise)
-			$saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;
 		case 2:		// 2
 		default: 	// by default, fall back on Standard DES (should work everywhere)
-			$saltlen=2; $saltprefix=''; $saltsuffix=''; break;
+			$saltlen = 2; $saltprefix = ''; $saltsuffix = ''; break;
 	}
-	$salt='';
-	while(dol_strlen($salt) < $saltlen) $salt.=chr(mt_rand(64,126));
+	$salt = '';
+	while (dol_strlen($salt) < $saltlen) $salt .= chr(mt_rand(64, 126));
 
-	$result=$saltprefix.$salt.$saltsuffix;
+	$result = $saltprefix.$salt.$saltsuffix;
 	dol_syslog("makesalt return=".$result);
 	return $result;
 }
@@ -338,42 +338,42 @@ 
  *  @param   	int		$level   	Encode level: 0 no encoding, 1 encoding
  *	@return		int					<0 if KO, >0 if OK
  */
-function encodedecode_dbpassconf($level=0)
+function encodedecode_dbpassconf($level = 0)
 {
 	dol_syslog("encodedecode_dbpassconf level=".$level, LOG_DEBUG);
 	$config = '';
-	$passwd='';
-	$passwd_crypted='';
+	$passwd = '';
+	$passwd_crypted = '';
 
-	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php','r'))
+	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r'))
 	{
-		while(!feof($fp))
+		while (!feof($fp))
 		{
-			$buffer = fgets($fp,4096);
+			$buffer = fgets($fp, 4096);
 
-			$lineofpass=0;
+			$lineofpass = 0;
 
-			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))	// Old way to save crypted value
+			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))	// Old way to save crypted value
 			{
-				$val = trim($reg[1]);	// This also remove CR/LF
-				$val=preg_replace('/^["\']/','',$val);
-				$val=preg_replace('/["\'][\s;]*$/','',$val);
-				if (! empty($val))
+				$val = trim($reg[1]); // This also remove CR/LF
+				$val = preg_replace('/^["\']/', '', $val);
+				$val = preg_replace('/["\'][\s;]*$/', '', $val);
+				if (!empty($val))
 				{
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
-					$lineofpass=1;
+					$lineofpass = 1;
 				}
 			}
-			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))
+			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
 			{
-				$val = trim($reg[1]);	// This also remove CR/LF
-				$val=preg_replace('/^["\']/','',$val);
-				$val=preg_replace('/["\'][\s;]*$/','',$val);
-				if (preg_match('/crypted:/i',$buffer))
+				$val = trim($reg[1]); // This also remove CR/LF
+				$val = preg_replace('/^["\']/', '', $val);
+				$val = preg_replace('/["\'][\s;]*$/', '', $val);
+				if (preg_match('/crypted:/i', $buffer))
 				{
-					$val = preg_replace('/crypted:/i','',$val);
+					$val = preg_replace('/crypted:/i', '', $val);
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
@@ -384,7 +384,7 @@ 
 					$val = dol_encode($val);
 					$passwd_crypted = $val;
 				}
-				$lineofpass=1;
+				$lineofpass = 1;
 			}
 
 			// Output line
@@ -411,8 +411,8 @@ 
 		fclose($fp);
 
 		// Write new conf file
-		$file=DOL_DOCUMENT_ROOT.'/conf/conf.php';
-		if ($fp = @fopen($file,'w'))
+		$file = DOL_DOCUMENT_ROOT.'/conf/conf.php';
+		if ($fp = @fopen($file, 'w'))
 		{
 			fputs($fp, $config);
 			fflush($fp);
@@ -446,11 +446,11 @@ 
  * @return		string								New value for password
  * @see dol_hash
  */
-function getRandomPassword($generic=false, $replaceambiguouschars=null)
+function getRandomPassword($generic = false, $replaceambiguouschars = null)
 {
-	global $db,$conf,$langs,$user;
+	global $db, $conf, $langs, $user;
 
-	$generated_password='';
+	$generated_password = '';
 	if ($generic)
 	{
 		$length = 32;
@@ -458,8 +458,8 @@ 
 		$uppercase = "ASDFGHJKLZXCVBNMQWERTYUIOP";
 		$numbers = "1234567890";
 		$randomCode = "";
-		$nbofchar = round($length/3);
-		$nbofcharlast = ($length - 2*$nbofchar);
+		$nbofchar = round($length / 3);
+		$nbofcharlast = ($length - 2 * $nbofchar);
 		//var_dump($nbofchar.'-'.$nbofcharlast);
 		if (function_exists('random_int'))	// Cryptographic random
 		{
@@ -476,7 +476,7 @@ 
 				$randomCode .= $numbers{random_int(0, $max)};
 			}
 
-			$generated_password=str_shuffle($randomCode);
+			$generated_password = str_shuffle($randomCode);
 		}
 		else	// Old platform, non cryptographic random
 		{
@@ -493,17 +493,17 @@ 
 				$randomCode .= $numbers{mt_rand(0, $max)};
 			}
 
-			$generated_password=str_shuffle($randomCode);
+			$generated_password = str_shuffle($randomCode);
 		}
 	}
-	else if (! empty($conf->global->USER_PASSWORD_GENERATED))
+	else if (!empty($conf->global->USER_PASSWORD_GENERATED))
 	{
-		$nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
-		$nomfichier=$nomclass.".class.php";
+		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
+		$nomfichier = $nomclass.".class.php";
 		//print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
 		require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
-		$genhandler=new $nomclass($db,$conf,$langs,$user);
-		$generated_password=$genhandler->getNewGeneratedPassword();
+		$genhandler = new $nomclass($db, $conf, $langs, $user);
+		$generated_password = $genhandler->getNewGeneratedPassword();
 		unset($genhandler);
 	}
 
@@ -512,7 +512,7 @@ 
 	{
 		$numbers = "ABCDEF";
 		$max = strlen($numbers) - 1;
-		$generated_password=str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+		$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
 	}
 
 	return $generated_password;

dolibarr/htdocs/core/class/hookmanager.class.php

Spacing +11 added lines, -11 removed lines

@@ -90,7 +90,7 @@ 
             $arraycontext = array($arraycontext);
         }
 
-        $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray));    // All contexts are concatenated
+        $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
 
         foreach ($conf->modules_parts['hooks'] as $module => $hooks) { // Loop on each module that brings hooks
             if (empty($conf->$module->enabled)) {
@@ -100,20 +100,20 @@ 
             //dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
             foreach ($arraycontext as $context) {
                 if (is_array($hooks)) {
-                    $arrayhooks = $hooks;    // New system
+                    $arrayhooks = $hooks; // New system
                 } else {
-                    $arrayhooks = explode(':', $hooks);        // Old system (for backward compatibility)
+                    $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
                 }
                 if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module
                     // Include actions class overwriting hooks
                     if (!is_object($this->hooks[$context][$module])) { // If set, class was already loaded
-                        $path = '/' . $module . '/class/';
-                        $actionfile = 'actions_' . $module . '.class.php';
+                        $path = '/'.$module.'/class/';
+                        $actionfile = 'actions_'.$module.'.class.php';
 
-                        dol_syslog(get_class($this) . '::initHooks Loading hook class for context ' . $context . ": " . $actionfile, LOG_INFO);
-                        $resaction = dol_include_once($path . $actionfile);
+                        dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
+                        $resaction = dol_include_once($path.$actionfile);
                         if ($resaction) {
-                            $controlclassname = 'Actions' . ucfirst($module);
+                            $controlclassname = 'Actions'.ucfirst($module);
                             $actionInstance = new $controlclassname($this->db);
                             $this->hooks[$context][$module] = $actionInstance;
                         }
@@ -236,7 +236,7 @@ 
                     $actionclassinstance->error = 0;
                     $actionclassinstance->errors = array();
 
-                    dol_syslog(get_class($this) . "::executeHooks Qualified hook found (hooktype=" . $hooktype . "). We call method " . $method . " of class " . get_class($actionclassinstance) . ", module=" . $module . ", action=" . $action . " context=" . $context, LOG_DEBUG);
+                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
                     // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
@@ -247,7 +247,7 @@ 
                             $error++;
                             $this->error = $actionclassinstance->error;
                             $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                            dol_syslog("Error on hook module=" . $module . ", method " . $method . ", class " . get_class($actionclassinstance) . ", hooktype=" . $hooktype . (empty($this->error) ? '' : " " . $this->error) . (empty($this->errors) ? '' : " " . join(",", $this->errors)), LOG_ERR);
+                            dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
                         }
 
                         if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))
@@ -270,7 +270,7 @@ 
                             $this->resPrint .= $actionclassinstance->resprints;
                         // TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                         if (!is_array($resaction) && !is_numeric($resaction)) {
-                            dol_syslog('Error: Bug into hook ' . $method . ' of module class ' . get_class($actionclassinstance) . '. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+                            dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
                             if (empty($actionclassinstance->resprints)) {
                                 $this->resPrint .= $resaction;
                                 $resaction = 0;

dolibarr/htdocs/main.inc.php

Spacing +293 added lines, -293 removed lines

@@ -100,8 +100,8 @@ 
         $inj += preg_match('/insert\s+into/i', $val);
         $inj += preg_match('/select\s+from/i', $val);
         $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-        $inj += preg_match('/user\s*\(/i', $val);      // avoid to use function user() that return current database login
-        $inj += preg_match('/information_schema/i', $val);    // avoid to use request that read information_schema database
+        $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+        $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
     }
     if ($type == 3) {
         $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
@@ -125,15 +125,15 @@ 
         $inj += preg_match('/<style/i', $val);
     }
     $inj += preg_match('/base[\s]+href/si', $val);
-    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-    $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-    $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-    $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+    $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+    $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+    $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+    $inj += preg_match('/onloadstart\s*=/i', $val); // onload can be set on audio tag <audio onloadstart=alert(1)>
+    $inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like <img onclick = alert(1)>
+    $inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be on textarea
     //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-    $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);  // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+    $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
     //if ($type == 1)
     //{
     $inj += preg_match('/javascript:/i', $val);
@@ -141,10 +141,10 @@ 
     //}
     // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
     if ($type == 1) {
-        $inj += preg_match('/"/i', $val);  // We refused " in GET parameters value
+        $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
     }
     if ($type == 2) {
-        $inj += preg_match('/[;"]/', $val);  // PHP_SELF is a file system path. It can contains spaces.
+        $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
     }
     return $inj;
 }
@@ -163,7 +163,7 @@ 
             if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type)) {
                 //$var[$key] = $value;	// This is useless
             } else {
-                print 'Access refused by SQL/Script injection protection in main.inc.php (type=' . htmlentities($type) . ' key=' . htmlentities($key) . ' value=' . htmlentities($value) . ' page=' . htmlentities($_SERVER["REQUEST_URI"]) . ')';
+                print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
                 exit;
             }
         }
@@ -197,11 +197,11 @@ 
 
 // This is to make Dolibarr working with Plesk
 if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs') {
-    set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+    set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
-require_once DOL_BASE_PATH . '/filefunc.inc.php';
+require_once DOL_BASE_PATH.'/filefunc.inc.php';
 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
 // This is used for example by form of boxes to save personalization of some options.
@@ -211,7 +211,7 @@ 
     $tmplist = explode(',', $tmpautoset[1]);
     $cookiearrayvalue = array();
     foreach ($tmplist as $tmpkey) {
-        $postkey = $tmpautoset[0] . '_' . $tmpkey;
+        $postkey = $tmpautoset[0].'_'.$tmpkey;
         //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
         if (!empty($_POST[$postkey]))
             $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
@@ -229,12 +229,12 @@ 
 // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
 $prefix = dol_getprefix('');
 
-$sessionname = 'DOLSESSID_' . $prefix;
-$sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+$sessionname = 'DOLSESSID_'.$prefix;
+$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout]))
     ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_name($sessionname);
-session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION')) {
@@ -260,7 +260,7 @@ 
     $conf->browser->name = $tmp['browsername'];
     $conf->browser->os = $tmp['browseros'];
     $conf->browser->version = $tmp['browserversion'];
-    $conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
+    $conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
     //var_dump($conf->browser);
 
     if ($conf->browser->layout == 'phone')
@@ -279,16 +279,16 @@ 
                 $newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
             }
         } else { // Check HTTPS environment variable (Apache/mod_ssl only)
-            $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT) . $_SERVER["REQUEST_URI"];
+            $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
         }
     } else {
         // Check HTTPS environment variable (Apache/mod_ssl only)
-        $newurl = $conf->file->main_force_https . $_SERVER["REQUEST_URI"];
+        $newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
     }
     // Start redirect
     if ($newurl) {
-        dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to " . $newurl);
-        header("Location: " . $newurl);
+        dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
+        header("Location: ".$newurl);
         exit;
     } else {
         dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
@@ -313,9 +313,9 @@ 
 
 // Loading of additional presentation includes
 if (!defined('NOREQUIREHTML'))
-    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
+    require_once DOL_BASE_PATH.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
 if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax)
-    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+    require_once DOL_BASE_PATH.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 
 
@@ -324,19 +324,19 @@ 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED)) {
     dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
-    header("Location: " . DOL_BASE_URI . "/install/index.php");
+    header("Location: ".DOL_BASE_URI."/install/index.php");
     exit;
 }
 // If an upgrade process is required, we call the install page.
 if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION)) || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
     $versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
-    require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
+    require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
     $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
     $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
     $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
     if ($rescomp > 0) {   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-        dol_syslog("main.inc: database version " . $versiontocompare . " is lower than programs version " . DOL_VERSION . ". Redirect to install page.", LOG_WARNING);
-        header("Location: " . DOL_BASE_URI . "/install/index.php");
+        dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+        header("Location: ".DOL_BASE_URI."/install/index.php");
         exit;
     }
 }
@@ -359,7 +359,7 @@ 
     }
     if ($_SERVER['REQUEST_METHOD'] === 'POST') {  // This test must be after loading $_SESSION['token'].
         if (GETPOST('token', 'alpha') != $_SESSION['token']) {
-            dol_syslog("Invalid token in " . $_SERVER['HTTP_REFERER'] . ", action=" . GETPOST('action', 'aZ09') . ", _POST['token']=" . GETPOST('token', 'alpha') . ", _SESSION['token']=" . $_SESSION['token'], LOG_WARNING);
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
             //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
             unset($_POST);
         }
@@ -419,7 +419,7 @@ 
     $test = true;
     if (!isset($_SESSION["dol_login"])) {
         // It is not already authenticated and it requests the login / password
-        include_once DOL_BASE_PATH . '/core/lib/security2.lib.php';
+        include_once DOL_BASE_PATH.'/core/lib/security2.lib.php';
 
         $dol_dst_observed = GETPOST("dst_observed", 'int', 3);
         $dol_dst_first = GETPOST("dst_first", 'int', 3);
@@ -433,17 +433,17 @@ 
         $dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3);
         //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
         // If in demo mode, we check we go to home page through the public/demo/index.php page
-        if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI . '/index.php') {  // We ask index page
+        if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI.'/index.php') {  // We ask index page
             if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-                dol_syslog("Call index page from another url than demo page (call is done from page " . $_SERVER['HTTP_REFERER'] . ")");
+                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
                 $url = '';
-                $url .= ($url ? '&' : '') . ($dol_hide_topmenu ? 'dol_hide_topmenu=' . $dol_hide_topmenu : '');
-                $url .= ($url ? '&' : '') . ($dol_hide_leftmenu ? 'dol_hide_leftmenu=' . $dol_hide_leftmenu : '');
-                $url .= ($url ? '&' : '') . ($dol_optimize_smallscreen ? 'dol_optimize_smallscreen=' . $dol_optimize_smallscreen : '');
-                $url .= ($url ? '&' : '') . ($dol_no_mouse_hover ? 'dol_no_mouse_hover=' . $dol_no_mouse_hover : '');
-                $url .= ($url ? '&' : '') . ($dol_use_jmobile ? 'dol_use_jmobile=' . $dol_use_jmobile : '');
-                $url = DOL_BASE_URI . '/public/demo/index.php' . ($url ? '?' . $url : '');
-                header("Location: " . $url);
+                $url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+                $url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+                $url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+                $url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+                $url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+                $url = DOL_BASE_URI.'/public/demo/index.php'.($url ? '?'.$url : '');
+                header("Location: ".$url);
                 exit;
             }
         }
@@ -463,9 +463,9 @@ 
                 $test = false;
 
                 // Call trigger for the "security events" log
-                $user->trigger_mesg = 'ErrorBadValueForCode - login=' . GETPOST("username", "alpha", 2);
+                $user->trigger_mesg = 'ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
                 // Call of triggers
-                include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
+                include_once DOL_BASE_PATH.'/core/class/interfaces.class.php';
                 $interface = new Interfaces($db);
                 $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
                 if ($result < 0) {
@@ -476,7 +476,7 @@ 
                 $action = '';
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0)
                     $error++;
 
@@ -501,7 +501,7 @@ 
             $goontestloop = true;
 
         if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-            include_once DOL_BASE_PATH . '/core/class/translate.class.php';
+            include_once DOL_BASE_PATH.'/core/class/translate.class.php';
             $langs = new Translate("", $conf);
             $langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
             if (defined('MAIN_LANG_DEFAULT'))
@@ -523,7 +523,7 @@ 
                 $dol_tz_string = preg_replace('/\s/', '_', $dol_tz_string);
                 $dol_dst = 0;
                 if (isset($_POST["dst_first"]) && isset($_POST["dst_second"])) {
-                    include_once DOL_BASE_PATH . '/core/lib/date.lib.php';
+                    include_once DOL_BASE_PATH.'/core/lib/date.lib.php';
                     $datenow = dol_now();
                     $datefirst = dol_stringtotime($_POST["dst_first"]);
                     $datesecond = dol_stringtotime($_POST["dst_second"]);
@@ -544,9 +544,9 @@ 
                     $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 
                 // Call trigger for the "security events" log
-                $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword") . ' - login=' . GETPOST("username", "alpha", 2);
+                $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username", "alpha", 2);
                 // Call of triggers
-                include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
+                include_once DOL_BASE_PATH.'/core/class/interfaces.class.php';
                 $interface = new Interfaces($db);
                 $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf, GETPOST("username", "alpha", 2));
                 if ($result < 0) {
@@ -557,7 +557,7 @@ 
                 $action = '';
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0)
                     $error++;
 
@@ -568,7 +568,7 @@ 
         // End test login / passwords
         if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
             // No data to test login, so we show the login page
-            dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
+            dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
             if (defined('NOREDIRECTBYMAINTOLOGIN'))
                 return 'ERROR_NOT_LOGGED';
             else
@@ -581,8 +581,8 @@ 
             dol_syslog('User not found, connexion refused');
             session_destroy();
             session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+            session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+            session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0) {
                 // Load translation files required by page
@@ -590,7 +590,7 @@ 
 
                 $_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
             }
             if ($resultFetchUser < 0) {
                 $_SESSION["dol_loginmesg"] = $user->error;
@@ -599,7 +599,7 @@ 
             }
 
             // Call triggers for the "security events" log
-            include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
+            include_once DOL_BASE_PATH.'/core/class/interfaces.class.php';
             $interface = new Interfaces($db);
             $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
             if ($result < 0) {
@@ -610,18 +610,18 @@ 
             $action = '';
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-            $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+            $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
             if ($reshook < 0)
                 $error++;
 
             $paramsurl = array();
             if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+                $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
             if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+                $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
             if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
-            header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+            header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
             exit;
         }
     }
@@ -629,16 +629,16 @@ 
         // We are already into an authenticated session
         $login = $_SESSION["dol_login"];
         $entity = $_SESSION["dol_entity"];
-        dol_syslog("- This is an already logged session. _SESSION['dol_login']=" . $login . " _SESSION['dol_entity']=" . $entity, LOG_DEBUG);
+        dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
         $resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
         if ($resultFetchUser <= 0) {
             // Account has been removed after login
-            dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=" . $login, LOG_WARNING);
+            dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
             session_destroy();
             session_name($sessionname);
-            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+            session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+            session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
             if ($resultFetchUser == 0) {
                 // Load translation files required by page
@@ -646,7 +646,7 @@ 
 
                 $_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                $user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
             }
             if ($resultFetchUser < 0) {
                 $_SESSION["dol_loginmesg"] = $user->error;
@@ -655,7 +655,7 @@ 
             }
 
             // Call triggers for the "security events" log
-            include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
+            include_once DOL_BASE_PATH.'/core/class/interfaces.class.php';
             $interface = new Interfaces($db);
             $result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
             if ($result < 0) {
@@ -666,18 +666,18 @@ 
             $action = '';
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-            $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+            $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
             if ($reshook < 0)
                 $error++;
 
             $paramsurl = array();
             if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+                $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
             if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+                $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
             if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
-            header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+            header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
             exit;
         }
         else {
@@ -687,29 +687,29 @@ 
             // Code for search criteria persistence.
             if (!empty($_GET['save_lastsearch_values'])) {    // We must use $_GET here
                 $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-                $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
+                $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
                 // Clean $relativepathstring
                 if (constant('DOL_BASE_URI'))
-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                 //var_dump($relativepathstring);
                 // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-                if (!empty($_SESSION['lastsearch_values_tmp_' . $relativepathstring])) {
-                    $_SESSION['lastsearch_values_' . $relativepathstring] = $_SESSION['lastsearch_values_tmp_' . $relativepathstring];
-                    unset($_SESSION['lastsearch_values_tmp_' . $relativepathstring]);
+                if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
+                    $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                 }
-                if (!empty($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring])) {
-                    $_SESSION['lastsearch_contextpage_' . $relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring];
-                    unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
+                if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring])) {
+                    $_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
                 }
-                if (!empty($_SESSION['lastsearch_page_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_page_tmp_' . $relativepathstring] > 1) {
-                    $_SESSION['lastsearch_page_' . $relativepathstring] = $_SESSION['lastsearch_page_tmp_' . $relativepathstring];
-                    unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
+                if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1) {
+                    $_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
                 }
-                if (!empty($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] != $conf->liste_limit) {
-                    $_SESSION['lastsearch_limit_' . $relativepathstring] = $_SESSION['lastsearch_limit_tmp_' . $relativepathstring];
-                    unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+                if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit) {
+                    $_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
                 }
             }
 
@@ -752,18 +752,18 @@ 
         if (!empty($dol_use_jmobile))
             $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
 
-        dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
+        dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
         $db->begin();
 
         $user->update_last_login_date();
 
-        $loginfo = 'TZ=' . $_SESSION["dol_tz"] . ';TZString=' . $_SESSION["dol_tz_string"] . ';Screen=' . $_SESSION["dol_screenwidth"] . 'x' . $_SESSION["dol_screenheight"];
+        $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
 
         // Call triggers for the "security events" log
         $user->trigger_mesg = $loginfo;
         // Call triggers
-        include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
+        include_once DOL_BASE_PATH.'/core/class/interfaces.class.php';
         $interface = new Interfaces($db);
         $result = $interface->run_triggers('USER_LOGIN', $user, $user, $langs, $conf);
         if ($result < 0) {
@@ -774,7 +774,7 @@ 
         $action = '';
         $hookmanager->initHooks(array('login'));
         $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginfo' => $loginfo);
-        $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
         if ($reshook < 0)
             $error++;
 
@@ -792,7 +792,7 @@ 
         if (!empty($landingpage)) {    // Example: /index.php
             $newpath = dol_buildpath($landingpage, 1);
             if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
-                header('Location: ' . $newpath);
+                header('Location: '.$newpath);
                 exit;
             }
         }
@@ -827,7 +827,7 @@ 
     if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME)) {
         $conf->theme = $user->conf->MAIN_THEME;
         // $conf->css = "/theme/" . $conf->theme . "/style.css.php";
-        $conf->css = '?controller=theme/' . $conf->theme . '&method=style.css';
+        $conf->css = '?controller=theme/'.$conf->theme.'&method=style.css';
     }
 }
 
@@ -835,7 +835,7 @@ 
 if (GETPOST('theme', 'alpha')) {
     $conf->theme = GETPOST('theme', 'alpha', 1);
     // $conf->css = "/theme/" . $conf->theme . "/style.css.php";
-    $conf->css = '?controller=theme/' . $conf->theme . '&method=style.css';
+    $conf->css = '?controller=theme/'.$conf->theme.'&method=style.css';
 }
 
 
@@ -877,7 +877,7 @@ 
 if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
     $conf->theme = 'eldy';
     // $conf->css = "/theme/" . $conf->theme . "/style.css.php";
-    $conf->css = '?controller=theme/' . $conf->theme . '&method=style.css';
+    $conf->css = '?controller=theme/'.$conf->theme.'&method=style.css';
 }
 
 if (!defined('NOREQUIRETRAN')) {
@@ -913,7 +913,7 @@ 
 }
 
 
-dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . ' - action=' . GETPOST('action', 'az09') . ', massaction=' . GETPOST('massaction', 'az09'));
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'az09').', massaction='.GETPOST('massaction', 'az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 // Load main languages files
@@ -925,7 +925,7 @@ 
 // Define some constants used for style of arrays
 $bc = array(0 => 'class="impair"', 1 => 'class="pair"');
 $bcdd = array(0 => 'class="drag drop oddeven"', 1 => 'class="drag drop oddeven"');
-$bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"');  // Used for tr to add new lines
+$bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
 $bctag = array(0 => 'class="impair tagtr"', 1 => 'class="pair tagtr"');
 
 // Define messages variables
@@ -973,19 +973,19 @@ 
     // Load the menu manager (only if not already done)
     $file_menu = $conf->standard_menu;
     if (GETPOST('menu', 'alpha'))
-        $file_menu = GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+        $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
     if (!class_exists('MenuManager')) {
         $menufound = 0;
         $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
-            $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
+            $menufound = dol_include_once($dirmenu."standard/".$file_menu);
             if (class_exists('MenuManager'))
                 break;
         }
         if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
-            dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
+            dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
             $file_menu = 'eldy_menu.php';
-            include_once DOL_DOCUMENT_ROOT . "/core/menus/standard/" . $file_menu;
+            include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
         }
     }
     $menumanager = new MenuManager($db, empty($user->societe_id) ? 0 : 1);
@@ -1023,7 +1023,7 @@ 
         // html header
         top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"' . ($morecssonbody ? ' class="' . $morecssonbody . '"' : '') . '>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
         // top menu and left menu area
         if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
@@ -1031,7 +1031,7 @@ 
         }
 
         if (empty($conf->dol_hide_leftmenu)) {
-            left_menu('', $help_url, '', '', 1, $title, 1);  // $menumanager is retreived with a global $menumanager inside this function
+            left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
         }
 
         // main area
@@ -1055,12 +1055,12 @@ 
     global $db, $conf, $hookmanager;
 
     if ($contenttype == 'text/html')
-        header("Content-Type: text/html; charset=" . $conf->file->character_set_client);
+        header("Content-Type: text/html; charset=".$conf->file->character_set_client);
     else
-        header("Content-Type: " . $contenttype);
+        header("Content-Type: ".$contenttype);
     // Security options
-    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+    header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+    header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
     //header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
     if (!defined('FORCECSP')) {
         //if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
@@ -1076,11 +1076,11 @@ 
         $hookmanager->initHooks("main");
 
         $parameters = array('contentsecuritypolicy' => $contentsecuritypolicy);
-        $result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters);    // Note that $action and $object may have been modified by some hooks
+        $result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
         if ($result > 0)
             $contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
         else
-            $contentsecuritypolicy .= $hookmanager->resPrint;    // Concat CSP
+            $contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
 
         if (!empty($contentsecuritypolicy)) {
             // For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
@@ -1091,10 +1091,10 @@ 
             // default-src 'self'; img-src *;
             // Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
             // default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
-            header("Content-Security-Policy: " . $contentsecuritypolicy);
+            header("Content-Security-Policy: ".$contentsecuritypolicy);
         }
     } elseif (constant('FORCECSP')) {
-        header("Content-Security-Policy: " . constant('FORCECSP'));
+        header("Content-Security-Policy: ".constant('FORCECSP'));
     }
     if ($forcenocache) {
         header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
@@ -1125,33 +1125,33 @@ 
         // $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
         $conf->css = '?controller=theme/eldy&method=style.css';
     }
-    print '<!doctype html>' . "\n";
+    print '<!doctype html>'."\n";
 
     if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST))
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
+        print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_BASE_URI.'/cache.manifest">'."\n";
     else
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+        print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead)) {
-        $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
         print "<head>\n";
 
         if (GETPOST('dol_basehref', 'alpha'))
-            print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+            print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
 
         // Displays meta
-        print '<meta charset="UTF-8">' . "\n";
-        print '<meta name="robots" content="noindex' . ($disablenofollow ? '' : ',nofollow') . '">' . "\n"; // Do not index
-        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">' . "\n";  // Scale for mobile device
-        print '<meta name="author" content="Dolibarr Development Team">' . "\n";
+        print '<meta charset="UTF-8">'."\n";
+        print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n"; // Scale for mobile device
+        print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
         // Favicon
-        $favicon = dol_buildpath('/theme/' . $conf->theme . '/img/favicon.ico', 1);
+        $favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
         if (!empty($conf->global->MAIN_FAVICON_URL))
             $favicon = $conf->global->MAIN_FAVICON_URL;
         if (empty($conf->dol_use_jmobile))
-            print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n"; // Not required into an Android webview
+            print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
 
 
 
@@ -1162,7 +1162,7 @@ 
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
         // Auto refresh page
         if (GETPOST('autorefresh', 'int') > 0)
-            print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+            print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
 
         // Displays title
         $appli = constant('DOL_APPLICATION_TITLE');
@@ -1174,7 +1174,7 @@ 
         if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE))
             $titletoshow = dol_htmlentities($title);
         else if ($title)
-            $titletoshow = dol_htmlentities($appli . ' - ' . $title);
+            $titletoshow = dol_htmlentities($appli.' - '.$title);
         else
             $titletoshow = dol_htmlentities($appli);
 
@@ -1182,11 +1182,11 @@ 
             $hookmanager = new HookManager($db);
         $hookmanager->initHooks("main");
         $parameters = array('title' => $titletoshow);
-        $result = $hookmanager->executeHooks('setHtmlTitle', $parameters);  // Note that $action and $object may have been modified by some hooks
+        $result = $hookmanager->executeHooks('setHtmlTitle', $parameters); // Note that $action and $object may have been modified by some hooks
         if ($result > 0)
-            $titletoshow = $hookmanager->resPrint;    // Replace Title to show
+            $titletoshow = $hookmanager->resPrint; // Replace Title to show
         else
-            $titletoshow .= $hookmanager->resPrint;      // Concat to Title to show
+            $titletoshow .= $hookmanager->resPrint; // Concat to Title to show
 
         print $titletoshow;
         print '</title>';
@@ -1194,61 +1194,61 @@ 
         print "\n";
 
         if (GETPOST('version', 'int'))
-            $ext = 'version=' . GETPOST('version', 'int'); // usefull to force no cache on css/js
+            $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
         if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER))
-            $ext .= '&testmenuhider=' . (GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
+            $ext .= '&testmenuhider='.(GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
 
-        $themeparam = '&lang=' . $langs->defaultlang . '&amp;theme=' . $conf->theme . (GETPOST('optioncss', 'aZ09') ? '&amp;optioncss=' . GETPOST('optioncss', 'aZ09', 1) : '') . '&amp;userid=' . $user->id . '&amp;entity=' . $conf->entity;
-        $themeparam .= ($ext ? '&amp;' . $ext : '');
+        $themeparam = '&lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam .= ($ext ? '&amp;'.$ext : '');
         if (!empty($_SESSION['dol_resetcache']))
-            $themeparam .= '&amp;dol_resetcache=' . $_SESSION['dol_resetcache'];
+            $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
         if (GETPOST('dol_hide_topmenu', 'int')) {
-            $themeparam .= '&amp;dol_hide_topmenu=' . GETPOST('dol_hide_topmenu', 'int');
+            $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int');
         }
         if (GETPOST('dol_hide_leftmenu', 'int')) {
-            $themeparam .= '&amp;dol_hide_leftmenu=' . GETPOST('dol_hide_leftmenu', 'int');
+            $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int');
         }
         if (GETPOST('dol_optimize_smallscreen', 'int')) {
-            $themeparam .= '&amp;dol_optimize_smallscreen=' . GETPOST('dol_optimize_smallscreen', 'int');
+            $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int');
         }
         if (GETPOST('dol_no_mouse_hover', 'int')) {
-            $themeparam .= '&amp;dol_no_mouse_hover=' . GETPOST('dol_no_mouse_hover', 'int');
+            $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int');
         }
         if (GETPOST('dol_use_jmobile', 'int')) {
-            $themeparam .= '&amp;dol_use_jmobile=' . GETPOST('dol_use_jmobile', 'int');
+            $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int');
             $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
         }
 
         if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
-            print '<!-- Includes CSS for JQuery (Ajax library) -->' . "\n";
+            print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
             $jquerytheme = 'base';
             if (!empty($conf->global->MAIN_USE_JQUERY_THEME))
                 $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
             if (constant('JS_JQUERY_UI'))
-                print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";  // JQuery
+                print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
             else
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n";    // JQuery
+                print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
             if (!defined('DISABLE_JQUERY_JNOTIFY'))
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";          // JNotify
+                print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
             if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
                 $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/' . $tmpplugin . '/dist/css/' . $tmpplugin . '.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+                print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
             }
         }
 
         if (!defined('DISABLE_FONT_AWSOME')) {
-            print '<!-- Includes CSS for font awesome -->' . "\n";
-            print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/theme/common/fontawesome/css/font-awesome.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            print '<!-- Includes CSS for font awesome -->'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext ? '?'.$ext : '').'">'."\n";
         }
 
-        print '<!-- Includes CSS for Dolibarr theme -->' . "\n";
+        print '<!-- Includes CSS for Dolibarr theme -->'."\n";
         // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
         $themepath = dol_buildpath($conf->css, 3);
         $themesubdir = '';
         if (!empty($conf->modules_parts['theme'])) { // This slow down
             foreach ($conf->modules_parts['theme'] as $reldir) {
-                if (file_exists(dol_buildpath($reldir . $conf->css, 0))) {
-                    $themepath = dol_buildpath($reldir . $conf->css, 1);
+                if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+                    $themepath = dol_buildpath($reldir.$conf->css, 1);
                     $themesubdir = $reldir;
                     break;
                 }
@@ -1256,9 +1256,9 @@ 
         }
 
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-        print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
+        print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
         if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME))
-            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
@@ -1267,112 +1267,112 @@ 
                 $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
                     if (empty($cssfile))
-                        dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                        dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
                     // cssfile is a relative path
-                    print '<!-- Includes CSS added by module ' . $modcss . ' -->' . "\n" . '<link rel="stylesheet" type="text/css" href="' . dol_buildpath($cssfile, 1);
+                    print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
                     // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
                     if (!preg_match('/\.css$/i', $cssfile))
                         print $themeparam;
-                    print '">' . "\n";
+                    print '">'."\n";
                 }
             }
         }
         // CSS forced by page in top_htmlhead call (relative url starting with /)
         if (is_array($arrayofcss)) {
             foreach ($arrayofcss as $cssfile) {
-                print '<!-- Includes CSS added by page -->' . "\n" . '<link rel="stylesheet" type="text/css" title="default" href="' . dol_buildpath($cssfile, 1);
+                print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
                 if (!preg_match('/\.css$/i', $cssfile))
                     print $themeparam;
-                print '">' . "\n";
+                print '">'."\n";
             }
         }
 
         // Output standard javascript links
         if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax)) {
             // JQuery. Must be before other includes
-            print '<!-- Includes JS for JQuery -->' . "\n";
+            print '<!-- Includes JS for JQuery -->'."\n";
             if (defined('JS_JQUERY') && constant('JS_JQUERY'))
-                print '<script type="text/javascript" src="' . JS_JQUERY . 'jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED')) {
                 if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE'))
-                    print '<script type="text/javascript" src="' . JS_JQUERY_MIGRATE . 'jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 else
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                    print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/js/jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
             if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI'))
-                print '<script type="text/javascript" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             if (!defined('DISABLE_JQUERY_TABLEDND'))
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/tablednd/jquery.tablednd.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
             // Flot
             if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT')) {
                 if (constant('JS_JQUERY_FLOT')) {
-                    print '<script type="text/javascript" src="' . JS_JQUERY_FLOT . 'jquery.flot.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                    print '<script type="text/javascript" src="' . JS_JQUERY_FLOT . 'jquery.flot.pie.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                    print '<script type="text/javascript" src="' . JS_JQUERY_FLOT . 'jquery.flot.stack.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 } else {
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/flot/jquery.flot.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/flot/jquery.flot.pie.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/flot/jquery.flot.stack.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                    print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
             // jQuery jeditable
             if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {
-                print '<!-- JS to manage editInPlace feature -->' . "\n";
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jeditable/jquery.jeditable.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                print '<script type="text/javascript">' . "\n";
-                print 'var urlSaveInPlace = \'' . DOL_BASE_URI . '/core/ajax/saveinplace.php\';' . "\n";
-                print 'var urlLoadInPlace = \'' . DOL_BASE_URI . '/core/ajax/loadinplace.php\';' . "\n";
-                print 'var tooltipInPlace = \'' . $langs->transnoentities('ClickToEdit') . '\';' . "\n"; // Added in title attribute of span
-                print 'var placeholderInPlace = \'&nbsp;\';' . "\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
-                print 'var cancelInPlace = \'' . $langs->trans('Cancel') . '\';' . "\n";
-                print 'var submitInPlace = \'' . $langs->trans('Ok') . '\';' . "\n";
-                print 'var indicatorInPlace = \'<img src="' . DOL_BASE_URI . "/theme/" . $conf->theme . "/img/working.gif" . '">\';' . "\n";
-                print 'var withInPlace = 300;';  // width in pixel for default string edit
-                print '</script>' . "\n";
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/editinplace.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<!-- JS to manage editInPlace feature -->'."\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript">'."\n";
+                print 'var urlSaveInPlace = \''.DOL_BASE_URI.'/core/ajax/saveinplace.php\';'."\n";
+                print 'var urlLoadInPlace = \''.DOL_BASE_URI.'/core/ajax/loadinplace.php\';'."\n";
+                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span
+                print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+                print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
+                print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
+                print 'var indicatorInPlace = \'<img src="'.DOL_BASE_URI."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
+                print 'var withInPlace = 300;'; // width in pixel for default string edit
+                print '</script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
             // jQuery Timepicker
             if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                print '<script type="text/javascript" src="' . BASE_PATH . '?controller=core/js/&method=timepicker.js&lang=' . $langs->defaultlang . ($ext ? '&amp;' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.BASE_PATH.'?controller=core/js/&method=timepicker.js&lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
             if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
                 $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/' . $tmpplugin . '/dist/js/' . $tmpplugin . '.full.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n"; // We include full because we need the support of containerCssClass
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
             }
             if (!defined('DISABLE_MULTISELECT')) {     // jQuery plugin "mutiselect" to select with checkboxes
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/multiselect/jquery.multi-select.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print '<script type="text/javascript" src="'.DOL_BASE_URI.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
         }
 
         if (!$disablejs && !empty($conf->use_javascript_ajax)) {
             // CKEditor
             if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) {
-                print '<!-- Includes JS for CKEditor -->' . "\n";
-                $pathckeditor = DOL_BASE_URI . '/includes/ckeditor/ckeditor/';
+                print '<!-- Includes JS for CKEditor -->'."\n";
+                $pathckeditor = DOL_BASE_URI.'/includes/ckeditor/ckeditor/';
                 $jsckeditor = 'ckeditor.js';
                 if (constant('JS_CKEDITOR')) { // To use external ckeditor 4 js lib
                     $pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
-                print 'var CKEDITOR_BASEPATH = \'' . $pathckeditor . '\';' . "\n";
-                print 'var ckeditorConfig = \'' . dol_buildpath($themesubdir . '/theme/' . $conf->theme . '/ckeditor/config.js' . ($ext ? '?' . $ext : ''), 1) . '\';' . "\n";  // $themesubdir='' in standard usage
-                print 'var ckeditorFilebrowserBrowseUrl = \'' . DOL_BASE_URI . '/core/filemanagerdol/browser/default/browser.php?Connector=' . DOL_BASE_URI . '/core/filemanagerdol/connectors/php/connector.php\';' . "\n";
-                print 'var ckeditorFilebrowserImageBrowseUrl = \'' . DOL_BASE_URI . '/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector=' . DOL_BASE_URI . '/core/filemanagerdol/connectors/php/connector.php\';' . "\n";
-                print '</script>' . "\n";
-                print '<script type="text/javascript" src="' . $pathckeditor . $jsckeditor . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
+                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
+                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_BASE_URI.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_BASE_URI.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_BASE_URI.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_BASE_URI.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+                print '</script>'."\n";
+                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
 
             // Browser notifications
@@ -1383,16 +1383,16 @@ 
                 if ($conf->browser->layout == 'phone')
                     $enablebrowsernotif = false;
                 if ($enablebrowsernotif) {
-                    print '<!-- Includes JS of Dolibarr (brwoser layout = ' . $conf->browser->layout . ')-->' . "\n";
+                    print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
                     //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_notification.js.php' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                    print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_notification.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                    print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_notification.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
 
             // Global js function
-            print '<!-- Includes JS of Dolibarr -->' . "\n";
+            print '<!-- Includes JS of Dolibarr -->'."\n";
             //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_head.js.php?lang=' . $langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_head.js&lang=' . $langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_head.js&lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
             if (!empty($conf->modules_parts['js'])) {  // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
@@ -1401,27 +1401,27 @@ 
                     $filesjs = (array) $filesjs; // To be sure filejs is an array
                     foreach ($filesjs as $jsfile) {
                         // jsfile is a relative path
-                        print '<!-- Include JS added by module ' . $modjs . '-->' . "\n" . '<script type="text/javascript" src="' . dol_buildpath($jsfile, 1) . '"></script>' . "\n";
+                        print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
             }
             // JS forced by page in top_htmlhead (relative url starting with /)
             if (is_array($arrayofjs)) {
-                print '<!-- Includes JS added by page -->' . "\n";
+                print '<!-- Includes JS added by page -->'."\n";
                 foreach ($arrayofjs as $jsfile) {
                     if (preg_match('/^http/i', $jsfile)) {
-                        print '<script type="text/javascript" src="' . $jsfile . '"></script>' . "\n";
+                        print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
                     } else {
-                        print '<script type="text/javascript" src="' . dol_buildpath($jsfile, 1) . '"></script>' . "\n";
+                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
             }
         }
 
         if (!empty($head))
-            print $head . "\n";
+            print $head."\n";
         if (!empty($conf->global->MAIN_HTML_HEADER))
-            print $conf->global->MAIN_HTML_HEADER . "\n";
+            print $conf->global->MAIN_HTML_HEADER."\n";
 
         print "<!-- Alixar debugBar header -->";
         print Debug::getRenderHeader(); // Includes Alixar debugBar header
@@ -1472,13 +1472,13 @@ 
      * Top menu
      */
     if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
-        print "\n" . '<!-- Start top horizontal -->' . "\n";
+        print "\n".'<!-- Start top horizontal -->'."\n";
 
-        print '<div class="side-nav-vert' . (GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '') . '"><div id="id-top">';  // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+        print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
         // Show menu entries
-        print '<div id="tmenu_tooltip' . (empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert') . '" class="tmenu">' . "\n";
+        print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
         $menumanager->atarget = $target;
-        $menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks));      // This contains a \n
+        $menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks)); // This contains a \n
         print "</div>\n";
 
         // Define link to login card
@@ -1486,34 +1486,34 @@ 
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
             $appli = $conf->global->MAIN_APPLICATION_TITLE;
             if (preg_match('/\d\.\d/', $appli)) {
-                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                    $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                    $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
         } else
-            $appli .= " " . DOL_VERSION;
+            $appli .= " ".DOL_VERSION;
 
         if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+            $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
         $logouttext = '';
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
             //$logouthtmltext=$appli.'<br>';
             if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
-                $logouthtmltext .= $langs->trans("Logout") . '<br>';
+                $logouthtmltext .= $langs->trans("Logout").'<br>';
 
                 //$logouttext .='<a accesskey="l" href="'.DOL_BASE_URI.'/user/logout.php">';
-                $logouttext .= '<a accesskey="l" href="' . BASE_URI . '?controller=user&method=logout">';
+                $logouttext .= '<a accesskey="l" href="'.BASE_URI.'?controller=user&method=logout">';
                 //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                 $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
                 $logouttext .= '</a>';
             } else {
                 $logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-                $logouttext .= img_picto($langs->trans('Logout') . ":" . $langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
             }
         }
 
-        print '<div class="login_block">' . "\n";
+        print '<div class="login_block">'."\n";
 
         // Add login user link
         $toprightmenu .= '<div class="login_block_user">';
@@ -1524,18 +1524,18 @@ 
         $toprightmenu .= $user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
         $toprightmenu .= '</div></div>';
 
-        $toprightmenu .= '</div>' . "\n";
+        $toprightmenu .= '</div>'."\n";
 
         $toprightmenu .= '<div class="login_block_other">';
 
         // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
         $parameters = array();
-        $result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+        $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
         if (is_numeric($result)) {
             if ($result == 0)
-                $toprightmenu .= $hookmanager->resPrint;  // add
+                $toprightmenu .= $hookmanager->resPrint; // add
             else
-                $toprightmenu = $hookmanager->resPrint;      // replace
+                $toprightmenu = $hookmanager->resPrint; // replace
         }
         else {
             $toprightmenu .= $result; // For backward compatibility
@@ -1544,7 +1544,7 @@ 
         // Link to module builder
         if (!empty($conf->modulebuilder->enabled)) {
             //$text = '<a href="' . DOL_BASE_URI . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-            $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+            $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
             //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
             $text .= '<span class="fa fa-bug atoplogin"></span>';
             $text .= '</a>';
@@ -1558,11 +1558,11 @@ 
             if (is_array($_POST)) {
                 foreach ($_POST as $key => $value) {
                     if ($key !== 'action' && $key !== 'password' && !is_array($value))
-                        $qs .= '&' . $key . '=' . urlencode($value);
+                        $qs .= '&'.$key.'='.urlencode($value);
                 }
             }
-            $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
-            $text = '<a href="' . dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?' . $qs . ($qs ? '&' : '') . 'optioncss=print" target="_blank">';
+            $qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+            $text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
             //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
             $text .= '<span class="fa fa-print atoplogin"></span>';
             $text .= '</a>';
@@ -1591,12 +1591,12 @@ 
                 $text = '';
                 if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                     $langs->load('admin');
-                    $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
+                    $appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
                 }
-                $title = $appli . '<br>';
+                $title = $appli.'<br>';
                 $title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
                 if ($mode == 'wiki')
-                    $title .= ' - ' . $langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                    $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
                 $text .= '<a class="help" target="_blank" rel="noopener" href="';
                 if ($mode == 'wiki')
                     $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
@@ -1620,7 +1620,7 @@ 
 
         print $toprightmenu;
 
-        print "</div>\n";  // end div class="login_block"
+        print "</div>\n"; // end div class="login_block"
 
         print '</div></div>';
 
@@ -1629,7 +1629,7 @@ 
     }
 
     if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-        print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
 }
 
 /**
@@ -1661,7 +1661,7 @@ 
         // Instantiate hooks of thirdparty module
         $hookmanager->initHooks(array('searchform', 'leftblock'));
 
-        print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
+        print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
         if ($conf->browser->layout == 'phone')
             $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
@@ -1673,7 +1673,7 @@ 
         }
         $selected = -1;
         $usedbyinclude = 1;
-        include_once DOL_BASE_PATH . '/core/ajax/selectsearchbox.php'; // This set $arrayresult
+        include_once DOL_BASE_PATH.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
         if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
             //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_BASE_URI.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
@@ -1688,7 +1688,7 @@ 
         // Execute hook printSearchForm
         $parameters = array('searchform' => $searchform);
 
-        $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             $searchform .= $hookmanager->resPrint;
         } else
@@ -1696,10 +1696,10 @@ 
 
         // Force special value for $searchform
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
-            $urltosearch = DOL_BASE_URI . '/core/search_page.php?showtitlebefore=1';
-            $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" alt="' . dol_escape_htmltag($langs->trans("ShowSearchFields")) . '">' . $langs->trans("Search") . '...</a></div></div>';
+            $urltosearch = DOL_BASE_URI.'/core/search_page.php?showtitlebefore=1';
+            $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
         } elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-            $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . dol_escape_htmltag($langs->trans("ShowSearchFields")) . '">' . $langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+            $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
             $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -1712,16 +1712,16 @@ 
 
         // Define $bookmarks
         if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) {
-            include_once DOL_BASE_PATH . '/bookmarks/bookmarks.lib.php';
+            include_once DOL_BASE_PATH.'/bookmarks/bookmarks.lib.php';
             $langs->load("bookmarks");
 
             $bookmarks = printBookmarksList($db, $langs);
         }
 
         // Left column
-        print '<!-- Begin left menu -->' . "\n";
+        print '<!-- Begin left menu -->'."\n";
 
-        print '<div class="vmenu"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"') . '>' . "\n\n";
+        print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
         // Show left menu with other forms
         $menumanager->menu_array = $menu_array_before;
@@ -1730,7 +1730,7 @@ 
         // Dolibarr version + help + bug report link
         print "\n";
         print "<!-- Begin Help Block-->\n";
-        print '<div id="blockvmenuhelp" class="blockvmenuhelp">' . "\n";
+        print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
         // Version
         if (empty($conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
@@ -1752,15 +1752,15 @@ 
                 $appli = $conf->global->MAIN_APPLICATION_TITLE;
                 $doliurl = '';
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                    if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                        $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
             print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
             if ($doliurl)
-                print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
             else
                 print '<span class="help">';
             print $appli;
@@ -1768,12 +1768,12 @@ 
                 print '</a>';
             else
                 print '</span>';
-            print '</div>' . "\n";
+            print '</div>'."\n";
         }
 
         // Link to bugtrack
         if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
-            require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+            require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
             $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
             $bugbaseurl .= '?title=';
@@ -1782,16 +1782,16 @@ 
             $bugbaseurl .= urlencode("# Bug\n");
             $bugbaseurl .= urlencode("\n");
             $bugbaseurl .= urlencode("## Environment\n");
-            $bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-            $bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-            $bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-            $bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-            $bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-            $bugbaseurl .= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+            $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+            $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+            $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+            $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+            $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+            $bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
             $bugbaseurl .= urlencode("\n");
             $bugbaseurl .= urlencode("## Report\n");
             print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-            print '<a class="help" target="_blank" rel="noopener" href="' . $bugbaseurl . '">' . $langs->trans("FindBug") . '</a>';
+            print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
             print '</div>';
         }
 
@@ -1805,14 +1805,14 @@ 
 
         // Execute hook printLeftBlock
         $parameters = array();
-        $reshook = $hookmanager->executeHooks('printLeftBlock', $parameters);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
         print $hookmanager->resPrint;
 
         print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
     }
 
     print "\n";
-    print '<!-- Begin right area -->' . "\n";
+    print '<!-- Begin right area -->'."\n";
 
     if (empty($leftmenuwithoutmainarea))
         main_area($title);
@@ -1833,7 +1833,7 @@ 
 
     print "\n";
 
-    print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
     if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
         print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
@@ -1899,17 +1899,17 @@ 
     global $conf, $langs, $user;
 
     $ret = '';
-    $ret .= '<form action="' . $urlaction . '" method="post" class="searchform">';
-    $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+    $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+    $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     $ret .= '<input type="hidden" name="mode" value="search">';
-    $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag($user->login) . '">';
+    $ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
     if ($showtitlebefore)
-        $ret .= $title . ' ';
-    $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
-    $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
-    $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
-    $ret .= ' placeholder="' . strip_tags($title) . '"';
-    $ret .= ' name="' . $htmlinputname . '" id="' . $prefhtmlinputname . $htmlinputname . '" />';
+        $ret .= $title.' ';
+    $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+    $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+    $ret .= ' placeholder="'.strip_tags($title).'"';
+    $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
     //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
     $ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
     $ret .= '<span class="fa fa-search"></span>';
@@ -1935,7 +1935,7 @@ 
         global $delayedhtmlcontent;
         global $contextpage, $page, $limit;
 
-        $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events($disabledoutputofmessages);
@@ -1945,15 +1945,15 @@ 
         if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp)) {
             // Clean and save data
             foreach ($user->lastsearch_values_tmp as $key => $val) {
-                unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
+                unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
                     if (empty($val['sortfield']))
                         unset($val['sortfield']);
                     if (empty($val['sortorder']))
                         unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
-                    $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
-                    unset($_SESSION['lastsearch_values_' . $key]);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
@@ -1962,37 +1962,37 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];
         // Clean $relativepathstring
         if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
-            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
             if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+                $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
             if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+                $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
             if (!empty($limit) && $limit != $conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+                $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
-            unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
         }
 
         // Core error message
         if (!empty($conf->global->MAIN_CORE_ERROR)) {
             // Ajax version
             if ($conf->use_javascript_ajax) {
-                $title = img_warning() . ' ' . $langs->trans('CoreErrorTitle');
+                $title = img_warning().' '.$langs->trans('CoreErrorTitle');
                 print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
             }
             // html version
             else {
-                $msg = img_warning() . ' ' . $langs->trans('CoreErrorMessage');
-                print '<div class="error">' . $msg . '</div>';
+                $msg = img_warning().' '.$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
             }
 
             //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
@@ -2000,17 +2000,17 @@ 
 
         print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
         if (empty($conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+            print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
         if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+            print '</div> <!-- End div id-container -->'."\n"; // End div container
 
         print "\n";
         if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+            print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
 
@@ -2018,8 +2018,8 @@ 
             print $delayedhtmlcontent;
 
         if (!empty($conf->use_javascript_ajax)) {
-            print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_foot.js&lang=' . $langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_foot.js&lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
         }
 
         // Wrapper to add log when clicking on download or preview
@@ -2031,7 +2031,7 @@ 
                 <script type="text/javascript">
                     jQuery(document).ready(function () {
                         $('a.documentpreview').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -2040,7 +2040,7 @@ 
                             );
                         });
                         $('a.documentdownload').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -2056,7 +2056,7 @@ 
 
         // A div for the address popup
         print "\n<!-- A div to allow dialog popup -->\n";
-        print '<div id="dialogforpopup" style="display: none;"></div>' . "\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
         print "</body>\n";
 

Helpers/AlixarDispatcher.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
     {

         parent::__construct();

 

-        $this->searchDir[] = BASE_PATH . '/plugins';

+        $this->searchDir[] = BASE_PATH.'/plugins';

         $path = null;

     }

 

@@ -39,8 +39,8 @@ 
           define('SITE_URL', APP_PROTOCOL . '://' . SERVER_NAME);

           define('BASE_URI', SITE_URL . APP_URI);

          */

-        define('DOL_BASE_PATH', BASE_PATH . '/dolibarr/htdocs');

-        define('DOL_BASE_URI', BASE_URI . '/dolibarr/htdocs');

+        define('DOL_BASE_PATH', BASE_PATH.'/dolibarr/htdocs');

+        define('DOL_BASE_URI', BASE_URI.'/dolibarr/htdocs');

 //define('DOL_DOCUMENT_ROOT', DOL_BASE_PATH);

 

         define('CORE_FOLDER', '/core');

@@ -54,15 +54,15 @@ 
         define('CACHE_FOLDER', '/../cache');

         //define('VENDOR_FOLDER', BASE_URI . '/vendor');

 

-        define('CORE_PATH', BASE_PATH . CORE_FOLDER);

-        define('CONFIG_PATH', BASE_PATH . CONFIG_FOLDER);

-        define('CONTROLLERS_PATH', BASE_PATH . CONTROLLERS_FOLDER);

-        define('HELPERS_PATH', BASE_PATH . HELPERS_FOLDER);

-        define('MODELS_PATH', BASE_PATH . MODELS_FOLDER);

-        define('SKINS_PATH', BASE_PATH . SKINS_FOLDER);

-        define('TEMPLATES_PATH', BASE_PATH . TEMPLATES_FOLDER);

-        define('PLUGINS_PATH', BASE_PATH . PLUGINS_FOLDER);

-        define('CACHE_PATH', BASE_PATH . CACHE_FOLDER);

+        define('CORE_PATH', BASE_PATH.CORE_FOLDER);

+        define('CONFIG_PATH', BASE_PATH.CONFIG_FOLDER);

+        define('CONTROLLERS_PATH', BASE_PATH.CONTROLLERS_FOLDER);

+        define('HELPERS_PATH', BASE_PATH.HELPERS_FOLDER);

+        define('MODELS_PATH', BASE_PATH.MODELS_FOLDER);

+        define('SKINS_PATH', BASE_PATH.SKINS_FOLDER);

+        define('TEMPLATES_PATH', BASE_PATH.TEMPLATES_FOLDER);

+        define('PLUGINS_PATH', BASE_PATH.PLUGINS_FOLDER);

+        define('CACHE_PATH', BASE_PATH.CACHE_FOLDER);

         //define('VENDOR_PATH', BASE_PATH . VENDOR_FOLDER);

     }