alxarafe / alixar

Base/AlixarController.php

Spacing +89 added lines, -89 removed lines

@@ -52,13 +52,13 @@ 
         // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
         $prefix = DolUtils::dol_getprefix('');
 
-        $this->sessionname = 'DOLSESSID_' . $prefix;
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $this->sessionname = 'DOLSESSID_'.$prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty($_COOKIE[$sessiontimeout])) {
             ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
         }
         session_name($this->sessionname);
-        session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+        session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
         // This create lock, released when session_write_close() or end of page.
         // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
         if (!defined('NOSESSION')) {
@@ -81,7 +81,7 @@ 
             Globals::$conf->browser->name = $tmp['browsername'];
             Globals::$conf->browser->os = $tmp['browseros'];
             Globals::$conf->browser->version = $tmp['browserversion'];
-            Globals::$conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
+            Globals::$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
             //var_dump(Globals::$conf->browser);
 
             if (Globals::$conf->browser->layout == 'phone') {
@@ -102,18 +102,18 @@ 
                         $newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
                     }
                 } else { // Check HTTPS environment variable (Apache/mod_ssl only)
-                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT) . $_SERVER["REQUEST_URI"];
+                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
                 }
             } else {
                 // Check HTTPS environment variable (Apache/mod_ssl only)
-                $newurl = Globals::$conf->file->main_force_https . $_SERVER["REQUEST_URI"];
+                $newurl = Globals::$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
             }
             // Start redirect
             if ($newurl) {
-                DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to " . $newurl);
+                DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
                 echo $newurl;
                 throw Exception('x');
-                header("Location: " . $newurl);
+                header("Location: ".$newurl);
                 exit;
             } else {
                 DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
@@ -138,29 +138,29 @@ 
 
         // Loading of additional presentation includes
         if (!defined('NOREQUIREHTML')) {
-            require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
+            require_once DOL_BASE_PATH.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
         }
         if (!defined('NOREQUIREAJAX') && Globals::$conf->use_javascript_ajax) {
-            require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+            require_once DOL_BASE_PATH.'/core/lib/ajax.lib.php'; // Need 22ko memory
         }
         // If install or upgrade process not done or not completely finished, we call the install page.
         if (!empty(Globals::$conf->global->MAIN_NOT_INSTALLED) || !empty(Globals::$conf->global->MAIN_NOT_UPGRADED)) {
             DolUtils::dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
             throw Exception('x');
-            header("Location: " . DOL_BASE_URI . "/install/index.php");
+            header("Location: ".DOL_BASE_URI."/install/index.php");
             exit;
         }
         // If an upgrade process is required, we call the install page.
         if ((!empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && (Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION)) || (empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty(Globals::$conf->global->MAIN_VERSION_LAST_INSTALL) && (Globals::$conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
             $versiontocompare = empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) ? Globals::$conf->global->MAIN_VERSION_LAST_INSTALL : Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE;
-            require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
+            require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
             $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
             $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
             $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
             if ($rescomp > 0) {   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-                DolUtils::dol_syslog("main.inc: database version " . $versiontocompare . " is lower than programs version " . DOL_VERSION . ". Redirect to install page.", LOG_WARNING);
+                DolUtils::dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
                 throw Exception('x');
-                header("Location: " . DOL_BASE_URI . "/install/index.php");
+                header("Location: ".DOL_BASE_URI."/install/index.php");
                 exit;
             }
         }
@@ -184,7 +184,7 @@ 
             }
             if ($_SERVER['REQUEST_METHOD'] === 'POST') {  // This test must be after loading $_SESSION['token'].
                 if (DolUtils::GETPOST('token', 'alpha') != $_SESSION['token']) {
-                    DolUtils::dol_syslog("Invalid token in " . $_SERVER['HTTP_REFERER'] . ", action=" . DolUtils::GETPOST('action', 'aZ09') . ", _POST['token']=" . DolUtils::GETPOST('token', 'alpha') . ", _SESSION['token']=" . $_SESSION['token'], LOG_WARNING);
+                    DolUtils::dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".DolUtils::GETPOST('action', 'aZ09').", _POST['token']=".DolUtils::GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
                     //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
                     unset($_POST);
                 }
@@ -217,7 +217,7 @@ 
         if (DolUtils::GETPOST('theme', 'alpha')) {
             Globals::$conf->theme = DolUtils::GETPOST('theme', 'alpha', 1);
             // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
 
@@ -267,7 +267,7 @@ 
         if (!empty(Globals::$conf->dol_use_jmobile) && in_array(Globals::$conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
             Globals::$conf->theme = 'eldy';
             // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
         if (!defined('NOREQUIRETRAN')) {
@@ -304,7 +304,7 @@ 
         }
 
 
-        DolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . ' - action=' . DolUtils::GETPOST('action', 'az09') . ', massaction=' . DolUtils::GETPOST('massaction', 'az09'));
+        DolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.DolUtils::GETPOST('action', 'az09').', massaction='.DolUtils::GETPOST('massaction', 'az09'));
         //Another call for easy debugg
         //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
         // Load main languages files
@@ -316,7 +316,7 @@ 
         // Define some constants used for style of arrays
         $bc = array(0 => 'class="impair"', 1 => 'class="pair"');
         $bcdd = array(0 => 'class="drag drop oddeven"', 1 => 'class="drag drop oddeven"');
-        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"');  // Used for tr to add new lines
+        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
         $bctag = array(0 => 'class="impair tagtr"', 1 => 'class="pair tagtr"');
 
         // Define messages variables
@@ -364,7 +364,7 @@ 
 // Load the menu manager (only if not already done)
             $file_menu = Globals::$conf->standard_menu;
             if (DolUtils::GETPOST('menu', 'alpha')) {
-                $file_menu = DolUtils::GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+                $file_menu = DolUtils::GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
             }
             if (!class_exists('MenuManager')) {
                 $menufound = 0;
@@ -376,7 +376,7 @@ 
                     }
                 }
                 if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
-                    DolUtils::dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
+                    DolUtils::dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
                     $file_menu = 'eldy_menu.php';
                     // include_once DOL_DOCUMENT_ROOT . "/core/menus/standard/" . $file_menu;
                 }
@@ -420,7 +420,7 @@ 
 
         // This is to make Dolibarr working with Plesk
         if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs') {
-            set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+            set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
         }
 
         // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
@@ -431,7 +431,7 @@ 
             $tmplist = explode(',', $tmpautoset[1]);
             $cookiearrayvalue = array();
             foreach ($tmplist as $tmpkey) {
-                $postkey = $tmpautoset[0] . '_' . $tmpkey;
+                $postkey = $tmpautoset[0].'_'.$tmpkey;
 //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
                 if (!empty($_POST[$postkey])) {
                     $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
@@ -492,8 +492,8 @@ 
             $inj += preg_match('/insert\s+into/i', $val);
             $inj += preg_match('/select\s+from/i', $val);
             $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-            $inj += preg_match('/user\s*\(/i', $val);      // avoid to use function user() that return current database login
-            $inj += preg_match('/information_schema/i', $val);    // avoid to use request that read information_schema database
+            $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+            $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
         }
         if ($type == 3) {
             $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
@@ -517,15 +517,15 @@ 
             $inj += preg_match('/<style/i', $val);
         }
         $inj += preg_match('/base[\s]+href/si', $val);
-        $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-        $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-        $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-        $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-        $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-        $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-        $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+        $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+        $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+        $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+        $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+        $inj += preg_match('/onloadstart\s*=/i', $val); // onload can be set on audio tag <audio onloadstart=alert(1)>
+        $inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like <img onclick = alert(1)>
+        $inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be on textarea
 //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);  // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 //if ($type == 1)
 //{
         $inj += preg_match('/javascript:/i', $val);
@@ -533,10 +533,10 @@ 
 //}
 // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
         if ($type == 1) {
-            $inj += preg_match('/"/i', $val);  // We refused " in GET parameters value
+            $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
         }
         if ($type == 2) {
-            $inj += preg_match('/[;"]/', $val);  // PHP_SELF is a file system path. It can contains spaces.
+            $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
         }
         return $inj;
     }
@@ -555,7 +555,7 @@ 
                 if ($this->analyseVarsForSqlAndScriptsInjection($key, $type) && $this->analyseVarsForSqlAndScriptsInjection($value, $type)) {
 //$var[$key] = $value;	// This is useless
                 } else {
-                    print 'Access refused by SQL/Script injection protection in main.inc.php (type=' . htmlentities($type) . ' key=' . htmlentities($key) . ' value=' . htmlentities($value) . ' page=' . htmlentities($_SERVER["REQUEST_URI"]) . ')';
+                    print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
                     exit;
                 }
             }
@@ -626,20 +626,20 @@ 
 
             // dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
             // If in demo mode, we check we go to home page through the public/demo/index.php page
-            if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI . '/index.php') {
+            if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI.'/index.php') {
                 // We ask index page
                 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-                    DolUtils::dol_syslog("Call index page from another url than demo page (call is done from page " . $_SERVER['HTTP_REFERER'] . ")");
+                    DolUtils::dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
                     $url = '';
-                    $url .= ($url ? '&' : '') . ($dol_hide_topmenu ? 'dol_hide_topmenu=' . $dol_hide_topmenu : '');
-                    $url .= ($url ? '&' : '') . ($dol_hide_leftmenu ? 'dol_hide_leftmenu=' . $dol_hide_leftmenu : '');
-                    $url .= ($url ? '&' : '') . ($dol_optimize_smallscreen ? 'dol_optimize_smallscreen=' . $dol_optimize_smallscreen : '');
-                    $url .= ($url ? '&' : '') . ($dol_no_mouse_hover ? 'dol_no_mouse_hover=' . $dol_no_mouse_hover : '');
-                    $url .= ($url ? '&' : '') . ($dol_use_jmobile ? 'dol_use_jmobile=' . $dol_use_jmobile : '');
-                    $url = DOL_BASE_URI . '/public/demo/index.php' . ($url ? '?' . $url : '');
+                    $url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+                    $url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+                    $url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+                    $url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+                    $url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+                    $url = DOL_BASE_URI.'/public/demo/index.php'.($url ? '?'.$url : '');
                     echo $url;
                     throw Exception('x');
-                    header("Location: " . $url);
+                    header("Location: ".$url);
                     exit;
                 }
             }
@@ -660,7 +660,7 @@ 
                     $test = false;
 
                     // Call trigger for the "security events" log
-                    Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login=' . DolUtils::GETPOST("username", "alpha", 2);
+                    Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login='.DolUtils::GETPOST("username", "alpha", 2);
 
                     // Call of triggers
                     //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
@@ -675,7 +675,7 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
@@ -760,7 +760,7 @@ 
                     }
 
                     // Call trigger for the "security events" log
-                    Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword") . ' - login=' . DolUtils::GETPOST("username", "alpha", 2);
+                    Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword").' - login='.DolUtils::GETPOST("username", "alpha", 2);
 
                     // Call of triggers
                     //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
@@ -774,7 +774,7 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
@@ -786,7 +786,7 @@ 
             // End test login / passwords
             if (!$login || (in_array('ldap', $this->authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
                 // No data to test login, so we show the login page
-                DolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
+                DolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
                 if (defined('NOREDIRECTBYMAINTOLOGIN')) {
                     return 'ERROR_NOT_LOGGED';
                 } else {
@@ -800,8 +800,8 @@ 
                 DolUtils::dol_syslog('User not found, connexion refused');
                 session_destroy();
                 session_name($this->sessionname);
-                session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                 if ($resultFetchUser == 0) {
                 // Load translation files required by page
@@ -809,7 +809,7 @@ 
 
                     $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                 }
                 if ($resultFetchUser < 0) {
                     $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -829,24 +829,24 @@ 
                 $action = '';
                 Globals::$hookManager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     $error++;
                 }
 
                 $paramsurl = array();
                 if (DolUtils::GETPOST('textbrowser', 'int')) {
-                    $paramsurl[] = 'textbrowser=' . DolUtils::GETPOST('textbrowser', 'int');
+                    $paramsurl[] = 'textbrowser='.DolUtils::GETPOST('textbrowser', 'int');
                 }
                 if (DolUtils::GETPOST('nojs', 'int')) {
-                    $paramsurl[] = 'nojs=' . DolUtils::GETPOST('nojs', 'int');
+                    $paramsurl[] = 'nojs='.DolUtils::GETPOST('nojs', 'int');
                 }
                 if (DolUtils::GETPOST('lang', 'aZ09')) {
-                    $paramsurl[] = 'lang=' . DolUtils::GETPOST('lang', 'aZ09');
+                    $paramsurl[] = 'lang='.DolUtils::GETPOST('lang', 'aZ09');
                 }
-                echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                 throw Exception('x');
-                header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                 exit;
             }
         }
@@ -855,16 +855,16 @@ 
             // We are already into an authenticated session
             $login = $_SESSION["dol_login"];
             $entity = $_SESSION["dol_entity"];
-            DolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=" . $login . " _SESSION['dol_entity']=" . $entity, LOG_DEBUG);
+            DolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
             $resultFetchUser = Globals::$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
             if ($resultFetchUser <= 0) {
                 // Account has been removed after login
-                DolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=" . $login, LOG_WARNING);
+                DolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
                 session_destroy();
                 session_name($this->sessionname);
-                session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                 if ($resultFetchUser == 0) {
                     // Load translation files required by page
@@ -872,7 +872,7 @@ 
 
                     $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                    Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                 }
                 if ($resultFetchUser < 0) {
                     $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -892,24 +892,24 @@ 
                 $action = '';
                 Globals::$hookManager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     $error++;
                 }
 
                 $paramsurl = array();
                 if (DolUtils::GETPOST('textbrowser', 'int')) {
-                    $paramsurl[] = 'textbrowser=' . DolUtils::GETPOST('textbrowser', 'int');
+                    $paramsurl[] = 'textbrowser='.DolUtils::GETPOST('textbrowser', 'int');
                 }
                 if (DolUtils::GETPOST('nojs', 'int')) {
-                    $paramsurl[] = 'nojs=' . DolUtils::GETPOST('nojs', 'int');
+                    $paramsurl[] = 'nojs='.DolUtils::GETPOST('nojs', 'int');
                 }
                 if (DolUtils::GETPOST('lang', 'aZ09')) {
-                    $paramsurl[] = 'lang=' . DolUtils::GETPOST('lang', 'aZ09');
+                    $paramsurl[] = 'lang='.DolUtils::GETPOST('lang', 'aZ09');
                 }
-                echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                 throw Exception('x');
-                header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                 exit;
             } else {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -918,30 +918,30 @@ 
 // Code for search criteria persistence.
                 if (!empty($_GET['save_lastsearch_values'])) {    // We must use $_GET here
                     $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-                    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
+                    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 // Clean $relativepathstring
                     if (constant('DOL_BASE_URI')) {
-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
                     }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 //var_dump($relativepathstring);
 // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-                    if (!empty($_SESSION['lastsearch_values_tmp_' . $relativepathstring])) {
-                        $_SESSION['lastsearch_values_' . $relativepathstring] = $_SESSION['lastsearch_values_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_values_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
+                        $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring])) {
-                        $_SESSION['lastsearch_contextpage_' . $relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring])) {
+                        $_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_page_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_page_tmp_' . $relativepathstring] > 1) {
-                        $_SESSION['lastsearch_page_' . $relativepathstring] = $_SESSION['lastsearch_page_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1) {
+                        $_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
                     }
-                    if (!empty($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] != Globals::$conf->liste_limit) {
-                        $_SESSION['lastsearch_limit_' . $relativepathstring] = $_SESSION['lastsearch_limit_tmp_' . $relativepathstring];
-                        unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+                    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != Globals::$conf->liste_limit) {
+                        $_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                        unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
                     }
                 }
 
@@ -990,14 +990,14 @@ 
                 $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
             }
 
-            DolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
+            DolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
             // Config::$dbEngine->begin();
             Config::$dbEngine->beginTransaction();
 
             Globals::$user->update_last_login_date();
 
-            $loginfo = 'TZ=' . $_SESSION["dol_tz"] . ';TZString=' . $_SESSION["dol_tz_string"] . ';Screen=' . $_SESSION["dol_screenwidth"] . 'x' . $_SESSION["dol_screenheight"];
+            $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
 
             // Call triggers for the "security events" log
             Globals::$user->trigger_mesg = $loginfo;
@@ -1013,7 +1013,7 @@ 
             $action = '';
             Globals::$hookManager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginfo' => $loginfo);
-            $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
             if ($reshook < 0) {
                 $error++;
             }
@@ -1034,7 +1034,7 @@ 
                 if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
                     echo $newpath;
                     throw Exception('x');
-                    header('Location: ' . $newpath);
+                    header('Location: '.$newpath);
                     exit;
                 }
             }
@@ -1065,7 +1065,7 @@ 
         if (empty(Globals::$conf->global->MAIN_FORCETHEME) && !empty(Globals::$user->conf->MAIN_THEME)) {
             Globals::$conf->theme = Globals::$user->conf->MAIN_THEME;
 // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
     }
 }

Base/User.php

Spacing +336 added lines, -336 removed lines

@@ -55,7 +55,7 @@ 
     public $skype;

     public $twitter;

     public $facebook;

-    public $job;   // job position

+    public $job; // job position

     public $signature;

 

     /**

@@ -64,7 +64,7 @@ 
     public $address;

     public $zip;

     public $town;

-    public $state_id;  // The state/department

+    public $state_id; // The state/department

     public $state_code;

     public $state;

     public $office_phone;

@@ -118,26 +118,26 @@ 
     public $datepreviouslogin;

     public $photo;

     public $lang;

-    public $rights;                        // Array of permissions user->rights->permx

-    public $all_permissions_are_loaded;    // All permission are loaded

-    public $nb_rights;              // Number of rights granted to the user

-    private $_tab_loaded = array();     // Cache array of already loaded permissions

-    public $conf;             // To store personal config

-    public $default_values;         // To store default values for user

-    public $lastsearch_values_tmp;  // To store current search criterias for user

-    public $lastsearch_values;      // To store last saved search criterias for user

-    public $users = array();  // To store all tree of users hierarchy

-    public $parentof;    // To store an array of all parents for all ids.

+    public $rights; // Array of permissions user->rights->permx

+    public $all_permissions_are_loaded; // All permission are loaded

+    public $nb_rights; // Number of rights granted to the user

+    private $_tab_loaded = array(); // Cache array of already loaded permissions

+    public $conf; // To store personal config

+    public $default_values; // To store default values for user

+    public $lastsearch_values_tmp; // To store current search criterias for user

+    public $lastsearch_values; // To store last saved search criterias for user

+    public $users = array(); // To store all tree of users hierarchy

+    public $parentof; // To store an array of all parents for all ids.

     private $cache_childids;

-    public $accountancy_code;   // Accountancy code in prevision of the complete accountancy module

-    public $thm;     // Average cost of employee - Used for valuation of time spent

-    public $tjm;     // Average cost of employee

-    public $salary;     // Monthly salary       - Denormalized value from llx_user_employment

-    public $salaryextra;    // Monthly salary extra - Denormalized value from llx_user_employment

-    public $weeklyhours;    // Weekly hours         - Denormalized value from llx_user_employment

-    public $color;      // Define background color for user in agenda

-    public $dateemployment;   // Define date of employment by company

-    public $dateemploymentend;  // Define date of employment end by company

+    public $accountancy_code; // Accountancy code in prevision of the complete accountancy module

+    public $thm; // Average cost of employee - Used for valuation of time spent

+    public $tjm; // Average cost of employee

+    public $salary; // Monthly salary       - Denormalized value from llx_user_employment

+    public $salaryextra; // Monthly salary extra - Denormalized value from llx_user_employment

+    public $weeklyhours; // Weekly hours         - Denormalized value from llx_user_employment

+    public $color; // Define background color for user in agenda

+    public $dateemployment; // Define date of employment by company

+    public $dateemploymentend; // Define date of employment end by company

     public $default_c_exp_tax_cat;

     public $default_range;

     public $fields = array(

@@ -212,37 +212,37 @@ 
         $sql .= " u.color,";

         $sql .= " u.dateemployment, u.dateemploymentend,";

         $sql .= " u.ref_int, u.ref_ext,";

-        $sql .= " u.default_range, u.default_c_exp_tax_cat,";   // Expense report default mode

+        $sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode

         $sql .= " c.code as country_code, c.label as country,";

         $sql .= " d.code_departement as state_code, d.nom as state";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON u.fk_country = c.rowid";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_departements as d ON u.fk_state = d.rowid";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";

 

         if ($entity < 0) {

             if ((empty(Globals::$conf->multicompany->enabled) || empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty(Globals::$user->entity))) {

-                $sql .= " WHERE u.entity IN (0," . Globals::$conf->entity . ")";

+                $sql .= " WHERE u.entity IN (0,".Globals::$conf->entity.")";

             } else {

-                $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

+                $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

             }

         } else {  // The fetch was forced on an entity

             if (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

+                $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

             } else {

-                $sql .= " WHERE u.entity IN (0, " . (($entity != '' && $entity >= 0) ? $entity : Globals::$conf->entity) . ")";   // search in entity provided in parameter

+                $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : Globals::$conf->entity).")"; // search in entity provided in parameter

             }

         }

 

         if ($sid) {    // permet une recherche du user par son SID ActiveDirectory ou Samba

 //$sql .= " AND (u.ldap_sid = '" . Config::$dbEngine->escape($sid) . "' OR u.login = '" . Config::$dbEngine->escape($login) . "') LIMIT 1";

-            $sql .= " AND (u.ldap_sid = '" . $sid . "' OR u.login = '" . Config::$dbEngine->escape($login) . "') LIMIT 1";

+            $sql .= " AND (u.ldap_sid = '".$sid."' OR u.login = '".Config::$dbEngine->escape($login)."') LIMIT 1";

         } else if ($login) {

 // $sql .= " AND u.login = '" . Config::$dbEngine->escape($login) . "'";

-            $sql .= " AND u.login = '" . $login . "'";

+            $sql .= " AND u.login = '".$login."'";

         } else {

-            $sql .= " AND u.rowid = " . $id;

+            $sql .= " AND u.rowid = ".$id;

         }

-        $sql .= " ORDER BY u.entity ASC";    // Avoid random result when there is 2 login in 2 different entities

+        $sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities

 

         $result = Config::$dbEngine->select($sql);

 // echo "<p>SQL in 2477 of User: '$sql'</p>";

@@ -328,7 +328,7 @@ 
                 $this->datelastlogin = $obj->datel;

                 $this->datepreviouslogin = $obj->datep;

 

-                $this->societe_id = $obj->fk_soc;  // deprecated

+                $this->societe_id = $obj->fk_soc; // deprecated

                 $this->contact_id = $obj->fk_socpeople; // deprecated

                 $this->socid = $obj->fk_soc;

                 $this->contactid = $obj->fk_socpeople;

@@ -349,7 +349,7 @@ 
                 $this->fetch_optionals();

             } else {

                 $this->error = "USERNOTFOUND";

-                DolUtils::dol_syslog(get_class($this) . "::fetch user not found", LOG_DEBUG);

+                DolUtils::dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);

                 return 0;

             }

         } else {

@@ -360,9 +360,9 @@ 
 // To get back the global configuration unique to the user

         if ($loadpersonalconf) {

 // Load user->conf for user

-            $sql = "SELECT param, value FROM " . MAIN_DB_PREFIX . "user_param";

-            $sql .= " WHERE fk_user = " . $this->id;

-            $sql .= " AND entity = " . Globals::$conf->entity;

+            $sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";

+            $sql .= " WHERE fk_user = ".$this->id;

+            $sql .= " AND entity = ".Globals::$conf->entity;

 //DolUtils::dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);

             $resql = Config::$dbEngine->select($sql);

             if (is_array($resql)) {

@@ -400,9 +400,9 @@ 
 // global $conf;

 // Load user->default_values for user. TODO Save this in memcached ?

         $sql = "SELECT rowid, entity, type, page, param, value";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "default_values";

-        $sql .= " WHERE entity IN (" . ($this->entity > 0 ? $this->entity . ", " : "") . Globals::$conf->entity . ")"; // Entity of user (if defined) + current entity

-        $sql .= " AND user_id IN (0" . ($this->id > 0 ? ", " . $this->id : "") . ")";       // User 0 (all) + me (if defined)

+        $sql .= " FROM ".MAIN_DB_PREFIX."default_values";

+        $sql .= " WHERE entity IN (".($this->entity > 0 ? $this->entity.", " : "").Globals::$conf->entity.")"; // Entity of user (if defined) + current entity

+        $sql .= " AND user_id IN (0".($this->id > 0 ? ", ".$this->id : "").")"; // User 0 (all) + me (if defined)

         $resql = Config::$dbEngine->select($sql);

         if (is_array($resql)) {

             foreach ($resql as $array) {

@@ -450,7 +450,7 @@ 
 

         $entity = (!empty($entity) ? $entity : Globals::$conf->entity);

 

-        DolUtils::dol_syslog(get_class($this) . "::addrights $rid, $allmodule, $allperms, $entity");

+        DolUtils::dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");

         $error = 0;

         $whereforadd = '';

 

@@ -460,9 +460,9 @@ 
 // Si on a demande ajout d'un droit en particulier, on recupere

 // les caracteristiques (module, perms et subperms) de ce droit.

             $sql = "SELECT module, perms, subperms";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE id = '" . Config::$dbEngine->escape($rid) . "'";

-            $sql .= " AND entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE id = '".Config::$dbEngine->escape($rid)."'";

+            $sql .= " AND entity = ".$entity;

 

             $result = Config::$dbEngine->query($sql);

             if ($result) {

@@ -476,7 +476,7 @@ 
             }

 

 // Where pour la liste des droits a ajouter

-            $whereforadd = "id=" . Config::$dbEngine->escape($rid);

+            $whereforadd = "id=".Config::$dbEngine->escape($rid);

 // Ajout des droits induits

             if (!empty($subperms)) {

                 $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";

@@ -493,9 +493,9 @@ 
                 if ($allmodule == 'allmodules') {

                     $whereforadd = 'allmodules';

                 } else {

-                    $whereforadd = "module='" . Config::$dbEngine->escape($allmodule) . "'";

+                    $whereforadd = "module='".Config::$dbEngine->escape($allmodule)."'";

                     if (!empty($allperms)) {

-                        $whereforadd .= " AND perms='" . Config::$dbEngine->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".Config::$dbEngine->escape($allperms)."'";

                     }

                 }

             }

@@ -505,10 +505,10 @@ 
         if (!empty($whereforadd)) {

 //print "$module-$perms-$subperms";

             $sql = "SELECT id";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE entity = ".$entity;

             if (!empty($whereforadd) && $whereforadd != 'allmodules') {

-                $sql .= " AND " . $whereforadd;

+                $sql .= " AND ".$whereforadd;

             }

 

             $result = Config::$dbEngine->query($sql);

@@ -519,10 +519,10 @@ 
                     $obj = Config::$dbEngine->fetch_object($result);

                     $nid = $obj->id;

 

-                    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id . " AND fk_id=" . $nid . " AND entity = " . $entity;

+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;

                     if (!Config::$dbEngine->query($sql))

                         $error++;

-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";

                     if (!Config::$dbEngine->query($sql))

                         $error++;

 

@@ -537,7 +537,7 @@ 
 

         if (!$error && !$notrigger) {

             Globals::$langs->load("other");

-            $this->context = array('audit' => Globals::$langs->trans("PermissionsAdd") . ($rid ? ' (id=' . $rid . ')' : ''));

+            $this->context = array('audit' => Globals::$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));

 

 // Call trigger

             $result = $this->call_trigger('USER_MODIFY', Globals::$user);

@@ -581,9 +581,9 @@ 
 // Si on a demande supression d'un droit en particulier, on recupere

 // les caracteristiques module, perms et subperms de ce droit.

             $sql = "SELECT module, perms, subperms";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE id = '" . Config::$dbEngine->escape($rid) . "'";

-            $sql .= " AND entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE id = '".Config::$dbEngine->escape($rid)."'";

+            $sql .= " AND entity = ".$entity;

 

             $result = Config::$dbEngine->query($sql);

             if ($result) {

@@ -597,7 +597,7 @@ 
             }

 

 // Where pour la liste des droits a supprimer

-            $wherefordel = "id=" . Config::$dbEngine->escape($rid);

+            $wherefordel = "id=".Config::$dbEngine->escape($rid);

 // Suppression des droits induits

             if ($subperms == 'lire' || $subperms == 'read') {

                 $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";

@@ -612,9 +612,9 @@ 
                 if ($allmodule == 'allmodules') {

                     $wherefordel = 'allmodules';

                 } else {

-                    $wherefordel = "module='" . Config::$dbEngine->escape($allmodule) . "'";

+                    $wherefordel = "module='".Config::$dbEngine->escape($allmodule)."'";

                     if (!empty($allperms)) {

-                        $whereforadd .= " AND perms='" . Config::$dbEngine->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".Config::$dbEngine->escape($allperms)."'";

                     }

                 }

             }

@@ -624,10 +624,10 @@ 
         if (!empty($wherefordel)) {

 //print "$module-$perms-$subperms";

             $sql = "SELECT id";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def";

-            $sql .= " WHERE entity = " . $entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";

+            $sql .= " WHERE entity = ".$entity;

             if (!empty($wherefordel) && $wherefordel != 'allmodules') {

-                $sql .= " AND " . $wherefordel;

+                $sql .= " AND ".$wherefordel;

             }

 

             $result = Config::$dbEngine->query($sql);

@@ -638,9 +638,9 @@ 
                     $obj = Config::$dbEngine->fetch_object($result);

                     $nid = $obj->id;

 

-                    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights";

-                    $sql .= " WHERE fk_user = " . $this->id . " AND fk_id=" . $nid;

-                    $sql .= " AND entity = " . $entity;

+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";

+                    $sql .= " WHERE fk_user = ".$this->id." AND fk_id=".$nid;

+                    $sql .= " AND entity = ".$entity;

                     if (!Config::$dbEngine->query($sql)) {

                         $error++;

                     }

@@ -655,7 +655,7 @@ 
 

         if (!$error && !$notrigger) {

             Globals::$langs->load("other");

-            $this->context = array('audit' => Globals::$langs->trans("PermissionsDelete") . ($rid ? ' (id=' . $rid . ')' : ''));

+            $this->context = array('audit' => Globals::$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));

 

 // Call trigger

             $result = $this->call_trigger('USER_MODIFY', Globals::$user);

@@ -682,7 +682,7 @@ 
      */

     function clearrights()

     {

-        DolUtils::dol_syslog(get_class($this) . "::clearrights reset user->rights");

+        DolUtils::dol_syslog(get_class($this)."::clearrights reset user->rights");

         $this->rights = '';

         $this->all_permissions_are_loaded = false;

         $this->_tab_loaded = array();

@@ -715,19 +715,19 @@ 
 // Recuperation des droits utilisateurs + recuperation des droits groupes

 // D'abord les droits utilisateurs

         $sql = "SELECT DISTINCT r.module, r.perms, r.subperms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user_rights as ur";

-        $sql .= ", " . MAIN_DB_PREFIX . "rights_def as r";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";

+        $sql .= ", ".MAIN_DB_PREFIX."rights_def as r";

         $sql .= " WHERE r.id = ur.fk_id";

         if (!empty(Globals::$conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

-            $sql .= " AND r.entity IN (0," . (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "") . Globals::$conf->entity . ")";

+            $sql .= " AND r.entity IN (0,".(!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").Globals::$conf->entity.")";

         } else {

-            $sql .= " AND ur.entity = " . Globals::$conf->entity;

+            $sql .= " AND ur.entity = ".Globals::$conf->entity;

         }

-        $sql .= " AND ur.fk_user= " . $this->id;

+        $sql .= " AND ur.fk_user= ".$this->id;

         $sql .= " AND r.perms IS NOT NULL";

         if ($moduletag) {

 // $sql .= " AND r.module = '" . Config::$dbEngine->escape($moduletag) . "'";

-            $sql .= " AND r.module = '" . $moduletag . "'";

+            $sql .= " AND r.module = '".$moduletag."'";

         }

 

         $resql = Config::$dbEngine->select($sql);

@@ -768,25 +768,25 @@ 
 

 // Maintenant les droits groupes

         $sql = "SELECT DISTINCT r.module, r.perms, r.subperms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup_rights as gr,";

-        $sql .= " " . MAIN_DB_PREFIX . "usergroup_user as gu,";

-        $sql .= " " . MAIN_DB_PREFIX . "rights_def as r";

+        $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";

+        $sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu,";

+        $sql .= " ".MAIN_DB_PREFIX."rights_def as r";

         $sql .= " WHERE r.id = gr.fk_id";

         if (!empty(Globals::$conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {

             if (!empty(Globals::$conf->multicompany->enabled) && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " AND gu.entity IN (0," . Globals::$conf->entity . ")";

+                $sql .= " AND gu.entity IN (0,".Globals::$conf->entity.")";

             } else {

-                $sql .= " AND r.entity = " . Globals::$conf->entity;

+                $sql .= " AND r.entity = ".Globals::$conf->entity;

             }

         } else {

-            $sql .= " AND gr.entity = " . Globals::$conf->entity;

-            $sql .= " AND r.entity = " . Globals::$conf->entity;

+            $sql .= " AND gr.entity = ".Globals::$conf->entity;

+            $sql .= " AND r.entity = ".Globals::$conf->entity;

         }

         $sql .= " AND gr.fk_usergroup = gu.fk_usergroup";

-        $sql .= " AND gu.fk_user = " . $this->id;

+        $sql .= " AND gu.fk_user = ".$this->id;

         $sql .= " AND r.perms IS NOT NULL";

         if ($moduletag) {

-            $sql .= " AND r.module = '" . $moduletag . "'";

+            $sql .= " AND r.module = '".$moduletag."'";

         }

 

         $resql = Config::$dbEngine->select($sql);

@@ -866,12 +866,12 @@ 
         Config::$dbEngine->begin();

 

 // Deactivate user

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-        $sql .= " SET statut = " . $this->statut;

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+        $sql .= " SET statut = ".$this->statut;

+        $sql .= " WHERE rowid = ".$this->id;

         $result = Config::$dbEngine->query($sql);

 

-        DolUtils::dol_syslog(get_class($this) . "::setstatus", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);

         if ($result) {

 // Call trigger

             $result = $this->call_trigger('USER_ENABLEDISABLE', Globals::$user);

@@ -908,7 +908,7 @@ 
         }

 

 // Get current categories

-        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

         $c = new Categorie(Config::$dbEngine);

         $existing = $c->containing($this->id, Categorie::TYPE_USER, 'id');

 

@@ -951,10 +951,10 @@ 
 

         $this->fetch($this->id);

 

-        DolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::delete", LOG_DEBUG);

 

 // Remove rights

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id;

 

         if (!$error && !Config::$dbEngine->query($sql)) {

             $error++;

@@ -962,7 +962,7 @@ 
         }

 

 // Remove group

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user WHERE fk_user  = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user  = ".$this->id;

         if (!$error && !Config::$dbEngine->query($sql)) {

             $error++;

             $this->error = Config::$dbEngine->lasterror();

@@ -970,7 +970,7 @@ 
 

 // If contact, remove link

         if ($this->contact_id) {

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "socpeople SET fk_user_creat = null WHERE rowid = " . $this->contact_id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;

             if (!$error && !Config::$dbEngine->query($sql)) {

                 $error++;

                 $this->error = Config::$dbEngine->lasterror();

@@ -982,14 +982,14 @@ 
             $result = $this->deleteExtraFields();

             if ($result < 0) {

                 $error++;

-                DolUtils::dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);

             }

         }

 

 // Remove user

         if (!$error) {

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . $this->id;

-            DolUtils::dol_syslog(get_class($this) . "::delete", LOG_DEBUG);

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;

+            DolUtils::dol_syslog(get_class($this)."::delete", LOG_DEBUG);

             if (!Config::$dbEngine->query($sql)) {

                 $error++;

                 $this->error = Config::$dbEngine->lasterror();

@@ -1030,7 +1030,7 @@ 
         if (!isset($this->entity)) {

             $this->entity = Globals::$conf->entity; // If not defined, we use default value

         }

-        DolUtils::dol_syslog(get_class($this) . "::create login=" . $this->login . ", user=" . (is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object(Globals::$user) ? Globals::$user->id : ''), LOG_DEBUG);

 

 // Check parameters

         if (!empty(Globals::$conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {

@@ -1049,11 +1049,11 @@ 
         $error = 0;

         Config::$dbEngine->begin();

 

-        $sql = "SELECT login FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE login ='" . Config::$dbEngine->escape($this->login) . "'";

-        $sql .= " AND entity IN (0," . Config::$dbEngine->escape(Globals::$conf->entity) . ")";

+        $sql = "SELECT login FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE login ='".Config::$dbEngine->escape($this->login)."'";

+        $sql .= " AND entity IN (0,".Config::$dbEngine->escape(Globals::$conf->entity).")";

 

-        DolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::create", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $num = Config::$dbEngine->num_rows($resql);

@@ -1061,17 +1061,17 @@ 
 

             if ($num) {

                 $this->error = 'ErrorLoginAlreadyExists';

-                DolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_WARNING);

+                DolUtils::dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);

                 Config::$dbEngine->rollback();

                 return -6;

             } else {

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user (datec,login,ldap_sid,entity)";

-                $sql .= " VALUES('" . Config::$dbEngine->idate($this->datec) . "','" . Config::$dbEngine->escape($this->login) . "','" . Config::$dbEngine->escape($this->ldap_sid) . "'," . Config::$dbEngine->escape($this->entity) . ")";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";

+                $sql .= " VALUES('".Config::$dbEngine->idate($this->datec)."','".Config::$dbEngine->escape($this->login)."','".Config::$dbEngine->escape($this->ldap_sid)."',".Config::$dbEngine->escape($this->entity).")";

                 $result = Config::$dbEngine->query($sql);

 

-                DolUtils::dol_syslog(get_class($this) . "::create", LOG_DEBUG);

+                DolUtils::dol_syslog(get_class($this)."::create", LOG_DEBUG);

                 if ($result) {

-                    $this->id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX . "user");

+                    $this->id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX."user");

 

 // Set default rights

                     if ($this->set_default_rights() < 0) {

@@ -1088,7 +1088,7 @@ 
                     }

 

                     if (!empty(Globals::$conf->global->STOCK_USERSTOCK_AUTOCREATE)) {

-                        require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

+                        require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

                         Globals::$langs->load("stocks");

                         $entrepot = new Entrepot(Config::$dbEngine);

                         $entrepot->libelle = Globals::$langs->trans("PersonalStock", $this->getFullName(Globals::$langs));

@@ -1112,7 +1112,7 @@ 
                         return $this->id;

                     } else {

 //$this->error=$interface->error;

-                        DolUtils::dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);

+                        DolUtils::dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);

                         Config::$dbEngine->rollback();

                         return -3;

                     }

@@ -1165,7 +1165,7 @@ 
         $this->employee = 0;

 

         if (empty($login)) {

-            $login = strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));

+            $login = strtolower(substr($contact->firstname, 0, 4)).strtolower(substr($contact->lastname, 0, 4));

         }

         $this->login = $login;

 

@@ -1174,15 +1174,15 @@ 
 // Cree et positionne $this->id

         $result = $this->create(Globals::$user);

         if ($result > 0) {

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET fk_socpeople=" . $contact->id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET fk_socpeople=".$contact->id;

             if ($contact->socid) {

-                $sql .= ", fk_soc=" . $contact->socid;

+                $sql .= ", fk_soc=".$contact->socid;

             }

-            $sql .= " WHERE rowid=" . $this->id;

+            $sql .= " WHERE rowid=".$this->id;

             $resql = Config::$dbEngine->query($sql);

 

-            DolUtils::dol_syslog(get_class($this) . "::create_from_contact", LOG_DEBUG);

+            DolUtils::dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);

             if ($resql) {

                 $this->context['createfromcontact'] = 'createfromcontact';

 

@@ -1205,7 +1205,7 @@ 
             }

         } else {

 // $this->error deja positionne

-            DolUtils::dol_syslog(get_class($this) . "::create_from_contact - 0");

+            DolUtils::dol_syslog(get_class($this)."::create_from_contact - 0");

 

             Config::$dbEngine->rollback();

             return $result;

@@ -1239,7 +1239,7 @@ 
         $this->country_id = $member->country_id;

 

         if (empty($login)) {

-            $login = strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));

+            $login = strtolower(substr($member->firstname, 0, 4)).strtolower(substr($member->lastname, 0, 4));

         }

         $this->login = $login;

 

@@ -1254,11 +1254,11 @@ 
             }

 

             if ($result > 0 && $member->fk_soc) { // If member is linked to a thirdparty

-                $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-                $sql .= " SET fk_soc=" . $member->fk_soc;

-                $sql .= " WHERE rowid=" . $this->id;

+                $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+                $sql .= " SET fk_soc=".$member->fk_soc;

+                $sql .= " WHERE rowid=".$this->id;

 

-                DolUtils::dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);

+                DolUtils::dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);

                 $resql = Config::$dbEngine->query($sql);

                 if ($resql) {

                     Config::$dbEngine->commit();

@@ -1293,9 +1293,9 @@ 
 // phpcs:enable

         global $conf;

 

-        $sql = "SELECT id FROM " . MAIN_DB_PREFIX . "rights_def";

+        $sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";

         $sql .= " WHERE bydefault = 1";

-        $sql .= " AND entity = " . Globals::$conf->entity;

+        $sql .= " AND entity = ".Globals::$conf->entity;

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -1312,10 +1312,10 @@ 
         $i = 0;

         while ($i < $num) {

 

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";

             $result = Config::$dbEngine->query($sql);

 

-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";

             $result = Config::$dbEngine->query($sql);

             if (!$result) {

                 return -1;

@@ -1343,7 +1343,7 @@ 
         $nbrowsaffected = 0;

         $error = 0;

 

-        DolUtils::dol_syslog(get_class($this) . "::update notrigger=" . $notrigger . ", nosyncmember=" . $nosyncmember . ", nosyncmemberpass=" . $nosyncmemberpass);

+        DolUtils::dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);

 

 // Clean parameters

         $this->lastname = trim($this->lastname);

@@ -1371,7 +1371,7 @@ 
         $this->job = trim($this->job);

         $this->signature = trim($this->signature);

         $this->note = trim($this->note);

-        $this->openid = trim(empty($this->openid) ? '' : $this->openid);    // Avoid warning

+        $this->openid = trim(empty($this->openid) ? '' : $this->openid); // Avoid warning

         $this->admin = $this->admin ? $this->admin : 0;

         $this->address = empty($this->address) ? '' : $this->address;

         $this->zip = empty($this->zip) ? '' : $this->zip;

@@ -1396,59 +1396,59 @@ 
         Config::$dbEngine->begin();

 

 // Update datas

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";

-        $sql .= " lastname = '" . Config::$dbEngine->escape($this->lastname) . "'";

-        $sql .= ", firstname = '" . Config::$dbEngine->escape($this->firstname) . "'";

-        $sql .= ", employee = " . $this->employee;

-        $sql .= ", login = '" . Config::$dbEngine->escape($this->login) . "'";

-        $sql .= ", api_key = " . ($this->api_key ? "'" . Config::$dbEngine->escape($this->api_key) . "'" : "null");

-        $sql .= ", gender = " . ($this->gender != -1 ? "'" . Config::$dbEngine->escape($this->gender) . "'" : "null"); // 'man' or 'woman'

-        $sql .= ", birth=" . (strval($this->birth) != '' ? "'" . Config::$dbEngine->idate($this->birth) . "'" : 'null');

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";

+        $sql .= " lastname = '".Config::$dbEngine->escape($this->lastname)."'";

+        $sql .= ", firstname = '".Config::$dbEngine->escape($this->firstname)."'";

+        $sql .= ", employee = ".$this->employee;

+        $sql .= ", login = '".Config::$dbEngine->escape($this->login)."'";

+        $sql .= ", api_key = ".($this->api_key ? "'".Config::$dbEngine->escape($this->api_key)."'" : "null");

+        $sql .= ", gender = ".($this->gender != -1 ? "'".Config::$dbEngine->escape($this->gender)."'" : "null"); // 'man' or 'woman'

+        $sql .= ", birth=".(strval($this->birth) != '' ? "'".Config::$dbEngine->idate($this->birth)."'" : 'null');

         if (!empty(Globals::$user->admin)) {

-            $sql .= ", admin = " . $this->admin; // admin flag can be set/unset only by an admin user

-        }

-        $sql .= ", address = '" . Config::$dbEngine->escape($this->address) . "'";

-        $sql .= ", zip = '" . Config::$dbEngine->escape($this->zip) . "'";

-        $sql .= ", town = '" . Config::$dbEngine->escape($this->town) . "'";

-        $sql .= ", fk_state = " . ((!empty($this->state_id) && $this->state_id > 0) ? "'" . Config::$dbEngine->escape($this->state_id) . "'" : "null");

-        $sql .= ", fk_country = " . ((!empty($this->country_id) && $this->country_id > 0) ? "'" . Config::$dbEngine->escape($this->country_id) . "'" : "null");

-        $sql .= ", office_phone = '" . Config::$dbEngine->escape($this->office_phone) . "'";

-        $sql .= ", office_fax = '" . Config::$dbEngine->escape($this->office_fax) . "'";

-        $sql .= ", user_mobile = '" . Config::$dbEngine->escape($this->user_mobile) . "'";

-        $sql .= ", email = '" . Config::$dbEngine->escape($this->email) . "'";

-        $sql .= ", skype = '" . Config::$dbEngine->escape($this->skype) . "'";

-        $sql .= ", twitter = '" . Config::$dbEngine->escape($this->twitter) . "'";

-        $sql .= ", facebook = '" . Config::$dbEngine->escape($this->facebook) . "'";

-        $sql .= ", job = '" . Config::$dbEngine->escape($this->job) . "'";

-        $sql .= ", signature = '" . Config::$dbEngine->escape($this->signature) . "'";

-        $sql .= ", accountancy_code = '" . Config::$dbEngine->escape($this->accountancy_code) . "'";

-        $sql .= ", color = '" . Config::$dbEngine->escape($this->color) . "'";

-        $sql .= ", dateemployment=" . (strval($this->dateemployment) != '' ? "'" . Config::$dbEngine->idate($this->dateemployment) . "'" : 'null');

-        $sql .= ", dateemploymentend=" . (strval($this->dateemploymentend) != '' ? "'" . Config::$dbEngine->idate($this->dateemploymentend) . "'" : 'null');

-        $sql .= ", note = '" . Config::$dbEngine->escape($this->note) . "'";

-        $sql .= ", photo = " . ($this->photo ? "'" . Config::$dbEngine->escape($this->photo) . "'" : "null");

-        $sql .= ", openid = " . ($this->openid ? "'" . Config::$dbEngine->escape($this->openid) . "'" : "null");

-        $sql .= ", fk_user = " . ($this->fk_user > 0 ? "'" . Config::$dbEngine->escape($this->fk_user) . "'" : "null");

+            $sql .= ", admin = ".$this->admin; // admin flag can be set/unset only by an admin user

+        }

+        $sql .= ", address = '".Config::$dbEngine->escape($this->address)."'";

+        $sql .= ", zip = '".Config::$dbEngine->escape($this->zip)."'";

+        $sql .= ", town = '".Config::$dbEngine->escape($this->town)."'";

+        $sql .= ", fk_state = ".((!empty($this->state_id) && $this->state_id > 0) ? "'".Config::$dbEngine->escape($this->state_id)."'" : "null");

+        $sql .= ", fk_country = ".((!empty($this->country_id) && $this->country_id > 0) ? "'".Config::$dbEngine->escape($this->country_id)."'" : "null");

+        $sql .= ", office_phone = '".Config::$dbEngine->escape($this->office_phone)."'";

+        $sql .= ", office_fax = '".Config::$dbEngine->escape($this->office_fax)."'";

+        $sql .= ", user_mobile = '".Config::$dbEngine->escape($this->user_mobile)."'";

+        $sql .= ", email = '".Config::$dbEngine->escape($this->email)."'";

+        $sql .= ", skype = '".Config::$dbEngine->escape($this->skype)."'";

+        $sql .= ", twitter = '".Config::$dbEngine->escape($this->twitter)."'";

+        $sql .= ", facebook = '".Config::$dbEngine->escape($this->facebook)."'";

+        $sql .= ", job = '".Config::$dbEngine->escape($this->job)."'";

+        $sql .= ", signature = '".Config::$dbEngine->escape($this->signature)."'";

+        $sql .= ", accountancy_code = '".Config::$dbEngine->escape($this->accountancy_code)."'";

+        $sql .= ", color = '".Config::$dbEngine->escape($this->color)."'";

+        $sql .= ", dateemployment=".(strval($this->dateemployment) != '' ? "'".Config::$dbEngine->idate($this->dateemployment)."'" : 'null');

+        $sql .= ", dateemploymentend=".(strval($this->dateemploymentend) != '' ? "'".Config::$dbEngine->idate($this->dateemploymentend)."'" : 'null');

+        $sql .= ", note = '".Config::$dbEngine->escape($this->note)."'";

+        $sql .= ", photo = ".($this->photo ? "'".Config::$dbEngine->escape($this->photo)."'" : "null");

+        $sql .= ", openid = ".($this->openid ? "'".Config::$dbEngine->escape($this->openid)."'" : "null");

+        $sql .= ", fk_user = ".($this->fk_user > 0 ? "'".Config::$dbEngine->escape($this->fk_user)."'" : "null");

         if (isset($this->thm) || $this->thm != '') {

-            $sql .= ", thm= " . ($this->thm != '' ? "'" . Config::$dbEngine->escape($this->thm) . "'" : "null");

+            $sql .= ", thm= ".($this->thm != '' ? "'".Config::$dbEngine->escape($this->thm)."'" : "null");

         }

         if (isset($this->tjm) || $this->tjm != '') {

-            $sql .= ", tjm= " . ($this->tjm != '' ? "'" . Config::$dbEngine->escape($this->tjm) . "'" : "null");

+            $sql .= ", tjm= ".($this->tjm != '' ? "'".Config::$dbEngine->escape($this->tjm)."'" : "null");

         }

         if (isset($this->salary) || $this->salary != '') {

-            $sql .= ", salary= " . ($this->salary != '' ? "'" . Config::$dbEngine->escape($this->salary) . "'" : "null");

+            $sql .= ", salary= ".($this->salary != '' ? "'".Config::$dbEngine->escape($this->salary)."'" : "null");

         }

         if (isset($this->salaryextra) || $this->salaryextra != '') {

-            $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . Config::$dbEngine->escape($this->salaryextra) . "'" : "null");

+            $sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".Config::$dbEngine->escape($this->salaryextra)."'" : "null");

         }

-        $sql .= ", weeklyhours= " . ($this->weeklyhours != '' ? "'" . Config::$dbEngine->escape($this->weeklyhours) . "'" : "null");

-        $sql .= ", entity = '" . Config::$dbEngine->escape($this->entity) . "'";

-        $sql .= ", default_range = " . ($this->default_range > 0 ? $this->default_range : 'null');

-        $sql .= ", default_c_exp_tax_cat = " . ($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');

+        $sql .= ", weeklyhours= ".($this->weeklyhours != '' ? "'".Config::$dbEngine->escape($this->weeklyhours)."'" : "null");

+        $sql .= ", entity = '".Config::$dbEngine->escape($this->entity)."'";

+        $sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');

+        $sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');

 

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql .= " WHERE rowid = ".$this->id;

 

-        DolUtils::dol_syslog(get_class($this) . "::update", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $nbrowsaffected += Config::$dbEngine->affected_rows($resql);

@@ -1466,8 +1466,8 @@ 
 

 // If user is linked to a member, remove old link to this member

             if ($this->fk_member > 0) {

-                DolUtils::dol_syslog(get_class($this) . "::update remove link with member. We will recreate it later", LOG_DEBUG);

-                $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = NULL where fk_member = " . $this->fk_member;

+                DolUtils::dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);

+                $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;

                 $resql = Config::$dbEngine->query($sql);

                 if (!$resql) {

                     $this->error = Config::$dbEngine->error();

@@ -1476,8 +1476,8 @@ 
                 }

             }

 // Set link to user

-            DolUtils::dol_syslog(get_class($this) . "::update set link with member", LOG_DEBUG);

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member =" . ($this->fk_member > 0 ? $this->fk_member : 'null') . " where rowid = " . $this->id;

+            DolUtils::dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member > 0 ? $this->fk_member : 'null')." where rowid = ".$this->id;

             $resql = Config::$dbEngine->query($sql);

             if (!$resql) {

                 $this->error = Config::$dbEngine->error();

@@ -1487,9 +1487,9 @@ 
 

             if ($nbrowsaffected) { // If something has changed in data

                 if ($this->fk_member > 0 && !$nosyncmember) {

-                    DolUtils::dol_syslog(get_class($this) . "::update user is linked with a member. We try to update member too.", LOG_DEBUG);

+                    DolUtils::dol_syslog(get_class($this)."::update user is linked with a member. We try to update member too.", LOG_DEBUG);

 

-                    require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

+                    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

 

 // This user is linked with a member, so we also update member information

 // if this is an update.

@@ -1529,7 +1529,7 @@ 
                         if ($result < 0) {

                             $this->error = $adh->error;

                             $this->errors = $adh->errors;

-                            DolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            DolUtils::dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);

                             $error++;

                         }

                     } else {

@@ -1540,9 +1540,9 @@ 
                 }

 

                 if ($this->contact_id > 0 && !$nosynccontact) {

-                    DolUtils::dol_syslog(get_class($this) . "::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);

+                    DolUtils::dol_syslog(get_class($this)."::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);

 

-                    require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

 

 // This user is linked with a contact, so we also update contact information

 // if this is an update.

@@ -1582,7 +1582,7 @@ 
                         if ($result < 0) {

                             $this->error = $tmpobj->error;

                             $this->errors = $tmpobj->errors;

-                            DolUtils::dol_syslog(get_class($this) . "::update error after calling adh->update to sync it with user: " . $this->error, LOG_ERR);

+                            DolUtils::dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);

                             $error++;

                         }

                     } else {

@@ -1616,7 +1616,7 @@ 
                 Config::$dbEngine->commit();

                 return $nbrowsaffected;

             } else {

-                DolUtils::dol_syslog(get_class($this) . "::update error=" . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -1;

             }

@@ -1640,21 +1640,21 @@ 
         // $now = DolUtils::dol_now();

         $now = date("Y-m-d H:i:s");

 

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";

+        $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";

         $sql .= " datepreviouslogin = datelastlogin,";

         // $sql .= " datelastlogin = '" . Config::$dbEngine->idate($now) . "',";

         $sql .= " datelastlogin = '{$now}',";

-        $sql .= " tms = tms";    // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion

+        $sql .= " WHERE rowid = ".$this->id;

 

-        DolUtils::dol_syslog(get_class($this) . "::update_last_login_date user->id=" . $this->id . " " . $sql, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);

         $resql = Config::$dbEngine->exec($sql);

         if ($resql) {

             $this->datepreviouslogin = $this->datelastlogin;

             $this->datelastlogin = $now;

             return 1;

         } else {

-            $this->error = Config::$dbEngine->lasterror() . ' sql=' . $sql;

+            $this->error = Config::$dbEngine->lasterror().' sql='.$sql;

             return -1;

         }

     }

@@ -1672,11 +1672,11 @@ 
     function setPassword($user, $password = '', $changelater = 0, $notrigger = 0, $nosyncmember = 0)

     {

 //global $conf, Globals::$langs;

-        require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

 

         $error = 0;

 

-        DolUtils::dol_syslog(get_class($this) . "::setPassword user=" . Globals::$user->id . " password=" . preg_replace('/./i', '*', $password) . " changelater=" . $changelater . " notrigger=" . $notrigger . " nosyncmember=" . $nosyncmember, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::setPassword user=".Globals::$user->id." password=".preg_replace('/./i', '*', $password)." changelater=".$changelater." notrigger=".$notrigger." nosyncmember=".$nosyncmember, LOG_DEBUG);

 

 // If new password not provided, we generate one

         if (!$password) {

@@ -1694,17 +1694,17 @@ 
 

             Config::$dbEngine->begin();

 

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET pass_crypted = '" . Config::$dbEngine->escape($password_crypted) . "',";

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET pass_crypted = '".Config::$dbEngine->escape($password_crypted)."',";

             $sql .= " pass_temp = null";

             if (!empty(Globals::$conf->global->DATABASE_PWD_ENCRYPTED)) {

                 $sql .= ", pass = null";

             } else {

-                $sql .= ", pass = '" . Config::$dbEngine->escape($password) . "'";

+                $sql .= ", pass = '".Config::$dbEngine->escape($password)."'";

             }

-            $sql .= " WHERE rowid = " . $this->id;

+            $sql .= " WHERE rowid = ".$this->id;

 

-            DolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG);

+            DolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);

             $result = Config::$dbEngine->query($sql);

             if ($result) {

                 if (Config::$dbEngine->affected_rows($result)) {

@@ -1713,7 +1713,7 @@ 
                     $this->pass_indatabase_crypted = $password_crypted;

 

                     if ($this->fk_member && !$nosyncmember) {

-                        require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

+                        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

 

 // This user is linked with a member, so we also update members informations

 // if this is an update.

@@ -1724,7 +1724,7 @@ 
                             $result = $adh->setPassword(Globals::$user, $this->pass, (empty(Globals::$conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent

                             if ($result < 0) {

                                 $this->error = $adh->error;

-                                DolUtils::dol_syslog(get_class($this) . "::setPassword " . $this->error, LOG_ERR);

+                                DolUtils::dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);

                                 $error++;

                             }

                         } else {

@@ -1733,7 +1733,7 @@ 
                         }

                     }

 

-                    DolUtils::dol_syslog(get_class($this) . "::setPassword notrigger=" . $notrigger . " error=" . $error, LOG_DEBUG);

+                    DolUtils::dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error, LOG_DEBUG);

 

                     if (!$error && !$notrigger) {

 // Call trigger

@@ -1760,11 +1760,11 @@ 
         } else {

 // We store clear password in password temporary field.

 // After receiving confirmation link, we will crypt it and store it in pass_crypted

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

-            $sql .= " SET pass_temp = '" . Config::$dbEngine->escape($password) . "'";

-            $sql .= " WHERE rowid = " . $this->id;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."user";

+            $sql .= " SET pass_temp = '".Config::$dbEngine->escape($password)."'";

+            $sql .= " WHERE rowid = ".$this->id;

 

-            DolUtils::dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG); // No log

+            DolUtils::dol_syslog(get_class($this)."::setPassword", LOG_DEBUG); // No log

             $result = Config::$dbEngine->query($sql);

             if ($result) {

                 return $password;

@@ -1790,7 +1790,7 @@ 
 //global $conf, Globals::$langs;

 //global $dolibarr_main_url_root;

 

-        require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

 

         $msgishtml = 0;

 

@@ -1815,36 +1815,36 @@ 
         $subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword", $appli);

 

 // Define $urlwithroot

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

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

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

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

 

         if (!$changelater) {

-            $url = $urlwithroot . '/';

+            $url = $urlwithroot.'/';

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived") . ".\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs") . " :\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Login") . " = " . $this->login . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Password") . " = " . $password . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";

             $mesg .= "\n";

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli) . ': ' . $url . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("ClickHereToGoTo", $appli).': '.$url."\n\n";

             $mesg .= "--\n";

             $mesg .= Globals::$user->getFullName($outputlangs); // Username that make then sending

 

-            DolUtils::dol_syslog(get_class($this) . "::send_password changelater is off, url=" . $url);

+            DolUtils::dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);

         } else {

-            $url = $urlwithroot . '/user/passwordforgotten.php?action=validatenewpassword&username=' . $this->login . "&passwordhash=" . dol_hash($password);

+            $url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.$this->login."&passwordhash=".dol_hash($password);

 

-            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived") . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyWillBe") . " :\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Login") . " = " . $this->login . "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("Password") . " = " . $password . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyWillBe")." :\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";

             $mesg .= "\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("YouMustClickToChange") . " :\n";

-            $mesg .= $url . "\n\n";

-            $mesg .= $outputlangs->transnoentitiesnoconv("ForgetIfNothing") . "\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("YouMustClickToChange")." :\n";

+            $mesg .= $url."\n\n";

+            $mesg .= $outputlangs->transnoentitiesnoconv("ForgetIfNothing")."\n\n";

 

-            DolUtils::dol_syslog(get_class($this) . "::send_password changelater is on, url=" . $url);

+            DolUtils::dol_syslog(get_class($this)."::send_password changelater is on, url=".$url);

         }

 

         $mailfile = new CMailFile(

@@ -1855,7 +1855,7 @@ 
             return 1;

         } else {

             Globals::$langs->trans("errors");

-            $this->error = Globals::$langs->trans("ErrorFailedToSendPassword") . ' ' . $mailfile->error;

+            $this->error = Globals::$langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;

             return -1;

         }

     }

@@ -1880,8 +1880,8 @@ 
     {

 // phpcs:enable

         $sql = "SELECT url, login, pass, poste ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user_clicktodial as u";

-        $sql .= " WHERE u.fk_user = " . $this->id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";

+        $sql .= " WHERE u.fk_user = ".$this->id;

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -1915,21 +1915,21 @@ 
 // phpcs:enable

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_clicktodial";

-        $sql .= " WHERE fk_user = " . $this->id;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";

+        $sql .= " WHERE fk_user = ".$this->id;

 

-        DolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);

         $result = Config::$dbEngine->query($sql);

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_clicktodial";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial";

         $sql .= " (fk_user,url,login,pass,poste)";

-        $sql .= " VALUES (" . $this->id;

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_url) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_login) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_password) . "'";

-        $sql .= ", '" . Config::$dbEngine->escape($this->clicktodial_poste) . "')";

+        $sql .= " VALUES (".$this->id;

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_url)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_login)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_password)."'";

+        $sql .= ", '".Config::$dbEngine->escape($this->clicktodial_poste)."')";

 

-        DolUtils::dol_syslog(get_class($this) . '::update_clicktodial', LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             Config::$dbEngine->commit();

@@ -1959,20 +1959,20 @@ 
 

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user";

-        $sql .= " WHERE fk_user  = " . $this->id;

-        $sql .= " AND fk_usergroup = " . $group;

-        $sql .= " AND entity = " . $entity;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";

+        $sql .= " WHERE fk_user  = ".$this->id;

+        $sql .= " AND fk_usergroup = ".$group;

+        $sql .= " AND entity = ".$entity;

 

         $result = Config::$dbEngine->query($sql);

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "usergroup_user (entity, fk_user, fk_usergroup)";

-        $sql .= " VALUES (" . $entity . "," . $this->id . "," . $group . ")";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_user (entity, fk_user, fk_usergroup)";

+        $sql .= " VALUES (".$entity.",".$this->id.",".$group.")";

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             if (!$error && !$notrigger) {

-                $this->newgroupid = $group;    // deprecated. Remove this.

+                $this->newgroupid = $group; // deprecated. Remove this.

                 $this->context = array('audit' => Globals::$langs->trans("UserSetInGroup"), 'newgroupid' => $group);

 

 // Call trigger

@@ -1987,7 +1987,7 @@ 
                 Config::$dbEngine->commit();

                 return 1;

             } else {

-                DolUtils::dol_syslog(get_class($this) . "::SetInGroup " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2016,15 +2016,15 @@ 
 

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user";

-        $sql .= " WHERE fk_user  = " . $this->id;

-        $sql .= " AND fk_usergroup = " . $group;

-        $sql .= " AND entity = " . $entity;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";

+        $sql .= " WHERE fk_user  = ".$this->id;

+        $sql .= " AND fk_usergroup = ".$group;

+        $sql .= " AND entity = ".$entity;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             if (!$error && !$notrigger) {

-                $this->oldgroupid = $group;    // deprecated. Remove this.

+                $this->oldgroupid = $group; // deprecated. Remove this.

                 $this->context = array('audit' => Globals::$langs->trans("UserRemovedFromGroup"), 'oldgroupid' => $group);

 

 // Call trigger

@@ -2040,7 +2040,7 @@ 
                 return 1;

             } else {

                 $this->error = $interface->error;

-                DolUtils::dol_syslog(get_class($this) . "::RemoveFromGroup " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2064,7 +2064,7 @@ 
     function getPhotoUrl($width, $height, $cssclass = '', $imagesize = '')

     {

 // $result = '<a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $this->id . '">';

-        $result = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $result = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $result .= Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);

         $result .= '</a>';

 

@@ -2114,49 +2114,49 @@ 
 

 // Info Login

         $label .= '<div class="centpercent">';

-        $label .= '<u>' . Globals::$langs->trans("User") . '</u><br>';

-        $label .= '<b>' . Globals::$langs->trans('Name') . ':</b> ' . $this->getFullName(Globals::$langs, '');

+        $label .= '<u>'.Globals::$langs->trans("User").'</u><br>';

+        $label .= '<b>'.Globals::$langs->trans('Name').':</b> '.$this->getFullName(Globals::$langs, '');

         if (!empty($this->login)) {

-            $label .= '<br><b>' . Globals::$langs->trans('Login') . ':</b> ' . $this->login;

+            $label .= '<br><b>'.Globals::$langs->trans('Login').':</b> '.$this->login;

         }

-        $label .= '<br><b>' . Globals::$langs->trans("EMail") . ':</b> ' . $this->email;

+        $label .= '<br><b>'.Globals::$langs->trans("EMail").':</b> '.$this->email;

         if (!empty($this->admin)) {

-            $label .= '<br><b>' . Globals::$langs->trans("Administrator") . '</b>: ' . DolUtils::yn($this->admin);

+            $label .= '<br><b>'.Globals::$langs->trans("Administrator").'</b>: '.DolUtils::yn($this->admin);

         }

         if (!empty($this->socid)) { // Add thirdparty for external users

             $thirdpartystatic = new Societe($db);

             $thirdpartystatic->fetch($this->socid);

             if (empty($hidethirdpartylogo)) {

-                $companylink = ' ' . $thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

+                $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

             }

-            $company = ' (' . Globals::$langs->trans("Company") . ': ' . $thirdpartystatic->name . ')';

+            $company = ' ('.Globals::$langs->trans("Company").': '.$thirdpartystatic->name.')';

         }

-        $type = ($this->socid ? Globals::$langs->trans("External") . $company : Globals::$langs->trans("Internal"));

-        $label .= '<br><b>' . Globals::$langs->trans("Type") . ':</b> ' . $type;

-        $label .= '<br><b>' . Globals::$langs->trans("Status") . '</b>: ' . $this->getLibStatut(0);

+        $type = ($this->socid ? Globals::$langs->trans("External").$company : Globals::$langs->trans("Internal"));

+        $label .= '<br><b>'.Globals::$langs->trans("Type").':</b> '.$type;

+        $label .= '<br><b>'.Globals::$langs->trans("Status").'</b>: '.$this->getLibStatut(0);

         $label .= '</div>';

         if ($infologin > 0) {

             $label .= '<br>';

-            $label .= '<br><u>' . Globals::$langs->trans("Connection") . '</u>';

-            $label .= '<br><b>' . Globals::$langs->trans("IPAddress") . '</b>: ' . $_SERVER["REMOTE_ADDR"];

+            $label .= '<br><u>'.Globals::$langs->trans("Connection").'</u>';

+            $label .= '<br><b>'.Globals::$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];

             if (!empty(Globals::$conf->global->MAIN_MODULE_MULTICOMPANY)) {

-                $label .= '<br><b>' . Globals::$langs->trans("ConnectedOnMultiCompany") . ':</b> ' . Globals::$conf->entity . ' (user entity ' . $this->entity . ')';

+                $label .= '<br><b>'.Globals::$langs->trans("ConnectedOnMultiCompany").':</b> '.Globals::$conf->entity.' (user entity '.$this->entity.')';

             }

-            $label .= '<br><b>' . Globals::$langs->trans("AuthenticationMode") . ':</b> ' . $_SESSION["dol_authmode"] . (empty($dolibarr_main_demo) ? '' : ' (demo)');

-            $label .= '<br><b>' . Globals::$langs->trans("ConnectedSince") . ':</b> ' . DolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("PreviousConnexion") . ':</b> ' . DolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentTheme") . ':</b> ' . Globals::$conf->theme;

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentMenuManager") . ':</b> ' . Globals::$menuManager->name;

+            $label .= '<br><b>'.Globals::$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');

+            $label .= '<br><b>'.Globals::$langs->trans("ConnectedSince").':</b> '.DolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("PreviousConnexion").':</b> '.DolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentTheme").':</b> '.Globals::$conf->theme;

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentMenuManager").':</b> '.Globals::$menuManager->name;

             $s = DolUtils::picto_from_langcode(Globals::$langs->getDefaultLang());

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentUserLanguage") . ':</b> ' . ($s ? $s . ' ' : '') . Globals::$langs->getDefaultLang();

-            $label .= '<br><b>' . Globals::$langs->trans("Browser") . ':</b> ' . Globals::$conf->browser->name . (Globals::$conf->browser->version ? ' ' . Globals::$conf->browser->version : '') . ' (' . $_SERVER['HTTP_USER_AGENT'] . ')';

-            $label .= '<br><b>' . Globals::$langs->trans("Layout") . ':</b> ' . Globals::$conf->browser->layout;

-            $label .= '<br><b>' . Globals::$langs->trans("Screen") . ':</b> ' . $_SESSION['dol_screenwidth'] . ' x ' . $_SESSION['dol_screenheight'];

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentUserLanguage").':</b> '.($s ? $s.' ' : '').Globals::$langs->getDefaultLang();

+            $label .= '<br><b>'.Globals::$langs->trans("Browser").':</b> '.Globals::$conf->browser->name.(Globals::$conf->browser->version ? ' '.Globals::$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';

+            $label .= '<br><b>'.Globals::$langs->trans("Layout").':</b> '.Globals::$conf->browser->layout;

+            $label .= '<br><b>'.Globals::$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];

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

-                $label .= '<br><b>' . Globals::$langs->trans("Phone") . ':</b> ' . Globals::$langs->trans("Yes");

+                $label .= '<br><b>'.Globals::$langs->trans("Phone").':</b> '.Globals::$langs->trans("Yes");

             }

             if (!empty($_SESSION["disablemodules"])) {

-                $label .= '<br><b>' . Globals::$langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));

+                $label .= '<br><b>'.Globals::$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));

             }

         }

         if ($infologin < 0) {

@@ -2164,10 +2164,10 @@ 
         }

 

 // $url = DOL_URL_ROOT . '/user/card.php?id=' . $this->id;

-        $url = BASE_URI . '?controller=user&method=card&id=' . $this->id;

+        $url = BASE_URI.'?controller=user&method=card&id='.$this->id;

         if ($option == 'leave') {

 //$url = DOL_URL_ROOT . '/holiday/list.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=holiday&method=list&id=' . $this->id;

+            $url = BASE_URI.'?controller=holiday&method=list&id='.$this->id;

         }

         if ($option != 'nolink') {

 // Add param to save lastsearch_values or not

@@ -2180,16 +2180,16 @@ 
             }

         }

 

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

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

         $linkclose = "";

         if (empty($notooltip)) {

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

                 Globals::$langs->load("users");

                 $label = Globals::$langs->trans("ShowUser");

-                $linkclose .= ' alt="' . DolUtils::dol_escape_htmltag($label, 1) . '"';

+                $linkclose .= ' alt="'.DolUtils::dol_escape_htmltag($label, 1).'"';

             }

-            $linkclose .= ' title="' . DolUtils::dol_escape_htmltag($label, 1) . '"';

-            $linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';

+            $linkclose .= ' title="'.DolUtils::dol_escape_htmltag($label, 1).'"';

+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';

 

             /*

               Globals::$hookManager->initHooks(array('userdao'));

@@ -2199,7 +2199,7 @@ 
              */

         }

 

-        $linkstart .= $linkclose . '>';

+        $linkstart .= $linkclose.'>';

         $linkend = '</a>';

 

 //if ($withpictoimg == -1) $result.='<div class="nowrap">';

@@ -2211,15 +2211,15 @@ 
             }

 // Only picto

             if ($withpictoimg > 0) {

-                $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';

+                $picto = '<!-- picto user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</div>';

             } else { // Picto must be a photo

-                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';

+                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</div>';

             }

             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-                $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';

+                $result .= '<div class="inline-block nopadding valignmiddle usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';

             }

             if ($mode == 'login') {

                 $result .= dol_trunc($this->login, $maxlen);

@@ -2239,7 +2239,7 @@ 
         global $action;

         Globals::$hookManager->initHooks(array('userdao'));

         $parameters = array('id' => $this->id, 'getnomurl' => $result);

-        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

         if ($reshook > 0) {

             $result = Globals::$hookManager->resPrint;

         } else {

@@ -2263,7 +2263,7 @@ 
         $result = '';

 

 // $linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-        $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $linkend = '</a>';

 

 //Check user's rights to see an other user

@@ -2273,7 +2273,7 @@ 
 

         if ($option == 'xxx') {

 //$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-            $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card.php&id=' . $this->id . '">';

+            $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card.php&id='.$this->id.'">';

             $linkend = '</a>';

         }

 

@@ -2330,9 +2330,9 @@ 
             }

         } elseif ($mode == 2) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 3) {

             if ($statut == 1) {

@@ -2342,15 +2342,15 @@ 
             }

         } elseif ($mode == 4) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 5) {

             if ($statut == 1) {

-                return Globals::$langs->trans('Enabled') . ' ' . img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

+                return Globals::$langs->trans('Enabled').' '.img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

             } elseif ($statut == 0) {

-                return Globals::$langs->trans('Disabled') . ' ' . img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+                return Globals::$langs->trans('Disabled').' '.img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

             }

         }

     }

@@ -2371,11 +2371,11 @@ 
         global $conf;

         $dn = '';

         if ($mode == 0) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS] . "," . Globals::$conf->global->LDAP_USER_DN;

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS].",".Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 1) {

             $dn = Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 2) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS];

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS];

         }

         return $dn;

     }

@@ -2573,8 +2573,8 @@ 
     {

         $sql = "SELECT u.rowid, u.login as ref, u.datec,";

         $sql .= " u.tms as date_modification, u.entity";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

-        $sql .= " WHERE u.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql .= " WHERE u.rowid = ".$id;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

@@ -2603,9 +2603,9 @@ 
     function getNbOfEMailings()

     {

         $sql = "SELECT count(mc.email) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";

-        $sql .= " WHERE mc.email = '" . Config::$dbEngine->escape($this->email) . "'";

-        $sql .= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes

+        $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";

+        $sql .= " WHERE mc.email = '".Config::$dbEngine->escape($this->email)."'";

+        $sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -2633,19 +2633,19 @@ 
         global $conf;

 

         $sql = "SELECT count(rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         } else {

-            $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

+            $sql .= " WHERE entity IN (".getEntity('user', 0).")";

             if ($limitTo == 'active') {

                 $sql .= " AND statut = 1";

             }

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         }

 

@@ -2696,7 +2696,7 @@ 
 

         $result = $this->update(Globals::$user);

 

-        DolUtils::dol_syslog(get_class($this) . "::update_ldap2dolibarr result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);

 

         return $result;

     }

@@ -2711,10 +2711,10 @@ 
     function get_children()

     {

 // phpcs:enable

-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE fk_user = " . $this->id;

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE fk_user = ".$this->id;

 

-        DolUtils::dol_syslog(get_class($this) . "::get_children result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);

         $res = Config::$dbEngine->query($sql);

         if ($res) {

             $this->users = array();

@@ -2743,11 +2743,11 @@ 
 

 // Load array[child]=parent

         $sql = "SELECT fk_user as id_parent, rowid as id_son";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         $sql .= " WHERE fk_user <> 0";

-        $sql .= " AND entity IN (" . getEntity('user') . ")";

+        $sql .= " AND entity IN (".getEntity('user').")";

 

-        DolUtils::dol_syslog(get_class($this) . "::loadParentOf", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::loadParentOf", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             while ($obj = Config::$dbEngine->fetch_object($resql)) {

@@ -2789,20 +2789,20 @@ 
 

 // Init $this->users array

         $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

 // Add fields from hooks

         $parameters = array();

-        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook

         if ($reshook > 0) {

             $sql .= Globals::$hookManager->resPrint;

         } else {

-            $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

+            $sql .= " WHERE u.entity IN (".getEntity('user').")";

         }

         if ($filter) {

-            $sql .= " AND " . $filter;

+            $sql .= " AND ".$filter;

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $i = 0;

@@ -2828,7 +2828,7 @@ 
         }

 

 // We add the fullpath property to each elements of first level (no parent exists)

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

         foreach ($this->users as $key => $val) {

             $result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)

             if ($result < 0) {

@@ -2840,18 +2840,18 @@ 
 // Exclude leaf including $deleteafterid from tree

         if ($deleteafterid) {

 //print "Look to discard user ".$deleteafterid."\n";

-            $keyfilter1 = '^' . $deleteafterid . '$';

-            $keyfilter2 = '_' . $deleteafterid . '$';

-            $keyfilter3 = '^' . $deleteafterid . '_';

-            $keyfilter4 = '_' . $deleteafterid . '_';

+            $keyfilter1 = '^'.$deleteafterid.'$';

+            $keyfilter2 = '_'.$deleteafterid.'$';

+            $keyfilter3 = '^'.$deleteafterid.'_';

+            $keyfilter4 = '_'.$deleteafterid.'_';

             foreach ($this->users as $key => $val) {

-                if (preg_match('/' . $keyfilter1 . '/', $val['fullpath']) || preg_match('/' . $keyfilter2 . '/', $val['fullpath']) || preg_match('/' . $keyfilter3 . '/', $val['fullpath']) || preg_match('/' . $keyfilter4 . '/', $val['fullpath'])) {

+                if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath']) || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {

                     unset($this->users[$key]);

                 }

             }

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree dol_sort_array", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);

         $this->users = dol_sort_array($this->users, 'fullname', 'asc', true, false);

 

 //var_dump($this->users);

@@ -2879,10 +2879,10 @@ 
 

             $idtoscan = $this->id;

 

-            DolUtils::dol_syslog("Build childid for id = " . $idtoscan);

+            DolUtils::dol_syslog("Build childid for id = ".$idtoscan);

             foreach ($this->users as $id => $val) {

 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath'])) {

+                if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) {

                     $childids[$val['id']] = $val['id'];

                 }

             }

@@ -2908,16 +2908,16 @@ 
     function build_path_from_id_user($id_user, $protection = 0)

     {

 // phpcs:enable

-        DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user id_user=" . $id_user . " protection=" . $protection, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);

 

         if (!empty($this->users[$id_user]['fullpath'])) {

 // Already defined

-            DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

+            DolUtils::dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

             return 0;

         }

 

 // Define fullpath and fullname

-        $this->users[$id_user]['fullpath'] = '_' . $id_user;

+        $this->users[$id_user]['fullpath'] = '_'.$id_user;

         $this->users[$id_user]['fullname'] = $this->users[$id_user]['lastname'];

         $i = 0;

         $cursor_user = $id_user;

@@ -2926,11 +2926,11 @@ 
         while (!empty($this->parentof[$cursor_user])) {

             if (in_array($this->parentof[$cursor_user], Globals::$useridfound)) {

                 DolUtils::dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);

-                return -1;     // Should not happen. Protection against looping hierarchy

+                return -1; // Should not happen. Protection against looping hierarchy

             }

             Globals::$useridfound[] = $this->parentof[$cursor_user];

-            $this->users[$id_user]['fullpath'] = '_' . $this->parentof[$cursor_user] . $this->users[$id_user]['fullpath'];

-            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'] . ' >> ' . $this->users[$id_user]['fullname'];

+            $this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];

+            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'].' >> '.$this->users[$id_user]['fullname'];

             $i++;

             $cursor_user = $this->parentof[$cursor_user];

         }

@@ -2972,10 +2972,10 @@ 
         $this->nb = array();

 

         $sql = "SELECT count(u.rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

         $sql .= " WHERE u.statut > 0";

 //$sql.= " AND employee != 0";

-        $sql .= " AND u.entity IN (" . getEntity('user') . ")";

+        $sql .= " AND u.entity IN (".getEntity('user').")";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3040,8 +3040,8 @@ 
         }

 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE rowid = '" . $rowid . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE rowid = '".$rowid."'";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3051,7 +3051,7 @@ 
                 $obj = Config::$dbEngine->fetch_object($resql);

 

                 if ($mode == 'email') {

-                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

+                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";

                 } else if ($mode == 'mobile') {

                     $this->user_property = $obj->user_mobile;

                 }

@@ -3078,7 +3078,7 @@ 
         global $conf;

 

         $sql = "SELECT t.rowid";

-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t ';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';

         $sql .= " WHERE 1";

 

 // Manage filter

@@ -3086,25 +3086,25 @@ 
         if (!empty($filter)) {

             foreach ($filter as $key => $value) {

                 if ($key == 't.rowid') {

-                    $sqlwhere[] = $key . '=' . $value;

+                    $sqlwhere[] = $key.'='.$value;

                 } elseif (strpos($key, 'date') !== false) {

-                    $sqlwhere[] = $key . ' = \'' . Config::$dbEngine->idate($value) . '\'';

+                    $sqlwhere[] = $key.' = \''.Config::$dbEngine->idate($value).'\'';

                 } elseif ($key == 'customsql') {

                     $sqlwhere[] = $value;

                 } else {

-                    $sqlwhere[] = $key . ' LIKE \'%' . Config::$dbEngine->escape($value) . '%\'';

+                    $sqlwhere[] = $key.' LIKE \'%'.Config::$dbEngine->escape($value).'%\'';

                 }

             }

         }

         if (count($sqlwhere) > 0) {

-            $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

+            $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';

         }

         $sql .= Config::$dbEngine->order($sortfield, $sortorder);

         if ($limit) {

             $sql .= Config::$dbEngine->plimit($limit + 1, $offset);

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

Views/CategoriesIndexView.php

Spacing +14 added lines, -14 removed lines

@@ -110,7 +110,7 @@ 
         $this->llxHeader('', $this->title, '', '', 0, 0, $arrayofjs, $arrayofcss);

 

         // $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '/categories/card.php?action=create&type=' . $this->type . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . $this->type) . '"><span class="valignmiddle">' . Globals::$langs->trans("NewCategory") . '</span>';

-        $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '?call=categories&run=card&action=create&type=' . $this->type . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . $this->type) . '"><span class="valignmiddle">' . Globals::$langs->trans("NewCategory") . '</span>';

+        $newcardbutton = '<a class="butActionNew" href="'.BASE_URI.'?call=categories&run=card&action=create&type='.$this->type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$this->type).'"><span class="valignmiddle">'.Globals::$langs->trans("NewCategory").'</span>';

         $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';

         $newcardbutton .= '</a>';

 

@@ -124,17 +124,17 @@ 
         /*

          * Zone recherche produit/service

          */

-        print '<form method="post" action="index.php?type=' . $this->type . '">';

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-        print '<input type="hidden" name="type" value="' . $this->type . '">';

+        print '<form method="post" action="index.php?type='.$this->type.'">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+        print '<input type="hidden" name="type" value="'.$this->type.'">';

 

 

         print '<table class="noborder nohover" width="100%">';

         print '<tr class="liste_titre">';

-        print '<td colspan="3">' . Globals::$langs->trans("Search") . '</td>';

+        print '<td colspan="3">'.Globals::$langs->trans("Search").'</td>';

         print '</tr>';

         print '<tr class="oddeven"><td>';

-        print Globals::$langs->trans("Name") . ':</td><td><input class="flat inputsearch" type="text" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="' . Globals::$langs->trans("Search") . '"></td></tr>';

+        print Globals::$langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.Globals::$langs->trans("Search").'"></td></tr>';

         /*

           // faire une rech dans une sous categorie uniquement

           print '<tr '.$bc[0].'><td>';

@@ -159,17 +159,17 @@ 
             $cats = $categstatic->rechercher($id, $catname, $this->typetext);

 

             print '<table class="noborder" width="100%">';

-            print '<tr class="liste_titre"><td colspan="2">' . Globals::$langs->trans("FoundCats") . '</td></tr>';

+            print '<tr class="liste_titre"><td colspan="2">'.Globals::$langs->trans("FoundCats").'</td></tr>';

 

             foreach ($cats as $cat) {

-                print "\t" . '<tr class="oddeven">' . "\n";

+                print "\t".'<tr class="oddeven">'."\n";

                 print "\t\t<td>";

                 $categstatic->id = $cat->id;

                 $categstatic->ref = $cat->label;

                 $categstatic->label = $cat->label;

                 $categstatic->type = $cat->type;

                 $categstatic->color = $cat->color;

-                print '<span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>';

+                print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';

                 print $categstatic->getNomUrl(1, '');

                 print '</span>';

                 print "</td>\n";

@@ -209,9 +209,9 @@ 
             $data[] = array(

                 'rowid' => $val['rowid'],

                 'fk_menu' => $val['fk_parent'],

-                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>' . $li . '</span></td>' .

+                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.

                 //'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.

-                '<td align="right" width="20px;"><a href="' . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $val['id'] . '&type=' . $this->type . '">' . img_view() . '</a></td>' .

+                '<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$this->type.'">'.img_view().'</a></td>'.

                 '</tr></table>'

             );

         }

@@ -220,9 +220,9 @@ 
 //print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1);

 

         print '<table class="liste nohover" width="100%">';

-        print '<tr class="liste_titre"><td>' . Globals::$langs->trans("Categories") . '</td><td></td><td align="right">';

+        print '<tr class="liste_titre"><td>'.Globals::$langs->trans("Categories").'</td><td></td><td align="right">';

         if (!empty($conf->use_javascript_ajax)) {

-            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">' . img_picto('', 'object_category') . ' ' . Globals::$langs->trans("UndoExpandAll") . '</a> | <a class="notasortlink" href="#">' . img_picto('', 'object_category-expanded') . ' ' . Globals::$langs->trans("ExpandAll") . '</a></div>';

+            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'object_category').' '.Globals::$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'object_category-expanded').' '.Globals::$langs->trans("ExpandAll").'</a></div>';

         }

         print '</td></tr>';

 

@@ -234,7 +234,7 @@ 
             print '</td></tr>';

         } else {

             print '<tr class="pair">';

-            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>' . DolUtils::img_picto_common('', 'treemenu/branchbottom.gif') . '</td>';

+            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.DolUtils::img_picto_common('', 'treemenu/branchbottom.gif').'</td>';

             print '<td valign="middle">';

             print Globals::$langs->trans("NoCategoryYet");

             print '</td>';