alxarafe / alixar

htdocs/Install/DocTemplates/websites/website_template-noimg/containers/manifest.json.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php // BEGIN PHP
 $websitekey = basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; 
 } // Load env if not already loaded
-require_once DOL_DOCUMENT_ROOT . '/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/website.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
 header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: application/manifest+json');

htdocs/Install/DocTemplates/websites/website_template-noimg/containers/master.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+    if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
     require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

Braces +3 added lines, -1 removed lines

@@ -2,6 +2,8 @@
 
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+    if (! defined('USEEXTERNALSERVER')) {
+        define('USEEXTERNALSERVER', 1);
+    }
     require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/Install/DocTemplates/websites/website_template-noimg/containers/wrapper.php

Spacing +33 added lines, -33 removed lines

@@ -8,7 +8,7 @@ 
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
     require_once './master.inc.php';
 } // Load master if not already loaded
-include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 $encoding = '';
 
@@ -28,7 +28,7 @@ 
 
 // If we have a hash public (hashp), we guess the original_file.
 if (!empty($hashp)) {
-    include_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     $ecmfile = new EcmFiles($db);
     $result = $ecmfile->fetch(0, '', '', '', $hashp);
     if ($result > 0) {
@@ -42,14 +42,14 @@ 
         if ($modulepart) {  // Not required, so often not defined, for link using public hashp parameter.
             if ($moduleparttocheck == $modulepart) {
                 // We remove first level of directory
-                $original_file = (($tmp[1] ? $tmp[1] . '/' : '') . $ecmfile->filename); // this is relative to module dir
+                $original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
                 //var_dump($original_file); exit;
             } else {
                 print 'Bad link. File is from another module part.';
             }
         } else {
             $modulepart = $moduleparttocheck;
-            $original_file = (($tmp[1] ? $tmp[1] . '/' : '') . $ecmfile->filename); // this is relative to module dir
+            $original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
         }
     } else {
         print "ErrorFileNotFoundWithSharedLink";
@@ -88,7 +88,7 @@ 
     header('Pragma: cache'); // This is to avoid having Pragma: no-cache
 }
 
-$refname = basename(dirname($original_file) . "/");
+$refname = basename(dirname($original_file)."/");
 
 // Get RSS news
 if ($rss) {
@@ -98,8 +98,8 @@ 
     $filename = $original_file;
     $dir_temp = $conf->website->dir_temp;
 
-    include_once DOL_DOCUMENT_ROOT . '/website/class/website.class.php';
-    include_once DOL_DOCUMENT_ROOT . '/website/class/websitepage.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
     $website = new Website($db);
     $websitepage = new WebsitePage($db);
 
@@ -115,26 +115,26 @@ 
     $eventarray = array();
     if (is_array($arrayofblogs)) {
         foreach ($arrayofblogs as $blog) {
-            $blog->fullpageurl = $website->virtualhost . '/' . $blog->pageurl . '.php';
+            $blog->fullpageurl = $website->virtualhost.'/'.$blog->pageurl.'.php';
             $eventarray[] = $blog;
         }
     }
 
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/xcal.lib.php";
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-    dol_syslog("build_exportfile Build export file format=" . $format . ", type=" . $type . ", cachedelay=" . $cachedelay . ", filename=" . $filename . ", filters size=" . count($filters), LOG_DEBUG);
+    dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
     // Clean parameters
     if (!$filename) {
         $extension = 'rss';
-        $filename = $format . '.' . $extension;
+        $filename = $format.'.'.$extension;
     }
 
     // Create dir and define output file (definitive and temporary)
     $result = dol_mkdir($dir_temp);
-    $outputfile = $dir_temp . '/' . $filename;
+    $outputfile = $dir_temp.'/'.$filename;
 
     $result = 0;
 
@@ -142,9 +142,9 @@ 
 
     if ($cachedelay) {
         $nowgmt = dol_now();
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
-            dol_syslog("build_exportfile file " . $outputfile . " is not older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . "). Build is canceled");
+            dol_syslog("build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
             $buildfile = false;
         }
     }
@@ -160,20 +160,20 @@ 
         dolChmod($outputfiletmp);
 
         // Write file
-        $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost . '/wrapper.php?rss=1' . ($l ? '&l=' . $l : ''), $l);
+        $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
         if ($result >= 0) {
             if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
                 $result = 1;
             } else {
-                $error = 'Failed to rename ' . $outputfiletmp . ' into ' . $outputfile;
-                dol_syslog("build_exportfile " . $error, LOG_ERR);
+                $error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
+                dol_syslog("build_exportfile ".$error, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 print $error;
                 exit(-1);
             }
         } else {
-            dol_syslog("build_exportfile build_xxxfile function fails to for format=" . $format . " outputfiletmp=" . $outputfile, LOG_ERR);
+            dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
             dol_delete_file($outputfiletmp, 0, 1);
             $langs->load("errors");
             print $langs->trans("ErrorFailToCreateFile", $outputfile);
@@ -195,26 +195,26 @@ 
         $outputencoding = 'UTF-8';
 
         if ($contenttype) {
-            header('Content-Type: ' . $contenttype . ($outputencoding ? '; charset=' . $outputencoding : ''));
+            header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
         }
         if ($attachment) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
         }
 
         // Ajout directives pour resoudre bug IE
         //header('Cache-Control: Public, must-revalidate');
         //header('Pragma: public');
         if ($cachedelay) {
-            header('Cache-Control: max-age=' . $cachedelay . ', private, must-revalidate');
+            header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
         } else {
             header('Cache-Control: private, must-revalidate');
         }
 
         // Clean parameters
-        $outputfile = $dir_temp . '/' . $filename;
+        $outputfile = $dir_temp.'/'.$filename;
         $result = readfile($outputfile);
         if (!$result) {
-            print 'File ' . $outputfile . ' was empty.';
+            print 'File '.$outputfile.' was empty.';
         }
 
         // header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
@@ -222,10 +222,10 @@ 
     }
 } elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
     // Get logos
-    readfile(dol_osencode($conf->mycompany->dir_output . "/" . $original_file));
+    readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 } else {
     // Find the subdirectory name as the reference
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, null, $refname);
     $accessallowed              = empty($check_access['accessallowed']) ? '' : $check_access['accessallowed'];
     $sqlprotectagainstexternals = empty($check_access['sqlprotectagainstexternals']) ? '' : $check_access['sqlprotectagainstexternals'];
@@ -252,24 +252,24 @@ 
 
     // This test if file exists should be useless. We keep it to find bug more easily
     if (!file_exists($fullpath_original_file_osencoded)) {
-        print "ErrorFileDoesNotExists: " . dol_escape_htmltag($original_file);
+        print "ErrorFileDoesNotExists: ".dol_escape_htmltag($original_file);
         exit;
     }
 
     // Permissions are ok and file found, so we return it
     //top_httphead($type);
-    header('Content-Type: ' . $type);
+    header('Content-Type: '.$type);
     header('Content-Description: File Transfer');
     if ($encoding) {
-        header('Content-Encoding: ' . $encoding);
+        header('Content-Encoding: '.$encoding);
     }
     // Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
     if ($attachment) {
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
     } else {
-        header('Content-Disposition: inline; filename="' . $filename . '"');
+        header('Content-Disposition: inline; filename="'.$filename.'"');
     }
-    header('Content-Length: ' . dol_filesize($fullpath_original_file));
+    header('Content-Length: '.dol_filesize($fullpath_original_file));
 
     readfile($fullpath_original_file_osencoded);
 }

htdocs/Install/DocTemplates/websites/website_template-noimg/containers/styles.css.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php // BEGIN PHP
 $websitekey = basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; 
 } // Load env if not already loaded
-require_once DOL_DOCUMENT_ROOT . '/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/website.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
-if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */
+if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */
     header('Cache-Control: max-age=3600, public, must-revalidate');
     header('Content-type: text/css');
 }

htdocs/Install/DocTemplates/websites/website_template-noimg/containers/javascript.js.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php // BEGIN PHP
 $websitekey = basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; 
 } // Load env if not already loaded
-require_once DOL_DOCUMENT_ROOT . '/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/website.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
 header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: application/javascript');

htdocs/Install/Install.php

Spacing +288 added lines, -288 removed lines

@@ -37,14 +37,14 @@ 
     private static function getDataDir(string $dir): string
     {
         $dir = trim($dir, ' /');
-        $fullDir = realpath(BASE_PATH . '/../dolibarr_htdocs/install/' . $dir);
+        $fullDir = realpath(BASE_PATH.'/../dolibarr_htdocs/install/'.$dir);
         if (!file_exists(BASE_PATH)) {
-            $fullDir = realpath(BASE_PATH . '/Install/' . $dir);
+            $fullDir = realpath(BASE_PATH.'/Install/'.$dir);
         }
         if ($fullDir === false) {
-            $fullDir = '/Install/' . $dir;
+            $fullDir = '/Install/'.$dir;
         }
-        return $fullDir . '/';
+        return $fullDir.'/';
     }
 
     private function syslog($message, $level = LOG_DEBUG)
@@ -97,7 +97,7 @@ 
             $dolibarr_main_url_root = $_SERVER["SCRIPT_URI"];
         } elseif (isset($_SERVER["SERVER_URL"]) && isset($_SERVER["DOCUMENT_URI"])) {
             // If defined (Ie: Apache with Caudium)
-            $dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
+            $dolibarr_main_url_root = $_SERVER["SERVER_URL"].$_SERVER["DOCUMENT_URI"];
         } else {
             // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
             $proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http';
@@ -108,7 +108,7 @@ 
             } else {
                 $serverport = 'localhost';
             }
-            $dolibarr_main_url_root = $proto . "://" . $serverport . $_SERVER["SCRIPT_NAME"];
+            $dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
         }
         // Clean proposed URL
         // We assume /install to be under /htdocs, so we get the parent path of the current URL
@@ -154,9 +154,9 @@ 
         $fp = @fopen("$mainfile", "w");
         if ($fp) {
             clearstatcache();
-            fwrite($fp, '<?php' . "\n");
+            fwrite($fp, '<?php'."\n");
             fwrite($fp, "// Wrapper to include main into htdocs\n");
-            fwrite($fp, "include_once '" . $main_dir . "/main.inc.php';\n");
+            fwrite($fp, "include_once '".$main_dir."/main.inc.php';\n");
             fclose($fp);
         }
     }
@@ -175,9 +175,9 @@ 
         $fp = @fopen("$masterfile", "w");
         if ($fp) {
             clearstatcache();
-            fwrite($fp, '<?php' . "\n");
+            fwrite($fp, '<?php'."\n");
             fwrite($fp, "// Wrapper to include master into htdocs\n");
-            fwrite($fp, "include_once '" . $main_dir . "/master.inc.php';\n");
+            fwrite($fp, "include_once '".$main_dir."/master.inc.php';\n");
             fclose($fp);
         }
     }
@@ -232,9 +232,9 @@ 
             if (@is_writable('/tmp')) {
                 define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
             } elseif (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) {
-                define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+                define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
             } elseif (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) {
-                define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+                define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
             } elseif (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) {
                 define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
             } elseif (@is_writable('../../')) {
@@ -292,53 +292,53 @@ 
         if ($fp) {
             clearstatcache();
 
-            fwrite($fp, '<?php' . "\n");
-            fwrite($fp, '//' . "\n");
-            fwrite($fp, '// File generated by Dolibarr installer ' . DOL_VERSION . ' on ' . Functions::dol_print_date(Functions::dol_now(), '') . "\n");
-            fwrite($fp, '//' . "\n");
-            fwrite($fp, '// Take a look at conf.php.example file for an example of ' . $conffile . ' file' . "\n");
-            fwrite($fp, '// and explanations for all possibles parameters.' . "\n");
-            fwrite($fp, '//' . "\n");
+            fwrite($fp, '<?php'."\n");
+            fwrite($fp, '//'."\n");
+            fwrite($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.Functions::dol_print_date(Functions::dol_now(), '')."\n");
+            fwrite($fp, '//'."\n");
+            fwrite($fp, '// Take a look at conf.php.example file for an example of '.$conffile.' file'."\n");
+            fwrite($fp, '// and explanations for all possibles parameters.'."\n");
+            fwrite($fp, '//'."\n");
 
-            fwrite($fp, '$dolibarr_main_url_root=\'' . Functions::dol_escape_php(trim($this->main_url), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_url_root=\''.Functions::dol_escape_php(trim($this->main_url), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_document_root="' . Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_dir))) . '";');
+            fwrite($fp, '$dolibarr_main_document_root="'.Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_dir))).'";');
             fwrite($fp, "\n");
 
-            fwrite($fp, $this->main_use_alt_dir . '$dolibarr_main_url_root_alt=\'' . Functions::dol_escape_php(trim("/" . $this->main_alt_dir_name), 1) . '\';');
+            fwrite($fp, $this->main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.Functions::dol_escape_php(trim("/".$this->main_alt_dir_name), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, $this->main_use_alt_dir . '$dolibarr_main_document_root_alt="' . Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_dir . "/" . $this->main_alt_dir_name))) . '";');
+            fwrite($fp, $this->main_use_alt_dir.'$dolibarr_main_document_root_alt="'.Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_dir."/".$this->main_alt_dir_name))).'";');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_data_root="' . Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_data_dir))) . '";');
+            fwrite($fp, '$dolibarr_main_data_root="'.Functions::dol_escape_php(Functions::dol_sanitizePathName(trim($this->main_data_dir))).'";');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_host=\'' . Functions::dol_escape_php(trim($this->db_host), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_host=\''.Functions::dol_escape_php(trim($this->db_host), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_port=\'' . ((int) $this->db_port) . '\';');
+            fwrite($fp, '$dolibarr_main_db_port=\''.((int) $this->db_port).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_name=\'' . Functions::dol_escape_php(trim($this->db_name), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_name=\''.Functions::dol_escape_php(trim($this->db_name), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_prefix=\'' . Functions::dol_escape_php(trim($this->db_prefix), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_prefix=\''.Functions::dol_escape_php(trim($this->db_prefix), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_user=\'' . Functions::dol_escape_php(trim($this->db_user), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_user=\''.Functions::dol_escape_php(trim($this->db_user), 1).'\';');
             fwrite($fp, "\n");
-            fwrite($fp, '$dolibarr_main_db_pass=\'' . Functions::dol_escape_php(trim($this->db_pass), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_pass=\''.Functions::dol_escape_php(trim($this->db_pass), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_type=\'' . Functions::dol_escape_php(trim($this->db_type), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_type=\''.Functions::dol_escape_php(trim($this->db_type), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_character_set=\'' . Functions::dol_escape_php(trim($this->db_character_set), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_character_set=\''.Functions::dol_escape_php(trim($this->db_character_set), 1).'\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_db_collation=\'' . Functions::dol_escape_php(trim($this->db_collation), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_db_collation=\''.Functions::dol_escape_php(trim($this->db_collation), 1).'\';');
             fwrite($fp, "\n");
 
             // Authentication
@@ -357,7 +357,7 @@ 
             fwrite($fp, '$dolibarr_main_prod=\'0\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_force_https=\'' . Functions::dol_escape_php($this->main_force_https, 1) . '\';');
+            fwrite($fp, '$dolibarr_main_force_https=\''.Functions::dol_escape_php($this->main_force_https, 1).'\';');
             fwrite($fp, "\n");
 
             fwrite($fp, '$dolibarr_main_restrict_os_commands=\'mariadb-dump, mariadb, mysqldump, mysql, pg_dump, pgrestore, clamdscan, clamscan.exe\';');
@@ -366,7 +366,7 @@ 
             fwrite($fp, '$dolibarr_nocsrfcheck=\'0\';');
             fwrite($fp, "\n");
 
-            fwrite($fp, '$dolibarr_main_instance_unique_id=\'' . Functions::dol_escape_php($key, 1) . '\';');
+            fwrite($fp, '$dolibarr_main_instance_unique_id=\''.Functions::dol_escape_php($key, 1).'\';');
             fwrite($fp, "\n");
 
             fwrite($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
@@ -380,67 +380,67 @@ 
                 fwrite($fp, '//');
                 $force_dolibarr_lib_FPDF_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_FPDF_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_FPDF_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_TCPDF_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_TCPDF_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_TCPDF_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_TCPDF_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_FPDI_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_FPDI_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_FPDI_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_FPDI_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_TCPDI_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_TCPDI_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_TCPDI_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_TCPDI_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_GEOIP_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_GEOIP_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_GEOIP_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_GEOIP_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_NUSOAP_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_NUSOAP_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_ODTPHP_PATH)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_ODTPHP_PATH = '';
             }
-            fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)) . '";');
+            fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {
                 fwrite($fp, '//');
                 $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';
             }
-            fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="' . Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) . '";');
+            fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="'.Functions::dol_escape_php(Functions::dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)).'";');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_js_CKEDITOR)) {
                 fwrite($fp, '//');
                 $force_dolibarr_js_CKEDITOR = '';
             }
-            fwrite($fp, '$dolibarr_js_CKEDITOR=\'' . Functions::dol_escape_php($force_dolibarr_js_CKEDITOR, 1) . '\';');
+            fwrite($fp, '$dolibarr_js_CKEDITOR=\''.Functions::dol_escape_php($force_dolibarr_js_CKEDITOR, 1).'\';');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_js_JQUERY)) {
                 fwrite($fp, '//');
                 $force_dolibarr_js_JQUERY = '';
             }
-            fwrite($fp, '$dolibarr_js_JQUERY=\'' . Functions::dol_escape_php($force_dolibarr_js_JQUERY, 1) . '\';');
+            fwrite($fp, '$dolibarr_js_JQUERY=\''.Functions::dol_escape_php($force_dolibarr_js_JQUERY, 1).'\';');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_js_JQUERY_UI)) {
                 fwrite($fp, '//');
                 $force_dolibarr_js_JQUERY_UI = '';
             }
-            fwrite($fp, '$dolibarr_js_JQUERY_UI=\'' . Functions::dol_escape_php($force_dolibarr_js_JQUERY_UI, 1) . '\';');
+            fwrite($fp, '$dolibarr_js_JQUERY_UI=\''.Functions::dol_escape_php($force_dolibarr_js_JQUERY_UI, 1).'\';');
             fwrite($fp, "\n");
 
             // Write params to overwrites default font path
@@ -449,17 +449,17 @@ 
                 fwrite($fp, '//');
                 $force_dolibarr_font_DOL_DEFAULT_TTF = '';
             }
-            fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\'' . Functions::dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1) . '\';');
+            fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.Functions::dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1).'\';');
             fwrite($fp, "\n");
             if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {
                 fwrite($fp, '//');
                 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';
             }
-            fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\'' . Functions::dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1) . '\';');
+            fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.Functions::dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1).'\';');
             fwrite($fp, "\n");
 
             // Other
-            fwrite($fp, '$dolibarr_main_distrib=\'' . Functions::dol_escape_php(trim($this->dolibarr_main_distrib), 1) . '\';');
+            fwrite($fp, '$dolibarr_main_distrib=\''.Functions::dol_escape_php(trim($this->dolibarr_main_distrib), 1).'\';');
             fwrite($fp, "\n");
 
             fclose($fp);
@@ -510,11 +510,11 @@ 
             $result['text'] = $this->lang->trans("ErrorPHPVersionTooLow", Admin::versiontostring($arrayphpminversionwarning));
         } else {
             $result['icon'] = 'ok';
-            $result['text'] = $this->lang->trans("PHPVersion") . " " . Admin::versiontostring(Admin::versionphparray());
+            $result['text'] = $this->lang->trans("PHPVersion")." ".Admin::versiontostring(Admin::versionphparray());
         }
 
         if (empty($force_install_nophpinfo)) {
-            $result['text'] .= ' (<a href="phpinfo.php" target="_blank" rel="noopener noreferrer">' . $this->lang->trans("MoreInformation") . '</a>)';
+            $result['text'] .= ' (<a href="phpinfo.php" target="_blank" rel="noopener noreferrer">'.$this->lang->trans("MoreInformation").'</a>)';
         }
 
         return $result;
@@ -540,7 +540,7 @@ 
         $result['ok'] = true;
         if (empty($_GET) || empty($_POST)) {   // We must keep $_GET and $_POST here
             $result['icon'] = 'warning';
-            $result['text'] = $this->lang->trans("PHPSupportPOSTGETKo") . ' (<a href="' . Functions::dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?testget=ok">' . $this->lang->trans("Recheck") . '</a>)';
+            $result['text'] = $this->lang->trans("PHPSupportPOSTGETKo").' (<a href="'.Functions::dol_escape_htmltag($_SERVER["PHP_SELF"]).'?testget=ok">'.$this->lang->trans("Recheck").'</a>)';
         } else {
             $result['icon'] = 'ok';
             $result['text'] = $this->lang->trans("PHPSupportPOSTGETOk");
@@ -751,22 +751,22 @@ 
 
         clearstatcache();
         if (is_readable($conffile) && filesize($conffile) > 8) {
-            $this->syslog("check: conf file '" . $conffile . "' already defined");
+            $this->syslog("check: conf file '".$conffile."' already defined");
             return false;
         }
 
         // If not, we create it
-        $this->syslog("check: we try to create conf file '" . $conffile . "'");
+        $this->syslog("check: we try to create conf file '".$conffile."'");
 
         // First we try by copying example
-        if (@copy($conffile . ".example", $conffile)) {
+        if (@copy($conffile.".example", $conffile)) {
             // Success
-            $this->syslog("check: successfully copied file " . $conffile . ".example into " . $conffile);
+            $this->syslog("check: successfully copied file ".$conffile.".example into ".$conffile);
             return false;
         }
 
         // If failed, we try to create an empty file
-        $this->syslog("check: failed to copy file " . $conffile . ".example into " . $conffile . ". We try to create it.", LOG_WARNING);
+        $this->syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
 
         $fp = @fopen($conffile, "w");
         if ($fp) {
@@ -776,7 +776,7 @@ 
             return false;
         }
 
-        $this->syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);
+        $this->syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
         $result = [];
         $result['ok'] = false;
         $result['icon'] = 'error';
@@ -808,8 +808,8 @@ 
 
     private function getMigrationScript()
     {
-        $dir = static::getDataDir('mysql/migration');   // We use mysql migration scripts whatever is database driver
-        $this->dolibarr_install_syslog("Scan sql files for migration files in " . $dir);
+        $dir = static::getDataDir('mysql/migration'); // We use mysql migration scripts whatever is database driver
+        $this->dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
 
         // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
         $migrationscript = [];
@@ -849,7 +849,7 @@ 
                 // If password is encoded, we decode it
                 // TODO: Pending
                 if (preg_match('/crypted:/i', $this->config->main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
-                    require_once $this->dolibarr_main_document_root . '/core/lib/security.lib.php';
+                    require_once $this->dolibarr_main_document_root.'/core/lib/security.lib.php';
                     if (preg_match('/crypted:/i', $this->config->main_db_pass)) {
                         $dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $this->config->main_db_pass); // We need to set this as it is used to know the password was initially encrypted
                         $this->config->main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
@@ -909,8 +909,8 @@ 
         }
 
         $button = $this->allowInstall
-            ? '<input class="button" type="submit" name="action" value="' . $this->lang->trans("Start") . '">'
-            : ($foundrecommandedchoice ? '<span class="warning">' : '') . $this->lang->trans("InstallNotAllowed") . ($foundrecommandedchoice ? '</span>' : '');
+            ? '<input class="button" type="submit" name="action" value="'.$this->lang->trans("Start").'">'
+            : ($foundrecommandedchoice ? '<span class="warning">' : '').$this->lang->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 
         // Show line of first install choice
         $choice = [
@@ -922,7 +922,7 @@ 
         ];
 
         if (!isset($this->config->main_db_host) || empty($this->config->main_db_host)) {
-            $choice['long'] .= '<br><div class="center"><div class="ok suggestedchoice">' . $this->lang->trans("InstallChoiceSuggested") . '</div></div>';
+            $choice['long'] .= '<br><div class="center"><div class="ok suggestedchoice">'.$this->lang->trans("InstallChoiceSuggested").'</div></div>';
         }
 
         $positionkey = ($foundrecommandedchoice ? 999 : 0);
@@ -964,7 +964,7 @@ 
             $newversionto = preg_replace('/(\.[0-9]+)$/i', '.*', $versionto);
             $newversionfrombis = '';
             if (Admin::versioncompare($dolibarrversiontoarray, $versionarray) < -2) {  // From x.y.z -> x.y.z+1
-                $newversionfrombis = ' ' . $this->lang->trans("or") . ' ' . $versionto;
+                $newversionfrombis = ' '.$this->lang->trans("or").' '.$versionto;
             }
 
             if ($ok) {
@@ -993,23 +993,23 @@ 
                     $foundrecommandedchoice = 2;
                 }
                 if ($disabled) {
-                    $button = '<span class="opacitymedium">' . $this->lang->trans("NotYetAvailable") . '</span>';
+                    $button = '<span class="opacitymedium">'.$this->lang->trans("NotYetAvailable").'</span>';
                 } else {
                     // TODO: Pending fix how to pass the version in an action
-                    $button = '<a class="button runupgrade" href="upgrade.php?action=upgrade' . ($count < count($migrationscript) ? '_' . $versionto : '') . '&selectlang=' . $this->selectLang . '&versionfrom=' . $versionfrom . '&versionto=' . $versionto . '">' . $this->lang->trans("Start") . '</a>';
+                    $button = '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&selectlang='.$this->selectLang.'&versionfrom='.$versionfrom.'&versionto='.$versionto.'">'.$this->lang->trans("Start").'</a>';
                 }
             }
 
             $choice = [
                 'selected' => $recommended_choice,
-                'short' => $this->lang->trans("Upgrade") . '<br>' . $newversionfrom . $newversionfrombis . ' -> ' . $newversionto,
+                'short' => $this->lang->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto,
                 'long' => $this->lang->trans("UpgradeDesc"),
                 'active' => $this->allowInstall,
                 'button' => $button,
             ];
 
             if ($recommended_choice) {
-                $choice['long'] .= '<br><div class="center"><div class="ok suggestedchoice">' . $this->lang->trans("InstallChoiceSuggested") . '</div>';
+                $choice['long'] .= '<br><div class="center"><div class="ok suggestedchoice">'.$this->lang->trans("InstallChoiceSuggested").'</div>';
                 if ($count < count($migarray)) {
                     $choice['long'] .= $this->lang->trans('MigrateIsDoneStepByStep', DOL_VERSION);
                 }
@@ -1046,21 +1046,21 @@ 
     private function getDbTypes()
     {
         $options = [];
-        $dir = realpath(BASE_PATH . '/../Core/DB/Engines');
+        $dir = realpath(BASE_PATH.'/../Core/DB/Engines');
         $handle = opendir($dir);
         if (is_resource($handle)) {
             while (($file = readdir($handle)) !== false) {
-                if (is_readable($dir . "/" . $file) && substr($file, -10) === 'Engine.php') {
+                if (is_readable($dir."/".$file) && substr($file, -10) === 'Engine.php') {
                     $shortName = substr($file, 0, -10);
                     $className = substr($file, 0, -4);
                     if ($className === 'Sqlite3Engine') {
                         continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
                     }
 
-                    $class = 'Alxarafe\\DB\\Engines\\' . $className;
+                    $class = 'Alxarafe\\DB\\Engines\\'.$className;
 
                     // Version min of database
-                    $note = '(' . $class::LABEL . ' >= ' . $class::VERSIONMIN . ')';
+                    $note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
                     if ($file == 'MySqliEngine.php') {
                         $oldname = 'mysqli';
@@ -1073,7 +1073,7 @@ 
 
                     $comment = '';
                     if (!function_exists($testfunction)) {
-                        $comment = ' - ' . $this->lang->trans("FunctionNotAvailableInThisPHP");
+                        $comment = ' - '.$this->lang->trans("FunctionNotAvailableInThisPHP");
                     }
 
                     $options[] = [
@@ -1176,7 +1176,7 @@ 
         if (!file_exists($conffile)) {
             $text = $this->lang->trans('YouMustCreateWithPermission', $conffile);
             $text .= '<br><br>';
-            $text .= '<span class="opacitymedium">' . $this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'] . '?testget=ok') . '</span>';
+            $text .= '<span class="opacitymedium">'.$this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</span>';
 
             $this->checks[] = [
                 'icon' => 'error',
@@ -1334,7 +1334,7 @@ 
         // Dolibarr pages directory
         $this->main_dir = Functions::GETPOST('main_dir') ? Functions::GETPOST('main_dir') : (empty($argv[3]) ? '' : $argv[3]);
         // Directory for generated documents (invoices, orders, ecm, etc...)
-        $this->main_data_dir = Functions::GETPOST('main_data_dir') ? Functions::GETPOST('main_data_dir') : (empty($argv[4]) ? ($this->main_dir . '/documents') : $argv[4]);
+        $this->main_data_dir = Functions::GETPOST('main_data_dir') ? Functions::GETPOST('main_data_dir') : (empty($argv[4]) ? ($this->main_dir.'/documents') : $argv[4]);
         // Dolibarr root URL
         $this->main_url = Functions::GETPOST('main_url') ? Functions::GETPOST('main_url') : (empty($argv[5]) ? '' : $argv[5]);
         // Database login information
@@ -1507,7 +1507,7 @@ 
             $this->main_url = substr($this->main_url, 0, Functions::dol_strlen($this->main_url) - 1);
         }
 
-        $enginesDir = realpath(BASE_PATH . '/../Core/DB/Engines') . '/';
+        $enginesDir = realpath(BASE_PATH.'/../Core/DB/Engines').'/';
         if (!Files::dol_is_dir($enginesDir)) {
             $errors[] = $this->lang->trans("ErrorBadValueForParameter", $this->main_dir, $this->lang->transnoentitiesnoconv("WebPagesDirectory"));
         }
@@ -1520,19 +1520,19 @@ 
             // If we require database or user creation we need to connect as root, so we need root login credentials
             if (!empty($this->db_create_database) && !$userroot) {
                 print '
-        <div class="error">' . $this->lang->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $this->db_name) . '</div>
+        <div class="error">' . $this->lang->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $this->db_name).'</div>
         ';
                 print '<br>';
-                print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                 print $this->lang->trans("ErrorGoBackAndCorrectParameters");
                 $error++;
             }
             if (!empty($this->db_create_user) && !$userroot) {
                 print '
-        <div class="error">' . $this->lang->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $this->db_user) . '</div>
+        <div class="error">' . $this->lang->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $this->db_user).'</div>
         ';
                 print '<br>';
-                print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                 print $this->lang->trans("ErrorGoBackAndCorrectParameters");
                 $error++;
             }
@@ -1552,16 +1552,16 @@ 
 
                 $db = Functions::getDoliDBInstance($this->db_type, $this->db_host, $userroot, $passroot, $databasefortest, (int) $this->db_port);
 
-                Functions::dol_syslog("databasefortest=" . $databasefortest . " connected=" . DB::$connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
+                Functions::dol_syslog("databasefortest=".$databasefortest." connected=".DB::$connected." database_selected=".$db->database_selected, LOG_DEBUG);
                 //print "databasefortest=".$databasefortest." connected=".DB::$connected." database_selected=".$db->database_selected;
 
                 if (empty($this->db_create_database) && DB::$connected && !$db->database_selected) {
                     print '
-        <div class="error">' . $this->lang->trans("ErrorConnectedButDatabaseNotFound", $this->db_name) . '</div>
+        <div class="error">' . $this->lang->trans("ErrorConnectedButDatabaseNotFound", $this->db_name).'</div>
         ';
                     print '<br>';
                     if (!DB::$connected) {
-                        print $this->lang->trans("IfDatabaseNotExistsGoBackAndUncheckCreate") . '<br><br>';
+                        print $this->lang->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
                     }
                     print $this->lang->trans("ErrorGoBackAndCorrectParameters");
                     $error++;
@@ -1569,15 +1569,15 @@ 
                     // Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
                     if ($db->error == "No such file or directory") {
                         print '
-        <div class="error">' . $this->lang->trans("ErrorToConnectToMysqlCheckInstance") . '</div>
+        <div class="error">' . $this->lang->trans("ErrorToConnectToMysqlCheckInstance").'</div>
         ';
                     } else {
                         print '
-        <div class="error">' . $db->error . '</div>
+        <div class="error">' . $db->error.'</div>
         ';
                     }
                     if (!DB::$connected) {
-                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                     }
                     //print '<a href="#" onClick="javascript: history.back();">';
                     print $this->lang->trans("ErrorGoBackAndCorrectParameters");
@@ -1592,10 +1592,10 @@ 
 
                 if ($db->error) {
                     print '
-        <div class="error">' . $db->error . '</div>
+        <div class="error">' . $db->error.'</div>
         ';
                     if (!DB::$connected) {
-                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
                     }
                     //print '<a href="#" onClick="javascript: history.back();">';
                     print $this->lang->trans("ErrorGoBackAndCorrectParameters");
@@ -1608,7 +1608,7 @@ 
                 print $db->lasterror();
             }
             if (isset($db) && !DB::$connected) {
-                print '<br>' . $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                print '<br>'.$this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
             }
             print $this->lang->trans("ErrorGoBackAndCorrectParameters");
             $error++;
@@ -1618,8 +1618,8 @@ 
             if (!empty($this->db_create_database)) {
                 $result = $db->select_db($this->db_name);
                 if ($result) {
-                    print '<div class="error">' . $this->lang->trans("ErrorDatabaseAlreadyExists", $this->db_name) . '</div>';
-                    print $this->lang->trans("IfDatabaseExistsGoBackAndCheckCreate") . '<br><br>';
+                    print '<div class="error">'.$this->lang->trans("ErrorDatabaseAlreadyExists", $this->db_name).'</div>';
+                    print $this->lang->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
                     print $this->lang->trans("ErrorGoBackAndCorrectParameters");
                     $error++;
                 }
@@ -1650,11 +1650,11 @@ 
                 $defaultDBSortingCollation = 'utf8_unicode_ci';
             }
 
-            print '<input type="hidden" name="dolibarr_main_db_character_set" value="' . $defaultCharacterSet . '">';
-            print '<input type="hidden" name="dolibarr_main_db_collation" value="' . $defaultDBSortingCollation . '">';
+            print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
+            print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
             $this->db_character_set = $defaultCharacterSet;
             $this->db_collation = $defaultDBSortingCollation;
-            $this->dolibarr_install_syslog("step1: db_character_set=" . $this->db_character_set . " db_collation=" . $this->db_collation);
+            $this->dolibarr_install_syslog("step1: db_character_set=".$this->db_character_set." db_collation=".$this->db_collation);
         }
 
         // Create config file
@@ -1663,24 +1663,24 @@ 
             if (is_array($_POST)) {
                 foreach ($_POST as $key => $value) {
                     if (!preg_match('/^db_pass/i', $key)) {
-                        $this->dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+                        $this->dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
                     }
                 }
             }
 
             // Show title of step
-            print '<h3><img class="valignmiddle inline-block paddingright" src="Resources/img/gear.svg" width="20" alt="Configuration"> ' . $this->lang->trans("ConfigurationFile") . '</h3>';
+            print '<h3><img class="valignmiddle inline-block paddingright" src="Resources/img/gear.svg" width="20" alt="Configuration"> '.$this->lang->trans("ConfigurationFile").'</h3>';
             print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
             // Check parameter main_dir
             if (!$error) {
                 if (!is_dir($this->main_dir)) {
-                    $this->dolibarr_install_syslog("step1: directory '" . $this->main_dir . "' is unavailable or can't be accessed");
+                    $this->dolibarr_install_syslog("step1: directory '".$this->main_dir."' is unavailable or can't be accessed");
 
                     print "<tr><td>";
-                    print $this->lang->trans("ErrorDirDoesNotExists", $this->main_dir) . '<br>';
-                    print $this->lang->trans("ErrorWrongValueForParameter", $this->lang->transnoentitiesnoconv("WebPagesDirectory")) . '<br>';
-                    print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                    print $this->lang->trans("ErrorDirDoesNotExists", $this->main_dir).'<br>';
+                    print $this->lang->trans("ErrorWrongValueForParameter", $this->lang->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
+                    print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                     print '</td><td>';
                     print $this->lang->trans("Error");
                     print "</td></tr>";
@@ -1689,7 +1689,7 @@ 
             }
 
             if (!$error) {
-                $this->dolibarr_install_syslog("step1: directory '" . $this->main_dir . "' exists");
+                $this->dolibarr_install_syslog("step1: directory '".$this->main_dir."' exists");
             }
 
 
@@ -1701,22 +1701,22 @@ 
                 }
 
                 if (!is_dir($this->main_data_dir)) {
-                    print "<tr><td>" . $this->lang->trans("ErrorDirDoesNotExists", $this->main_data_dir);
-                    print ' ' . $this->lang->trans("YouMustCreateItAndAllowServerToWrite");
+                    print "<tr><td>".$this->lang->trans("ErrorDirDoesNotExists", $this->main_data_dir);
+                    print ' '.$this->lang->trans("YouMustCreateItAndAllowServerToWrite");
                     print '</td><td>';
-                    print '<span class="error">' . $this->lang->trans("Error") . '</span>';
+                    print '<span class="error">'.$this->lang->trans("Error").'</span>';
                     print "</td></tr>";
-                    print '<tr><td colspan="2"><br>' . $this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'] . '?testget=ok') . '</td></tr>';
+                    print '<tr><td colspan="2"><br>'.$this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
                     $error++;
                 } else {
                     // Create .htaccess file in document directory
-                    $pathhtaccess = $this->main_data_dir . '/.htaccess';
+                    $pathhtaccess = $this->main_data_dir.'/.htaccess';
                     if (!file_exists($pathhtaccess)) {
-                        $this->dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $this->main_data_dir . "'");
+                        $this->dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$this->main_data_dir."'");
                         $handlehtaccess = @fopen($pathhtaccess, 'w');
                         if ($handlehtaccess) {
-                            fwrite($handlehtaccess, 'Order allow,deny' . "\n");
-                            fwrite($handlehtaccess, 'Deny from all' . "\n");
+                            fwrite($handlehtaccess, 'Order allow,deny'."\n");
+                            fwrite($handlehtaccess, 'Deny from all'."\n");
 
                             fclose($handlehtaccess);
                             $this->dolibarr_install_syslog("step1: .htaccess file created");
@@ -1725,45 +1725,45 @@ 
 
                     // Documents are stored above the web pages root to prevent being downloaded without authentication
                     $dir = [];
-                    $dir[] = $this->main_data_dir . "/mycompany";
-                    $dir[] = $this->main_data_dir . "/medias";
-                    $dir[] = $this->main_data_dir . "/users";
-                    $dir[] = $this->main_data_dir . "/facture";
-                    $dir[] = $this->main_data_dir . "/propale";
-                    $dir[] = $this->main_data_dir . "/ficheinter";
-                    $dir[] = $this->main_data_dir . "/produit";
-                    $dir[] = $this->main_data_dir . "/doctemplates";
+                    $dir[] = $this->main_data_dir."/mycompany";
+                    $dir[] = $this->main_data_dir."/medias";
+                    $dir[] = $this->main_data_dir."/users";
+                    $dir[] = $this->main_data_dir."/facture";
+                    $dir[] = $this->main_data_dir."/propale";
+                    $dir[] = $this->main_data_dir."/ficheinter";
+                    $dir[] = $this->main_data_dir."/produit";
+                    $dir[] = $this->main_data_dir."/doctemplates";
 
                     // Loop on each directory of dir [] to create them if they do not exist
                     $num = count($dir);
                     for ($i = 0; $i < $num; $i++) {
                         if (is_dir($dir[$i])) {
-                            $this->dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
+                            $this->dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
                         } else {
                             if (Functions::dol_mkdir($dir[$i]) < 0) {
                                 $this->errors[] = $this->lang->trans('ErrorFailToCreateDir', $dir[$i]);
                             } else {
-                                $this->dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
+                                $this->dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                             }
                         }
                     }
 
                     // Copy directory medias
-                    $srcroot = $this->main_dir . '/install/medias';
-                    $destroot = $this->main_data_dir . '/medias';
+                    $srcroot = $this->main_dir.'/install/medias';
+                    $destroot = $this->main_data_dir.'/medias';
                     Files::dolCopyDir($srcroot, $destroot, 0, 0);
 
                     if ($error) {
-                        print "<tr><td>" . $this->lang->trans("ErrorDirDoesNotExists", $this->main_data_dir);
-                        print ' ' . $this->lang->trans("YouMustCreateItAndAllowServerToWrite");
+                        print "<tr><td>".$this->lang->trans("ErrorDirDoesNotExists", $this->main_data_dir);
+                        print ' '.$this->lang->trans("YouMustCreateItAndAllowServerToWrite");
                         print '</td><td>';
-                        print '<span class="error">' . $this->lang->trans("Error") . '</span>';
+                        print '<span class="error">'.$this->lang->trans("Error").'</span>';
                         print "</td></tr>";
-                        print '<tr><td colspan="2"><br>' . $this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'] . '?testget=ok') . '</td></tr>';
+                        print '<tr><td colspan="2"><br>'.$this->lang->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
                     } else {
                         //ODT templates
-                        $srcroot = $this->main_dir . '/Install/DocTemplates';
-                        $destroot = $this->main_data_dir . '/doctemplates';
+                        $srcroot = $this->main_dir.'/Install/DocTemplates';
+                        $destroot = $this->main_data_dir.'/doctemplates';
                         $docs = [
                             'contracts' => 'contract',
                             'invoices' => 'invoice',
@@ -1779,9 +1779,9 @@ 
                             'users' => 'user',
                         ];
                         foreach ($docs as $cursordir => $cursorfile) {
-                            $src = $srcroot . '/' . $cursordir . '/template_' . $cursorfile . '.odt';
-                            $dirodt = $destroot . '/' . $cursordir;
-                            $dest = $dirodt . '/template_' . $cursorfile . '.odt';
+                            $src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+                            $dirodt = $destroot.'/'.$cursordir;
+                            $dest = $dirodt.'/template_'.$cursorfile.'.odt';
 
                             Functions::dol_mkdir($dirodt);
                             $result = Files::dol_copy($src, $dest, 0, 0);
@@ -1803,7 +1803,7 @@ 
                     // We must ignore errors as an existing old file may already exist and not be replaceable or
                     // the installer (like for ubuntu) may not have permission to create another file than conf.php.
                     // Also no other process must be able to read file or we expose the new file, so content with password.
-                    @Files::dol_copy($conffile, $conffile . '.old', '0400');
+                    @Files::dol_copy($conffile, $conffile.'.old', '0400');
                 }
 
                 $configFileError = $this->write_conf_file($conffile);
@@ -1813,7 +1813,7 @@ 
 
                     print "<tr><td>";
                     print $this->lang->trans("SaveConfigurationFile");
-                    print ' <strong>' . $conffile . '</strong>';
+                    print ' <strong>'.$conffile.'</strong>';
                     print "</td><td>";
                     print '<img src="Resources/img/ok.png" alt="Ok">';
                     print "</td></tr>";
@@ -1834,7 +1834,7 @@ 
 
                 // Create database user if requested
                 if (isset($this->db_create_user) && ($this->db_create_user == "1" || $this->db_create_user == "on")) {
-                    $this->dolibarr_install_syslog("step1: create database user: " . $this->config->main_db_user);
+                    $this->dolibarr_install_syslog("step1: create database user: ".$this->config->main_db_user);
 
                     //print $this->db_host." , ".$this->db_name." , ".$this->db_user." , ".$this->db_port;
                     $databasefortest = $this->db_name;
@@ -1851,7 +1851,7 @@ 
                     $db = Functions::getDoliDBInstance($this->db_type, $this->db_host, $userroot, $passroot, $databasefortest, (int) $this->db_port);
 
                     if ($db->error) {
-                        print '<div class="error">' . $db->error . '</div>';
+                        print '<div class="error">'.$db->error.'</div>';
                         $error++;
                     }
 
@@ -1862,10 +1862,10 @@ 
                             if (empty($dolibarr_main_db_pass)) {
                                 $this->dolibarr_install_syslog("step1: failed to create user, password is empty", LOG_ERR);
                                 print '<tr><td>';
-                                print $this->lang->trans("UserCreation") . ' : ';
+                                print $this->lang->trans("UserCreation").' : ';
                                 print $dolibarr_main_db_user;
                                 print '</td>';
-                                print '<td>' . $this->lang->trans("Error") . ": A password for database user is mandatory.</td></tr>";
+                                print '<td>'.$this->lang->trans("Error").": A password for database user is mandatory.</td></tr>";
                             } else {
                                 // Create user
                                 $result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
@@ -1879,7 +1879,7 @@ 
 
                                 if ($result > 0 && $resultbis > 0) {
                                     print '<tr><td>';
-                                    print $this->lang->trans("UserCreation") . ' : ';
+                                    print $this->lang->trans("UserCreation").' : ';
                                     print $dolibarr_main_db_user;
                                     print '</td>';
                                     print '<td><img src="Resources/img/ok.png" alt="Ok"></td></tr>';
@@ -1891,17 +1891,17 @@ 
                                     ) {
                                         $this->dolibarr_install_syslog("step1: user already exists");
                                         print '<tr><td>';
-                                        print $this->lang->trans("UserCreation") . ' : ';
+                                        print $this->lang->trans("UserCreation").' : ';
                                         print $dolibarr_main_db_user;
                                         print '</td>';
-                                        print '<td>' . $this->lang->trans("LoginAlreadyExists") . '</td></tr>';
+                                        print '<td>'.$this->lang->trans("LoginAlreadyExists").'</td></tr>';
                                     } else {
                                         $this->dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                                         print '<tr><td>';
-                                        print $this->lang->trans("UserCreation") . ' : ';
+                                        print $this->lang->trans("UserCreation").' : ';
                                         print $dolibarr_main_db_user;
                                         print '</td>';
-                                        print '<td>' . $this->lang->trans("Error") . ': ' . $db->errno() . ' ' . $db->error() . ($db->error ? '. ' . $db->error : '') . "</td></tr>";
+                                        print '<td>'.$this->lang->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
                                     }
                                 }
                             }
@@ -1910,7 +1910,7 @@ 
                             $db->close();
                         } else {
                             print '<tr><td>';
-                            print $this->lang->trans("UserCreation") . ' : ';
+                            print $this->lang->trans("UserCreation").' : ';
                             print $dolibarr_main_db_user;
                             print '</td>';
                             print '<td><img src="Resources/img/error.png" alt="Error"></td>';
@@ -1920,8 +1920,8 @@ 
                             print '<tr><td colspan="2"><br>';
                             print $this->lang->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
                             print '<br>';
-                            print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
-                            print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                            print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+                            print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                             print '</td></tr>';
 
                             $error++;
@@ -1931,14 +1931,14 @@ 
 
                 // If database creation was asked, we create it
                 if (!$error && (isset($this->db_create_database) && ($this->db_create_database == "1" || $this->db_create_database == "on"))) {
-                    $this->dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
+                    $this->dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
                     $newdb = Functions::getDoliDBInstance($this->db_type, $this->db_host, $userroot, $passroot, '', (int) $this->db_port);
                     //print 'eee'.$this->db_type." ".$this->db_host." ".$userroot." ".$passroot." ".$this->db_port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
                     if ($newdb->connected()) {
                         if ($newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user)) {
                             print '<tr><td>';
-                            print $this->lang->trans("DatabaseCreation") . " (" . $this->lang->trans("User") . " " . $userroot . ") : ";
+                            print $this->lang->trans("DatabaseCreation")." (".$this->lang->trans("User")." ".$userroot.") : ";
                             print $dolibarr_main_db_name;
                             print '</td>';
                             print '<td><img src="Resources/img/ok.png" alt="Ok"></td></tr>';
@@ -1946,7 +1946,7 @@ 
                             $newdb->select_db($dolibarr_main_db_name);
                             $check1 = $newdb->getDefaultCharacterSetDatabase();
                             $check2 = $newdb->getDefaultCollationDatabase();
-                            $this->dolibarr_install_syslog('step1: new database is using charset=' . $check1 . ' collation=' . $check2);
+                            $this->dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
 
                             // If values differs, we save conf file again
                             //if ($check1 != $dolibarr_main_db_character_set) $this->dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
@@ -1954,13 +1954,13 @@ 
                         } else {
                             // warning message
                             print '<tr><td colspan="2"><br>';
-                            print $this->lang->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name) . '<br>';
-                            print $newdb->lasterror() . '<br>';
+                            print $this->lang->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
+                            print $newdb->lasterror().'<br>';
                             print $this->lang->trans("IfDatabaseExistsGoBackAndCheckCreate");
                             print '<br>';
                             print '</td></tr>';
 
-                            $this->dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
+                            $this->dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
                             $error++;
                         }
 
@@ -1968,7 +1968,7 @@ 
                         DB::disconnect();
                     } else {
                         print '<tr><td>';
-                        print $this->lang->trans("DatabaseCreation") . " (" . $this->lang->trans("User") . " " . $userroot . ") : ";
+                        print $this->lang->trans("DatabaseCreation")." (".$this->lang->trans("User")." ".$userroot.") : ";
                         print $dolibarr_main_db_name;
                         print '</td>';
                         print '<td><img src="Resources/img/error.png" alt="Error"></td>';
@@ -1978,8 +1978,8 @@ 
                         print '<tr><td colspan="2"><br>';
                         print $this->lang->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
                         print '<br>';
-                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
-                        print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                        print $this->lang->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+                        print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                         print '</td></tr>';
 
                         $error++;
@@ -1988,7 +1988,7 @@ 
 
                 // We test access with dolibarr database user (not admin)
                 if (!$error) {
-                    $this->dolibarr_install_syslog("step1: connection type=" . $this->db_type . " on host=" . $this->db_host . " port=" . $this->db_port . " user=" . $this->db_user . " name=" . $this->db_name);
+                    $this->dolibarr_install_syslog("step1: connection type=".$this->db_type." on host=".$this->db_host." port=".$this->db_port." user=".$this->db_user." name=".$this->db_name);
                     //print "connection de type=".$this->db_type." sur host=".$this->db_host." port=".$this->db_port." user=".$this->db_user." name=".$this->db_name;
 
                     DB::disconnect();
@@ -2002,9 +2002,9 @@ 
                     );
 
                     if (DB::$connected) {
-                        $this->dolibarr_install_syslog("step1: connection to server by user " . $this->db_user . " ok");
+                        $this->dolibarr_install_syslog("step1: connection to server by user ".$this->db_user." ok");
                         print "<tr><td>";
-                        print $this->lang->trans("ServerConnection") . " (" . $this->lang->trans("User") . " " . $this->db_user . ") : ";
+                        print $this->lang->trans("ServerConnection")." (".$this->lang->trans("User")." ".$this->db_user.") : ";
                         print $this->db_host;
                         print "</td><td>";
                         print '<img src="Resources/img/ok.png" alt="Ok">';
@@ -2012,9 +2012,9 @@ 
 
                         // server access ok, basic access ok
                         if ($db->database_selected) {
-                            $this->dolibarr_install_syslog("step1: connection to database " . $this->db_name . " by user " . $this->db_user . " ok");
+                            $this->dolibarr_install_syslog("step1: connection to database ".$this->db_name." by user ".$this->db_user." ok");
                             print "<tr><td>";
-                            print $this->lang->trans("DatabaseConnection") . " (" . $this->lang->trans("User") . " " . $this->db_user . ") : ";
+                            print $this->lang->trans("DatabaseConnection")." (".$this->lang->trans("User")." ".$this->db_user.") : ";
                             print $this->db_name;
                             print "</td><td>";
                             print '<img src="Resources/img/ok.png" alt="Ok">';
@@ -2022,9 +2022,9 @@ 
 
                             $error = 0;
                         } else {
-                            $this->dolibarr_install_syslog("step1: connection to database " . $this->db_name . " by user " . $this->db_user . " failed", LOG_ERR);
+                            $this->dolibarr_install_syslog("step1: connection to database ".$this->db_name." by user ".$this->db_user." failed", LOG_ERR);
                             print "<tr><td>";
-                            print $this->lang->trans("DatabaseConnection") . " (" . $this->lang->trans("User") . " " . $this->db_user . ") : ";
+                            print $this->lang->trans("DatabaseConnection")." (".$this->lang->trans("User")." ".$this->db_user.") : ";
                             print $this->db_name;
                             print '</td><td>';
                             print '<img src="Resources/img/error.png" alt="Error">';
@@ -2032,17 +2032,17 @@ 
 
                             // warning message
                             print '<tr><td colspan="2"><br>';
-                            print $this->lang->trans('CheckThatDatabasenameIsCorrect', $this->config->main_db_name) . '<br>';
-                            print $this->lang->trans('IfAlreadyExistsCheckOption') . '<br>';
-                            print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                            print $this->lang->trans('CheckThatDatabasenameIsCorrect', $this->config->main_db_name).'<br>';
+                            print $this->lang->trans('IfAlreadyExistsCheckOption').'<br>';
+                            print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                             print '</td></tr>';
 
                             $error++;
                         }
                     } else {
-                        $this->dolibarr_install_syslog("step1: connection to server by user " . $this->db_user . " failed", LOG_ERR);
+                        $this->dolibarr_install_syslog("step1: connection to server by user ".$this->db_user." failed", LOG_ERR);
                         print "<tr><td>";
-                        print $this->lang->trans("ServerConnection") . " (" . $this->lang->trans("User") . " " . $this->db_user . ") : ";
+                        print $this->lang->trans("ServerConnection")." (".$this->lang->trans("User")." ".$this->db_user.") : ";
                         print $this->db_host;
                         print '</td><td>';
                         print '<img src="Resources/img/error.png" alt="Error">';
@@ -2051,8 +2051,8 @@ 
                         // warning message
                         print '<tr><td colspan="2"><br>';
                         print $this->lang->trans("ErrorConnection", $this->db_host, $this->db_name, $this->db_user);
-                        print $this->lang->trans('IfLoginDoesNotExistsCheckCreateUser') . '<br>';
-                        print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                        print $this->lang->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
+                        print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                         print '</td></tr>';
 
                         $error++;
@@ -2067,7 +2067,7 @@ 
         if ($error && isset($argv[1])) {
             $ret = 1;
         }
-        $this->dolibarr_install_syslog("Exit " . $ret);
+        $this->dolibarr_install_syslog("Exit ".$ret);
 
         $this->dolibarr_install_syslog("--- step1: end");
 
@@ -2096,9 +2096,9 @@ 
 // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
 
         $err = error_reporting();
-        error_reporting(0);      // Disable all errors
+        error_reporting(0); // Disable all errors
 //error_reporting(E_ALL);
-        @set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
+        @set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
         error_reporting($err);
 
         $action = Functions::GETPOST('action', 'aZ09') ? Functions::GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
@@ -2164,19 +2164,19 @@ 
             //$db = Functions::getDoliDBInstance($conf->main_db_type, $conf->main_db_host, $conf->main_db_user, $conf->main_db_pass, $conf->main_db_name, (int) $conf->main_db_port);
 
             if (DB::$connected) {
-                $this->connectionMessage = $this->lang->trans("ServerConnection") . ": " . $conf->main_db_host;
+                $this->connectionMessage = $this->lang->trans("ServerConnection").": ".$conf->main_db_host;
                 $this->connectionResult = '<img src="Resources/img/ok.png" alt="Ok">';
                 $ok = 1;
             } else {
-                $this->connectionMessage = 'Failed to connect to server: ' . $conf->main_db_host;
+                $this->connectionMessage = 'Failed to connect to server: '.$conf->main_db_host;
                 $this->connectionResult = '<img src="Resources/img/error.png" alt="Error">';
             }
 
             if ($ok) {
                 if ($db->database_selected) {
-                    $this->dolibarr_install_syslog("step2: successful connection to database: " . $conf->main_db_name);
+                    $this->dolibarr_install_syslog("step2: successful connection to database: ".$conf->main_db_name);
                 } else {
-                    $this->dolibarr_install_syslog("step2: failed connection to database :" . $conf->main_db_name, LOG_ERR);
+                    $this->dolibarr_install_syslog("step2: failed connection to database :".$conf->main_db_name, LOG_ERR);
                     $this->errors[] = [
                         'text' => 'Failed to select database '.$conf->main_db_name,
                         'icon'=>'<img src="Resources/img/error.png" alt="Error">',
@@ -2223,7 +2223,7 @@ 
 
                 $ok = 0;
                 $handle = opendir($dir);
-                $this->dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);
+                $this->dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
                 $tablefound = 0;
                 $tabledata = [];
                 if (is_resource($handle)) {
@@ -2241,7 +2241,7 @@ 
                 foreach ($tabledata as $file) {
                     $name = substr($file, 0, Functions::dol_strlen($file) - 4);
                     $buffer = '';
-                    $fp = fopen($dir . $file, "r");
+                    $fp = fopen($dir.$file, "r");
                     if ($fp) {
                         while (!feof($fp)) {
                             $buf = fgets($fp, 4096);
@@ -2270,7 +2270,7 @@ 
                         //print "<tr><td>Creation of table $name/td>";
                         $requestnb++;
 
-                        $this->dolibarr_install_syslog("step2: request: " . $buffer);
+                        $this->dolibarr_install_syslog("step2: request: ".$buffer);
                         $resql = $db->query($buffer, 0, 'dml');
                         if ($resql) {
                             // print "<td>OK request ==== $buffer</td></tr>";
@@ -2283,8 +2283,8 @@ 
                                 //print "<td>already existing</td></tr>";
                             } else {
                                 $this->errors[] = [
-                                    'text' => $this->lang->trans("CreateTableAndPrimaryKey", $name) .'<br>'.$this->lang->trans("Request") . ' ' . $requestnb . ': ' . $buffer . ' <br>Executed query : ' . $db->lastquery,
-                                    'icon'=>'<span class="error">' . $this->lang->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span>',
+                                    'text' => $this->lang->trans("CreateTableAndPrimaryKey", $name).'<br>'.$this->lang->trans("Request").' '.$requestnb.': '.$buffer.' <br>Executed query : '.$db->lastquery,
+                                    'icon'=>'<span class="error">'.$this->lang->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span>',
                                 ];
                                 $error++;
                             }
@@ -2292,10 +2292,10 @@ 
                     } else {
                         $this->errors[] = [
                             'text' =>$this->lang->trans("CreateTableAndPrimaryKey", $name),
-                            'icon'=>'<span class="error">' . $this->lang->trans("Error") . ' Failed to open file ' . $dir . $file . '</span>',
+                            'icon'=>'<span class="error">'.$this->lang->trans("Error").' Failed to open file '.$dir.$file.'</span>',
                         ];
                         $error++;
-                        $this->dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
+                        $this->dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
                     }
                 }
 
@@ -2312,7 +2312,7 @@ 
                         'text' =>$this->lang->trans("ErrorFailedToFindSomeFiles", $dir),
                         'icon'=>'<img src="Resources/img/error.png" alt="Error">',
                     ];
-                    $this->dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);
+                    $this->dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
                 }
             }
 
@@ -2329,7 +2329,7 @@ 
 
                 $okkeys = 0;
                 $handle = opendir($dir);
-                $this->dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);
+                $this->dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
                 $tablefound = 0;
                 $tabledata = [];
                 if (is_resource($handle)) {
@@ -2348,7 +2348,7 @@ 
                     $name = substr($file, 0, Functions::dol_strlen($file) - 4);
                     //print "<tr><td>Creation of table $name</td>";
                     $buffer = '';
-                    $fp = fopen($dir . $file, "r");
+                    $fp = fopen($dir.$file, "r");
                     if ($fp) {
                         while (!feof($fp)) {
                             $buf = fgets($fp, 4096);
@@ -2403,7 +2403,7 @@ 
                                 //print "<tr><td>Creation of keys and table index $name: '$buffer'</td>";
                                 $requestnb++;
 
-                                $this->dolibarr_install_syslog("step2: request: " . $buffer);
+                                $this->dolibarr_install_syslog("step2: request: ".$buffer);
                                 $resql = $db->query($buffer, 0, 'dml');
                                 if ($resql) {
                                     //print "<td>OK request ==== $buffer</td></tr>";
@@ -2419,27 +2419,27 @@ 
                                         //print "<td>Deja existante</td></tr>";
                                         $key_exists = 1;
                                     } else {
-                                        print "<tr><td>" . $this->lang->trans("CreateOtherKeysForTable", $name);
-                                        print "<br>\n" . $this->lang->trans("Request") . ' ' . $requestnb . ' : ' . $db->lastqueryerror();
+                                        print "<tr><td>".$this->lang->trans("CreateOtherKeysForTable", $name);
+                                        print "<br>\n".$this->lang->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
                                         print "\n</td>";
-                                        print '<td><span class="error">' . $this->lang->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span></td></tr>';
+                                        print '<td><span class="error">'.$this->lang->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
                                         $error++;
                                     }
                                 }
                             }
                         }
                     } else {
-                        print "<tr><td>" . $this->lang->trans("CreateOtherKeysForTable", $name);
+                        print "<tr><td>".$this->lang->trans("CreateOtherKeysForTable", $name);
                         print "</td>";
-                        print '<td><span class="error">' . $this->lang->trans("Error") . " Failed to open file " . $dir . $file . "</span></td></tr>";
+                        print '<td><span class="error">'.$this->lang->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
                         $error++;
-                        $this->dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
+                        $this->dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
                     }
                 }
 
                 if ($tablefound && $error == 0) {
                     print '<tr><td>';
-                    print $this->lang->trans("OtherKeysCreation") . '</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+                    print $this->lang->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                     $okkeys = 1;
                 }
             }
@@ -2465,15 +2465,15 @@ 
 
                 // Creation of data
                 $file = "functions.sql";
-                if (file_exists($dir . $file)) {
-                    $fp = fopen($dir . $file, "r");
-                    $this->dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);
+                if (file_exists($dir.$file)) {
+                    $fp = fopen($dir.$file, "r");
+                    $this->dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
                     if ($fp) {
                         $buffer = '';
                         while (!feof($fp)) {
                             $buf = fgets($fp, 4096);
                             if (substr($buf, 0, 2) != '--') {
-                                $buffer .= $buf . "§";
+                                $buffer .= $buf."§";
                             }
                         }
                         fclose($fp);
@@ -2489,8 +2489,8 @@ 
                             if ($conf->main_db_prefix != 'llx_') {
                                 $buffer = preg_replace('/llx_/i', $conf->main_db_prefix, $buffer);
                             }
-                            $this->dolibarr_install_syslog("step2: request: " . $buffer);
-                            print "<!-- Insert line : " . $buffer . "<br>-->\n";
+                            $this->dolibarr_install_syslog("step2: request: ".$buffer);
+                            print "<!-- Insert line : ".$buffer."<br>-->\n";
                             $resql = $db->query($buffer, 0, 'dml');
                             if ($resql) {
                                 $ok = 1;
@@ -2504,17 +2504,17 @@ 
                                 } else {
                                     $ok = 0;
 
-                                    print "<tr><td>" . $this->lang->trans("FunctionsCreation");
-                                    print "<br>\n" . $this->lang->trans("Request") . ' ' . $requestnb . ' : ' . $buffer;
+                                    print "<tr><td>".$this->lang->trans("FunctionsCreation");
+                                    print "<br>\n".$this->lang->trans("Request").' '.$requestnb.' : '.$buffer;
                                     print "\n</td>";
-                                    print '<td><span class="error">' . $this->lang->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span></td></tr>';
+                                    print '<td><span class="error">'.$this->lang->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
                                     $error++;
                                 }
                             }
                         }
                     }
 
-                    print "<tr><td>" . $this->lang->trans("FunctionsCreation") . "</td>";
+                    print "<tr><td>".$this->lang->trans("FunctionsCreation")."</td>";
                     if ($ok) {
                         print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                     } else {
@@ -2536,7 +2536,7 @@ 
 
                 // Insert data
                 $handle = opendir($dir);
-                $this->dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);
+                $this->dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
                 $tablefound = 0;
                 $tabledata = [];
                 if (is_resource($handle)) {
@@ -2547,7 +2547,7 @@ 
                             }
 
                             //print 'x'.$file.'-'.$createdata.'<br>';
-                            if (is_numeric($createdata) || preg_match('/' . preg_quote($createdata) . '/i', $file)) {
+                            if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file)) {
                                 $tablefound++;
                                 $tabledata[] = $file;
                             }
@@ -2560,8 +2560,8 @@ 
                 sort($tabledata);
                 foreach ($tabledata as $file) {
                     $name = substr($file, 0, Functions::dol_strlen($file) - 4);
-                    $fp = fopen($dir . $file, "r");
-                    $this->dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);
+                    $fp = fopen($dir.$file, "r");
+                    $this->dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
                     if ($fp) {
                         $arrayofrequests = [];
                         $linefound = 0;
@@ -2583,7 +2583,7 @@ 
                                 if (empty($arrayofrequests[$linegroup])) {
                                     $arrayofrequests[$linegroup] = $buffer;
                                 } else {
-                                    $arrayofrequests[$linegroup] .= " " . $buffer;
+                                    $arrayofrequests[$linegroup] .= " ".$buffer;
                                 }
 
                                 $linefound++;
@@ -2591,7 +2591,7 @@ 
                         }
                         fclose($fp);
 
-                        $this->dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");
+                        $this->dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
 
                         $okallfile = 1;
                         $db->begin();
@@ -2613,7 +2613,7 @@ 
                                 } else {
                                     $ok = 0;
                                     $okallfile = 0;
-                                    print '<span class="error">' . $this->lang->trans("ErrorSQL") . " : " . $db->lasterrno() . " - " . $db->lastqueryerror() . " - " . $db->lasterror() . "</span><br>";
+                                    print '<span class="error">'.$this->lang->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
                                 }
                             }
                         }
@@ -2626,7 +2626,7 @@ 
                     }
                 }
 
-                print "<tr><td>" . $this->lang->trans("ReferenceDataLoading") . "</td>";
+                print "<tr><td>".$this->lang->trans("ReferenceDataLoading")."</td>";
                 if ($ok) {
                     print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                 } else {
@@ -2644,7 +2644,7 @@ 
         if (!$ok && isset($argv[1])) {
             $ret = 1;
         }
-        $this->dolibarr_install_syslog("Exit " . $ret);
+        $this->dolibarr_install_syslog("Exit ".$ret);
 
         $this->dolibarr_install_syslog("- step2: end");
 
@@ -2653,23 +2653,23 @@ 
 
         $this->conf->file->instance_unique_id = (empty($conf->main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $conf->main_instance_unique_id); // Unique id of instance
 
-        $hash_unique_id = Security::dol_hash('dolibarr' . $this->conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+        $hash_unique_id = Security::dol_hash('dolibarr'.$this->conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
-        $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"' . ((Functions::getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked"') . '> ';
-        $out .= '<label for="dolibarrpingno">' . $this->lang->trans("MakeAnonymousPing") . '</label>';
+        $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"'.((Functions::getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked"').'> ';
+        $out .= '<label for="dolibarrpingno">'.$this->lang->trans("MakeAnonymousPing").'</label>';
 
         $out .= '<!-- Add js script to manage the uncheck of option to not send the ping -->';
         $out .= '<script type="text/javascript">';
         $out .= 'jQuery(document).ready(function(){';
-        $out .= '  document.cookie = "DOLINSTALLNOPING_' . $hash_unique_id . '=0; path=/"' . "\n";
+        $out .= '  document.cookie = "DOLINSTALLNOPING_'.$hash_unique_id.'=0; path=/"'."\n";
         $out .= '  jQuery("#dolibarrpingno").click(function() {';
         $out .= '    if (! $(this).is(\':checked\')) {';
         $out .= '      console.log("We uncheck anonymous ping");';
-        $out .= '      document.cookie = "DOLINSTALLNOPING_' . $hash_unique_id . '=1; path=/"' . "\n";
-        $out .= '    } else {' . "\n";
+        $out .= '      document.cookie = "DOLINSTALLNOPING_'.$hash_unique_id.'=1; path=/"'."\n";
+        $out .= '    } else {'."\n";
         $out .= '      console.log("We check anonymous ping");';
-        $out .= '      document.cookie = "DOLINSTALLNOPING_' . $hash_unique_id . '=0; path=/"' . "\n";
-        $out .= '    }' . "\n";
+        $out .= '      document.cookie = "DOLINSTALLNOPING_'.$hash_unique_id.'=0; path=/"'."\n";
+        $out .= '    }'."\n";
         $out .= '  });';
         $out .= '});';
         $out .= '</script>';
@@ -2717,7 +2717,7 @@ 
             exit;
         }
 
-        print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> ' . $this->lang->trans("DolibarrAdminLogin") . '</h3>';
+        print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$this->lang->trans("DolibarrAdminLogin").'</h3>';
 
 
         //$db = getDoliDBInstance($this->db_type, $this->db_host, $this->db_user, $this->db_pass, $this->db_name, (int) $this->db_port);
@@ -2726,12 +2726,12 @@ 
         $this->login_value = (Functions::GETPOSTISSET(" login")
                 ? Functions::GETPOST("login", 'alpha')
                 : (isset($force_install_dolibarrlogin) ?
-                    $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 &&
+                    $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 &&
             $force_install_dolibarrlogin !== null ? ' disabled' : '');
 
         if (isset($_GET["error"]) && $_GET["error"] == 1) {
             print '<br>';
-            print '<div class="error">' . $this->lang->trans("PasswordsMismatch") . '</div>';
+            print '<div class="error">'.$this->lang->trans("PasswordsMismatch").'</div>';
             $error = 0; // We show button
         }
 
@@ -2745,7 +2745,7 @@ 
 
         if (isset($_GET["error"]) && $_GET["error"] == 3) {
             print '<br>';
-            print '<div class="error">' . $this->lang->trans("PleaseTypeALogin") . '</div>';
+            print '<div class="error">'.$this->lang->trans("PleaseTypeALogin").'</div>';
             $error = 0; // We show button
         }
 
@@ -2753,7 +2753,7 @@ 
         if ($error && isset($argv[1])) {
             $ret = 1;
         }
-        $this->dolibarr_install_syslog("Exit " . $ret);
+        $this->dolibarr_install_syslog("Exit ".$ret);
 
         $this->dolibarr_install_syslog("--- step4: end");
 
@@ -2826,7 +2826,7 @@ 
         }
         */
 
-        $this->dolibarr_install_syslog("--- step5: entering step5.php page " . $versionfrom . " " . $versionto);
+        $this->dolibarr_install_syslog("--- step5: entering step5.php page ".$versionfrom." ".$versionto);
 
         $error = 0;
 
@@ -2875,7 +2875,7 @@ 
 
             // If password is encoded, we decode it
             if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) {
-                require_once BASE_PATH . '/core/lib/security.lib.php';
+                require_once BASE_PATH.'/core/lib/security.lib.php';
                 if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
                     $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
                     $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
@@ -2909,11 +2909,11 @@ 
             if ($action == "set") {
                 // Active module user
 
-                $this->dolibarr_install_syslog('step5: load module user ' . BASE_PATH . 'Modules/UserModule.php', LOG_INFO);
+                $this->dolibarr_install_syslog('step5: load module user '.BASE_PATH.'Modules/UserModule.php', LOG_INFO);
                 $objMod = new UserModule($db);
                 $result = $objMod->init();
                 if (!$result) {
-                    print "ERROR: failed to init module file = " . BASE_PATH . 'Modules/UserModule.php';
+                    print "ERROR: failed to init module file = ".BASE_PATH.'Modules/UserModule.php';
                 }
 
                 if (DB::$connected) {
@@ -2929,7 +2929,7 @@ 
 
                     // Set default encryption to yes, generate a salt and set default encryption algorithm (but only if there is no user yet into database)
                     $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
-                    $sql .= " FROM " . $config->main_db_prefix . "user as u";
+                    $sql .= " FROM ".$config->main_db_prefix."user as u";
                     $resql = $db->query($sql);
                     if ($resql) {
                         $numrows = $db->num_rows($resql);
@@ -2944,7 +2944,7 @@ 
                             }
                         }
 
-                        $this->dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = ' . Functions::getDolGlobalString('DATABASE_PWD_ENCRYPTED') . ' MAIN_SECURITY_HASH_ALGO = ' . Functions::getDolGlobalString('MAIN_SECURITY_HASH_ALGO'), LOG_INFO);
+                        $this->dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.Functions::getDolGlobalString('DATABASE_PWD_ENCRYPTED').' MAIN_SECURITY_HASH_ALGO = '.Functions::getDolGlobalString('MAIN_SECURITY_HASH_ALGO'), LOG_INFO);
                     }
 
                     // Create user used to create the admin user
@@ -2961,24 +2961,24 @@ 
                     $newuser->admin = 1;
                     $newuser->entity = 0;
 
-                    $conf->global->USER_MAIL_REQUIRED = 0;          // Force global option to be sure to create a new user with no email
-                    $conf->global->USER_PASSWORD_GENERATED = '';    // To not use any rule for password validation
+                    $conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+                    $conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
                     $result = $newuser->create($createuser, 1);
                     if ($result > 0) {
-                        print $this->lang->trans("AdminLoginCreatedSuccessfuly", $login) . "<br>";
+                        print $this->lang->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
                         $success = 1;
                     } else {
                         if ($result == -6) {    //login or email already exists
                             $this->dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
-                            print '<br><div class="warning">' . $newuser->error . "</div><br>";
+                            print '<br><div class="warning">'.$newuser->error."</div><br>";
                             $success = 1;
                         } else {
-                            $this->dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
-                            Functions::setEventMessages($this->lang->trans("FailedToCreateAdminLogin") . ' ' . $newuser->error, null, 'errors');
+                            $this->dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
+                            Functions::setEventMessages($this->lang->trans("FailedToCreateAdminLogin").' '.$newuser->error, null, 'errors');
                             //header("Location: step4.php?error=3&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));
-                            print '<br><div class="error">' . $this->lang->trans("FailedToCreateAdminLogin") . ': ' . $newuser->error . '</div><br><br>';
-                            print $this->lang->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';
+                            print '<br><div class="error">'.$this->lang->trans("FailedToCreateAdminLogin").': '.$newuser->error.'</div><br><br>';
+                            print $this->lang->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
                             $success = 1;
                         }
                     }
@@ -2986,8 +2986,8 @@ 
                     if ($success) {
                         // Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.
                         $db->begin();
-                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
-                        $resql = $db->query("INSERT INTO " . $config->main_db_prefix . "const(name, value, type, visible, note, entity) values(" . $db->encrypt('MAIN_VERSION_FIRST_INSTALL') . ", " . $db->encrypt($targetversion) . ", 'chaine', 0, 'Dolibarr version when first install', 0)");
+                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to '.$targetversion, LOG_DEBUG);
+                        $resql = $db->query("INSERT INTO ".$config->main_db_prefix."const(name, value, type, visible, note, entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version when first install', 0)");
                         if ($resql) {
                             $conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
                             $db->commit();
@@ -2998,12 +2998,12 @@ 
 
                         $db->begin();
 
-                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
-                        $resql = $db->query("DELETE FROM " . $config->main_db_prefix . "const WHERE " . $db->decrypt('name') . " = 'MAIN_VERSION_LAST_INSTALL'");
+                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
+                        $resql = $db->query("DELETE FROM ".$config->main_db_prefix."const WHERE ".$db->decrypt('name')." = 'MAIN_VERSION_LAST_INSTALL'");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
-                        $resql = $db->query("INSERT INTO " . $config->main_db_prefix . "const(name,value,type,visible,note,entity) values(" . $db->encrypt('MAIN_VERSION_LAST_INSTALL') . ", " . $db->encrypt($targetversion) . ", 'chaine', 0, 'Dolibarr version when last install', 0)");
+                        $resql = $db->query("INSERT INTO ".$config->main_db_prefix."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version when last install', 0)");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
@@ -3011,7 +3011,7 @@ 
 
                         if ($useforcedwizard) {
                             $this->dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
-                            $resql = $db->query("DELETE FROM " . $config->main_db_prefix . "const WHERE " . $db->decrypt('name') . " = 'MAIN_REMOVE_INSTALL_WARNING'");
+                            $resql = $db->query("DELETE FROM ".$config->main_db_prefix."const WHERE ".$db->decrypt('name')." = 'MAIN_REMOVE_INSTALL_WARNING'");
                             if (!$resql) {
                                 Functions::dol_print_error($db, 'Error in setup program');
                             }
@@ -3040,27 +3040,27 @@ 
                         $modNameLoaded = [];
 
                         // Search modules dirs
-                        $modulesdir[] = BASE_PATH . '/core/modules/';
+                        $modulesdir[] = BASE_PATH.'/core/modules/';
 
                         foreach ($modulesdir as $dir) {
                             // Load modules attributes in arrays (name, numero, orders) from dir directory
                             //print $dir."\n<br>";
-                            Functions::dol_syslog("Scan directory " . $dir . " for module descriptor files (modXXX.class.php)");
+                            Functions::dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");
                             $handle = @opendir($dir);
                             if (is_resource($handle)) {
                                 while (($file = readdir($handle)) !== false) {
-                                    if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, Functions::dol_strlen($file) - 10) == '.class.php') {
+                                    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, Functions::dol_strlen($file) - 10) == '.class.php') {
                                         $modName = substr($file, 0, Functions::dol_strlen($file) - 10);
                                         if ($modName) {
                                             if (!empty($modNameLoaded[$modName])) {   // In cache of already loaded modules ?
-                                                $mesg = "Error: Module " . $modName . " was found twice: Into " . $modNameLoaded[$modName] . " and " . $dir . ". You probably have an old file on your disk.<br>";
+                                                $mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
                                                 Functions::setEventMessages($mesg, null, 'warnings');
                                                 Functions::dol_syslog($mesg, LOG_ERR);
                                                 continue;
                                             }
 
                                             try {
-                                                $res = include_once $dir . $file; // A class already exists in a different file will send a non catchable fatal error.
+                                                $res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
                                                 if (class_exists($modName)) {
                                                     $objMod = new $modName($db);
                                                     $modNameLoaded[$modName] = $dir;
@@ -3069,7 +3069,7 @@ 
                                                     }
                                                 }
                                             } catch (Exception $e) {
-                                                Functions::dol_syslog("Failed to load " . $dir . $file . " " . $e->getMessage(), LOG_ERR);
+                                                Functions::dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
                                             }
                                         }
                                     }
@@ -3083,13 +3083,13 @@ 
                                 $modtoactivatenew = preg_replace('/\.class\.php$/i', '', $modtoactivate);
                                 //print $this->lang->trans("ActivateModule", $modtoactivatenew).'<br>';
 
-                                $file = $modtoactivatenew . '.class.php';
-                                $this->dolibarr_install_syslog('step5: activate module file=' . $file);
-                                $res = dol_include_once("/core/modules/" . $file);
+                                $file = $modtoactivatenew.'.class.php';
+                                $this->dolibarr_install_syslog('step5: activate module file='.$file);
+                                $res = dol_include_once("/core/modules/".$file);
 
                                 $res = activateModule($modtoactivatenew, 1);
                                 if (!empty($res['errors'])) {
-                                    print 'ERROR: failed to activateModule() file=' . $file;
+                                    print 'ERROR: failed to activateModule() file='.$file;
                                 }
                             }
                             //print '<br>';
@@ -3097,20 +3097,20 @@ 
 
                         // Now delete the flag that say installation is not complete
                         $this->dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
-                        $resql = $db->query("DELETE FROM " . $config->main_db_prefix . "const WHERE " . $db->decrypt('name') . " = 'MAIN_NOT_INSTALLED'");
+                        $resql = $db->query("DELETE FROM ".$config->main_db_prefix."const WHERE ".$db->decrypt('name')." = 'MAIN_NOT_INSTALLED'");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
 
                         // May fail if parameter already defined
                         $this->dolibarr_install_syslog('step5: set the default language');
-                        $resql = $db->query("INSERT INTO " . $config->main_db_prefix . "const(name,value,type,visible,note,entity) VALUES (" . $db->encrypt('MAIN_LANG_DEFAULT') . ", " . $db->encrypt($setuplang) . ", 'chaine', 0, 'Default language', 1)");
+                        $resql = $db->query("INSERT INTO ".$config->main_db_prefix."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT').", ".$db->encrypt($setuplang).", 'chaine', 0, 'Default language', 1)");
                         //if (! $resql) Functions::dol_print_error($db,'Error in setup program');
 
                         $db->commit();
                     }
                 } else {
-                    print $this->lang->trans("ErrorFailedToConnect") . "<br>";
+                    print $this->lang->trans("ErrorFailedToConnect")."<br>";
                 }
             } elseif (empty($action) || preg_match('/upgrade/i', $action)) {
                 // If upgrade
@@ -3135,28 +3135,28 @@ 
                     }
 
                     if ($tagdatabase) {
-                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
-                        $resql = $db->query("DELETE FROM " . $config->main_db_prefix . "const WHERE " . $db->decrypt('name') . " = 'MAIN_VERSION_LAST_UPGRADE'");
+                        $this->dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion);
+                        $resql = $db->query("DELETE FROM ".$config->main_db_prefix."const WHERE ".$db->decrypt('name')." = 'MAIN_VERSION_LAST_UPGRADE'");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
-                        $resql = $db->query("INSERT INTO " . $config->main_db_prefix . "const(name, value, type, visible, note, entity) VALUES (" . $db->encrypt('MAIN_VERSION_LAST_UPGRADE') . ", " . $db->encrypt($targetversion) . ", 'chaine', 0, 'Dolibarr version for last upgrade', 0)");
+                        $resql = $db->query("INSERT INTO ".$config->main_db_prefix."const(name, value, type, visible, note, entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version for last upgrade', 0)");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
                         $conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
                     } else {
-                        $this->dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
+                        $this->dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 
                         // Force the delete of the flag that say installation is not complete
                         $this->dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const after upgrade process (should not exists but this is a security)');
-                        $resql = $db->query("DELETE FROM " . $config->main_db_prefix . "const WHERE " . $db->decrypt('name') . " = 'MAIN_NOT_INSTALLED'");
+                        $resql = $db->query("DELETE FROM ".$config->main_db_prefix."const WHERE ".$db->decrypt('name')." = 'MAIN_NOT_INSTALLED'");
                         if (!$resql) {
                             Functions::dol_print_error($db, 'Error in setup program');
                         }
                     }
                 } else {
-                    print $this->lang->trans("ErrorFailedToConnect") . "<br>";
+                    print $this->lang->trans("ErrorFailedToConnect")."<br>";
                 }
             } else {
                 Functions::dol_print_error(null, 'step5.php: unknown choice of action');
@@ -3173,7 +3173,7 @@ 
             if ($success) {
                 if (!Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
                     // Install is finished (database is on same version than files)
-                    print '<br>' . $this->lang->trans("SystemIsInstalled") . "<br>";
+                    print '<br>'.$this->lang->trans("SystemIsInstalled")."<br>";
 
                     // Create install.lock file
                     // No need for the moment to create it automatically, creation by web assistant means permissions are given
@@ -3182,13 +3182,13 @@ 
                     if (!empty($force_install_lockinstall) || Functions::getDolGlobalString('MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE')) {
                         // Install is finished, we create the "install.lock" file, so install won't be possible anymore.
                         // TODO Upgrade will be still be possible if a file "upgrade.unlock" is present
-                        $lockfile = DOL_DATA_ROOT . '/install.lock';
+                        $lockfile = DOL_DATA_ROOT.'/install.lock';
                         $fp = @fopen($lockfile, "w");
                         if ($fp) {
                             if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
                                 $force_install_lockinstall = '444'; // For backward compatibility
                             }
-                            fwrite($fp, "This is a lock file to prevent use of install or upgrade pages (set with permission " . $force_install_lockinstall . ")");
+                            fwrite($fp, "This is a lock file to prevent use of install or upgrade pages (set with permission ".$force_install_lockinstall.")");
                             fclose($fp);
                             dolChmod($lockfile, $force_install_lockinstall);
 
@@ -3196,25 +3196,25 @@ 
                         }
                     }
                     if (empty($createlock)) {
-                        print '<div class="warning">' . $this->lang->trans("WarningRemoveInstallDir") . "</div>";
+                        print '<div class="warning">'.$this->lang->trans("WarningRemoveInstallDir")."</div>";
                     }
 
                     print "<br>";
 
-                    print $this->lang->trans("YouNeedToPersonalizeSetup") . "<br><br><br>";
+                    print $this->lang->trans("YouNeedToPersonalizeSetup")."<br><br><br>";
 
-                    print '<div class="center">&gt; <a href="../admin/index.php?mainmenu=home&leftmenu=setup' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-                    print '<span class="fas fa-external-link-alt"></span> ' . $this->lang->trans("GoToSetupArea");
+                    print '<div class="center">&gt; <a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
+                    print '<span class="fas fa-external-link-alt"></span> '.$this->lang->trans("GoToSetupArea");
                     print '</a></div><br>';
                 } else {
                     // If here MAIN_VERSION_LAST_UPGRADE is not empty
-                    print $this->lang->trans("VersionLastUpgrade") . ': <b><span class="ok">' . Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') . '</span></b><br>';
-                    print $this->lang->trans("VersionProgram") . ': <b><span class="ok">' . DOL_VERSION . '</span></b><br>';
-                    print $this->lang->trans("MigrationNotFinished") . '<br>';
+                    print $this->lang->trans("VersionLastUpgrade").': <b><span class="ok">'.Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
+                    print $this->lang->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
+                    print $this->lang->trans("MigrationNotFinished").'<br>';
                     print "<br>";
 
-                    print '<div class="center"><a href="' . $dolibarr_main_url_root . '/install/index.php">';
-                    print '<span class="fas fa-link-alt"></span> ' . $this->lang->trans("GoToUpgradePage");
+                    print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';
+                    print '<span class="fas fa-link-alt"></span> '.$this->lang->trans("GoToUpgradePage");
                     print '</a></div>';
                 }
             }
@@ -3223,20 +3223,20 @@ 
             if (!Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
                 // Upgrade is finished (database is on the same version than files)
                 print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration">';
-                print ' <span class="valignmiddle">' . $this->lang->trans("SystemIsUpgraded") . "</span><br>";
+                print ' <span class="valignmiddle">'.$this->lang->trans("SystemIsUpgraded")."</span><br>";
 
                 // Create install.lock file if it does not exists.
                 // Note: it should always exists. A better solution to allow upgrade will be to add an upgrade.unlock file
                 $createlock = 0;
                 if (!empty($force_install_lockinstall) || Functions::getDolGlobalString('MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE')) {
                     // Upgrade is finished, we modify the lock file
-                    $lockfile = DOL_DATA_ROOT . '/install.lock';
+                    $lockfile = DOL_DATA_ROOT.'/install.lock';
                     $fp = @fopen($lockfile, "w");
                     if ($fp) {
                         if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
                             $force_install_lockinstall = '444'; // For backward compatibility
                         }
-                        fwrite($fp, "This is a lock file to prevent use of install or upgrade pages (set with permission " . $force_install_lockinstall . ")");
+                        fwrite($fp, "This is a lock file to prevent use of install or upgrade pages (set with permission ".$force_install_lockinstall.")");
                         fclose($fp);
                         dolChmod($lockfile, $force_install_lockinstall);
 
@@ -3244,31 +3244,31 @@ 
                     }
                 }
                 if (empty($createlock)) {
-                    print '<br><div class="warning">' . $this->lang->trans("WarningRemoveInstallDir") . "</div>";
+                    print '<br><div class="warning">'.$this->lang->trans("WarningRemoveInstallDir")."</div>";
                 }
 
                 // Delete the upgrade.unlock file it it exists
-                $unlockupgradefile = DOL_DATA_ROOT . '/upgrade.unlock';
+                $unlockupgradefile = DOL_DATA_ROOT.'/upgrade.unlock';
                 dol_delete_file($unlockupgradefile, 0, 0, 0, null, false, 0);
 
                 print "<br>";
 
-                $morehtml = '<br><div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-                $morehtml .= '<span class="fas fa-link-alt"></span> ' . $this->lang->trans("GoToDolibarr") . '...';
+                $morehtml = '<br><div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
+                $morehtml .= '<span class="fas fa-link-alt"></span> '.$this->lang->trans("GoToDolibarr").'...';
                 $morehtml .= '</a></div><br>';
             } else {
                 // If here MAIN_VERSION_LAST_UPGRADE is not empty
-                print $this->lang->trans("VersionLastUpgrade") . ': <b><span class="ok">' . Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') . '</span></b><br>';
-                print $this->lang->trans("VersionProgram") . ': <b><span class="ok">' . DOL_VERSION . '</span></b>';
+                print $this->lang->trans("VersionLastUpgrade").': <b><span class="ok">'.Functions::getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
+                print $this->lang->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
 
                 print "<br>";
 
                 $morehtml = '<br><div class="center"><a href="../install/index.php">';
-                $morehtml .= '<span class="fas fa-link-alt"></span> ' . $this->lang->trans("GoToUpgradePage");
+                $morehtml .= '<span class="fas fa-link-alt"></span> '.$this->lang->trans("GoToUpgradePage");
                 $morehtml .= '</a></div>';
             }
         } else {
-            Functions::dol_print_error(null, 'step5.php: unknown choice of action=' . $action . ' in create lock file seaction');
+            Functions::dol_print_error(null, 'step5.php: unknown choice of action='.$action.' in create lock file seaction');
         }
 
 // Clear cache files
@@ -3278,7 +3278,7 @@ 
         if ($error && isset($argv[1])) {
             $ret = 1;
         }
-        $this->dolibarr_install_syslog("Exit " . $ret);
+        $this->dolibarr_install_syslog("Exit ".$ret);
 
         $this->dolibarr_install_syslog("--- step5: Dolibarr setup finished");