alxarafe / alixar

Base/AlixarController.php

Spacing +89 added lines, -89 removed lines

@@ -50,13 +50,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('');
 
-        $sessionname = 'DOLSESSID_' . $prefix;
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $sessionname = 'DOLSESSID_'.$prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty($_COOKIE[$sessiontimeout])) {
             ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
         }
         session_name($sessionname);
-        session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+        session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
         // This create lock, released when session_write_close() or end of page.
         // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
         if (!defined('NOSESSION')) {
@@ -80,7 +80,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') {
@@ -101,18 +101,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);
@@ -137,29 +137,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;
             }
         }
@@ -183,7 +183,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);
                 }
@@ -261,19 +261,19 @@ 
                 $dol_use_jmobile = DolUtils::GETPOST('dol_use_jmobile', 'int', 3);
 //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 // If in demo mode, we check we go to home page through the public/demo/index.php page
-                if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI . '/index.php') {  // We ask index page
+                if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI.'/index.php') {  // We ask index page
                     if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-                        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;
                     }
                 }
@@ -293,7 +293,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';
                         $interface = new Interfaces($db);
@@ -306,7 +306,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++;
 
@@ -381,7 +381,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';
@@ -395,7 +395,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++;
                         }
@@ -407,7 +407,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 {
@@ -422,8 +422,8 @@ 
                     DolUtils::dol_syslog('User not found, connexion refused');
                     session_destroy();
                     session_name($sessionname);
-                    session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                    session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                    session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                    session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                     if ($resultFetchUser == 0) {
 // Load translation files required by page
@@ -431,7 +431,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;
@@ -451,40 +451,40 @@ 
                     $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 {
 // 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($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
@@ -492,7 +492,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;
@@ -512,24 +512,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
@@ -538,30 +538,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]);
                         }
                     }
 
@@ -609,13 +609,13 @@ 
                     $_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());
 
                 $db->begin();
 
                 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;
@@ -631,7 +631,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++;
                 }
@@ -652,7 +652,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;
                     }
                 }
@@ -684,7 +684,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';
             }
         }
 
@@ -692,7 +692,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';
         }
 
 
@@ -742,7 +742,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')) {
@@ -779,7 +779,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
@@ -791,7 +791,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
@@ -839,7 +839,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;
@@ -851,7 +851,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;
                 }
@@ -895,7 +895,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.
@@ -906,7 +906,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];
@@ -967,8 +967,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);
@@ -992,15 +992,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);
@@ -1008,10 +1008,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;
     }
@@ -1030,7 +1030,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;
                 }
             }

Braces +3 added lines, -2 removed lines

@@ -307,8 +307,9 @@
                         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
-                        if ($reshook < 0)
-                            $error++;
+                        if ($reshook < 0) {
+                                                    $error++;
+                        }
 
 // Note: exit is done later
                     }

Base/FormOther.php

Indentation +146 added lines, -146 removed lines

@@ -41,9 +41,9 @@ 
     // private $db;

 

     /**

-	 * @var string Error code (or message)

-	 */

-	public $error;

+     * @var string Error code (or message)

+     */

+    public $error;

 

 

     /**

@@ -74,7 +74,7 @@ 
         $sql = "SELECT rowid, label";

         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";

         $sql.= " WHERE type = '".$type."'";

-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

+        if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

         $sql.= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

@@ -180,7 +180,7 @@ 
         $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

         $sql.= " ORDER BY country, e.organization ASC, e.code ASC";

 

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

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

         $resql=$this->db->query($sql);

         if ($resql)

         {

@@ -231,50 +231,50 @@ 
     function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')

     {

         // phpcs:enable

-    	global $langs;

-

-    	$out='';

-

-    	$sql = "SELECT r.taux, r.revenuestamp_type";

-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

-    	$sql.= " AND c.code = '".$country_code."'";

-

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

-    	$resql=$this->db->query($sql);

-    	if ($resql)

-    	{

-    		$out.='<select class="flat" name="'.$htmlname.'">';

-    		$num = $this->db->num_rows($resql);

-    		$i = 0;

-    		$out.='<option value="0">&nbsp;</option>'."\n";

-    		if ($num)

-    		{

-    			while ($i < $num)

-    			{

-    				$obj = $this->db->fetch_object($resql);

-    				if (($selected && $selected == $obj->taux) || $num == 1)

-    				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

-    				}

-    				else

-    				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

-    				}

-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

-    				$out.='</option>';

-    				$i++;

-    			}

-    		}

-    		$out.='</select>';

-    		return $out;

-    	}

-    	else

-    	{

-    		dol_print_error($this->db);

-    		return '';

-    	}

+        global $langs;

+

+        $out='';

+

+        $sql = "SELECT r.taux, r.revenuestamp_type";

+        $sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

+        $sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

+        $sql.= " AND c.code = '".$country_code."'";

+

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

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $out.='<select class="flat" name="'.$htmlname.'">';

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            $out.='<option value="0">&nbsp;</option>'."\n";

+            if ($num)

+            {

+                while ($i < $num)

+                {

+                    $obj = $this->db->fetch_object($resql);

+                    if (($selected && $selected == $obj->taux) || $num == 1)

+                    {

+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

+                    }

+                    else

+                    {

+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

+                        //print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

+                    }

+                    $out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

+                    $out.='</option>';

+                    $i++;

+                }

+            }

+            $out.='</select>';

+            return $out;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return '';

+        }

     }

 

 

@@ -369,8 +369,8 @@ 
         }

         if ($nocateg)

         {

-        	$langs->load("categories");

-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

+            $langs->load("categories");

+            $moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

         }

         $moreforfilter.='</select>';

 

@@ -405,7 +405,7 @@ 
             $comboenhancement = ajax_combobox($htmlname);

             if ($comboenhancement)

             {

-            	$out.=$comboenhancement;

+                $out.=$comboenhancement;

             }

         }

         // Select each sales and print them in a select input

@@ -427,7 +427,7 @@ 
             $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";

             $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

         }

-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

+        $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

         //print $sql_usr;exit;

 

         $resql_usr = $this->db->query($sql_usr);

@@ -451,18 +451,18 @@ 
                 }

                 if ($showstatus >= 0)

                 {

-					if ($obj_usr->statut == 1 && $showstatus == 1)

-					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

-	                	$moreinfo++;

-					}

-					if ($obj_usr->statut == 0)

-					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

-                		$moreinfo++;

-					}

-				}

-				$out.=($moreinfo?')':'');

+                    if ($obj_usr->statut == 1 && $showstatus == 1)

+                    {

+                        $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

+                        $moreinfo++;

+                    }

+                    if ($obj_usr->statut == 0)

+                    {

+                        $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

+                        $moreinfo++;

+                    }

+                }

+                $out.=($moreinfo?')':'');

                 $out.='</option>';

             }

             $this->db->free($resql_usr);

@@ -487,7 +487,7 @@ 
      * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists

      *  @param  int		$useempty       		0=Allow empty values

      *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

-	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)

+     *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)

      *  @param	string	$morecss				More css

      *  @return	void

      */

@@ -502,7 +502,7 @@ 
         $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);

         if ($tasksarray)

         {

-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+            print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

             if ($useempty) print '<option value="0">&nbsp;</option>';

             $j=0;

             $level=0;

@@ -538,11 +538,11 @@ 
         $numlines=count($lines);

         for ($i = 0 ; $i < $numlines ; $i++)

         {

-        	if ($lines[$i]->fk_parent == $parent)

+            if ($lines[$i]->fk_parent == $parent)

             {

                 $var = !$var;

 

-				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

+                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

 

                 // Break on a new project

                 if ($parent == 0)	// We are on a task at first level

@@ -575,13 +575,13 @@ 
                 // Print task

                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

                 {

-                	// Check if we must disable entry

-                	$disabled=0;

-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

-                	{

-               			$disabled++;

-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

-                	}

+                    // Check if we must disable entry

+                    $disabled=0;

+                    if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

+                    {

+                            $disabled++;

+                            if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

+                    }

 

                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

                     if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';

@@ -624,14 +624,14 @@ 
      */

     static function showColor($color, $textifnotdefined='')

     {

-    	$textcolor='FFF';

-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-    	if(colorIsLight($color)) $textcolor='000';

+        $textcolor='FFF';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+        if(colorIsLight($color)) $textcolor='000';

 

-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');

+        $color = colorArrayToHex(colorStringToArray($color,array()),'');

 

-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

-		else print $textifnotdefined;

+        if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

+        else print $textifnotdefined;

     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -650,7 +650,7 @@ 
     function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')

     {

         // phpcs:enable

-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

+        print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

     }

 

     /**

@@ -667,10 +667,10 @@ 
      */

     static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')

     {

-	    // Deprecation warning

-	    if ($form_name) {

-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

-	    }

+        // Deprecation warning

+        if ($form_name) {

+            dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

+        }

 

         global $langs,$conf;

 

@@ -681,9 +681,9 @@ 
             $langs->load("other");

             if (empty($conf->dol_use_jmobile))

             {

-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

-	            $out.= '<script type="text/javascript">

+                $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

+                $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

+                $out.= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                $(\'#colorpicker'.$prefix.'\').jPicker( {

 	                window: {

@@ -727,9 +727,9 @@ 
         {

             if (empty($conf->dol_use_jmobile))

             {

-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

-	            $out.= '<script type="text/javascript">

+                $out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

+                $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

+                $out.= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({

 	                     size: 14,

@@ -930,7 +930,7 @@ 
         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';

         if($useempty)

         {

-        	$selected_html='';

+            $selected_html='';

             if ($selected == '') $selected_html = ' selected';

             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

         }

@@ -1029,55 +1029,55 @@ 
         $boxidactivatedforuser=array();

         foreach($boxactivated as $box)

         {

-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

+            if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

         }

 

         // Define selectboxlist

         $arrayboxtoactivatelabel=array();

         if (! empty($user->conf->$confuserzone))

         {

-        	$boxorder='';

-        	$langs->load("boxes");	// Load label of boxes

-        	foreach($boxactivated as $box)

-        	{

-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);

-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

-        		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

-        		{

-        			$label=$label.' <span class="fa fa-bar-chart"></span>';

-        		}

-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

-        	}

+            $boxorder='';

+            $langs->load("boxes");	// Load label of boxes

+            foreach($boxactivated as $box)

+            {

+                if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

+                $label=$langs->transnoentitiesnoconv($box->boxlabel);

+                //if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

+                if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

+                {

+                    $label=$label.' <span class="fa fa-bar-chart"></span>';

+                }

+                $arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

+            }

             foreach($boxidactivatedforuser as $boxid)

-        	{

-       			if (empty($boxorder)) $boxorder.='A:';

-  				$boxorder.=$boxid.',';

-        	}

-

-        	//var_dump($boxidactivatedforuser);

-

-        	// Class Form must have been already loaded

-        	$selectboxlist.='<!-- Form with select box list -->'."\n";

-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

+            {

+                    if (empty($boxorder)) $boxorder.='A:';

+                    $boxorder.=$boxid.',';

+            }

+

+            //var_dump($boxidactivatedforuser);

+

+            // Class Form must have been already loaded

+            $selectboxlist.='<!-- Form with select box list -->'."\n";

+            $selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

+            $selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

+            $selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

+            $selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

+            $selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

+            $selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

             $selectboxlist.='</form>';

             if (! empty($conf->use_javascript_ajax))

             {

-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-            	$selectboxlist.=ajax_combobox("boxcombo");

+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                $selectboxlist.=ajax_combobox("boxcombo");

             }

         }

 

         // Javascript code for dynamic actions

         if (! empty($conf->use_javascript_ajax))

         {

-	        $selectboxlist.='<script type="text/javascript" language="javascript">

+            $selectboxlist.='<script type="text/javascript" language="javascript">

 

 	        // To update list of activated boxes

 	        function updateBoxOrder(closing) {

@@ -1116,8 +1116,8 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;

 	                }

 	        	});';

-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

-	        	$selectboxlist.='

+                if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

+                $selectboxlist.='

 

 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({

 	    	    	handle: \'.boxhandle\',

@@ -1142,7 +1142,7 @@ 
 

         	});'."\n";

 

-	        $selectboxlist.='</script>'."\n";

+            $selectboxlist.='</script>'."\n";

         }

 

         // Define boxlista and boxlistb

@@ -1150,10 +1150,10 @@ 
 

         if ($nbboxactivated)

         {

-        	// Load translation files required by the page

+            // Load translation files required by the page

             $langs->loadLangs(array("boxes","projects"));

 

-        	$emptybox=new ModeleBoxes($db);

+            $emptybox=new ModeleBoxes($db);

 

             $boxlista.="\n<!-- Box left container -->\n";

 

@@ -1164,9 +1164,9 @@ 
             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^A/i',$box->box_order)) // column A

+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

+                if (preg_match('/^A/i',$box->box_order)) // column A

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

@@ -1179,10 +1179,10 @@ 
 

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

             {

-            	$emptybox->box_id='A';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlista.= $emptybox->outputBox(array(),array());

+                $emptybox->box_id='A';

+                $emptybox->info_box_head=array();

+                $emptybox->info_box_contents=array();

+                $boxlista.= $emptybox->outputBox(array(),array());

             }

             $boxlista.= "<!-- End box left container -->\n";

 

@@ -1191,9 +1191,9 @@ 
             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^B/i',$box->box_order)) // colonne B

+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

+                if (preg_match('/^B/i',$box->box_order)) // colonne B

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

@@ -1206,10 +1206,10 @@ 
 

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

             {

-            	$emptybox->box_id='B';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlistb.= $emptybox->outputBox(array(),array());

+                $emptybox->box_id='B';

+                $emptybox->info_box_head=array();

+                $emptybox->info_box_contents=array();

+                $boxlistb.= $emptybox->outputBox(array(),array());

             }

 

             $boxlistb.= "<!-- End box right container -->\n";

@@ -1275,7 +1275,7 @@ 
                 print "</select>";

             }

             else

-			{

+            {

                 print $langs->trans("DictionaryEmpty");

             }

         }

Spacing +223 added lines, -223 removed lines

@@ -68,14 +68,14 @@ 
      *    @param    int		$fk_user          Utilisateur créant le modèle

      *    @return	void

      */

-    function select_export_model($selected='', $htmlname='exportmodelid', $type='', $useempty=0, $fk_user=null)

+    function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)

     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

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

-        $sql.= " WHERE type = '".$type."'";

-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

-        $sql.= " ORDER BY rowid";

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

+        $sql .= " WHERE type = '".$type."'";

+		if (!empty($fk_user)) $sql .= " AND fk_user=".$fk_user;

+        $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

         {

@@ -120,13 +120,13 @@ 
      *    @param    int		$useempty          Affiche valeur vide dans liste

      *    @return	void

      */

-    function select_import_model($selected='', $htmlname='importmodelid', $type='', $useempty=0)

+    function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0)

     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

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

-        $sql.= " WHERE type = '".$type."'";

-        $sql.= " ORDER BY rowid";

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

+        $sql .= " WHERE type = '".$type."'";

+        $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

         {

@@ -169,19 +169,19 @@ 
      *    @param    string	$htmlname	Name of combo list

      *    @return	integer

      */

-    function select_ecotaxes($selected='', $htmlname='ecotaxe_id')

+    function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')

     {

         // phpcs:enable

         global $langs;

 

         $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";

-        $sql.= " c.label as country";

-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";

-        $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

-        $sql.= " ORDER BY country, e.organization ASC, e.code ASC";

+        $sql .= " c.label as country";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

+        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";

 

     	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

-        $resql=$this->db->query($sql);

+        $resql = $this->db->query($sql);

         if ($resql)

         {

             print '<select class="flat" name="'.$htmlname.'">';

@@ -228,26 +228,26 @@ 
      *    @param    string	$country_code   Country Code

      *    @return	string					HTML select list

      */

-    function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')

+    function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')

     {

         // phpcs:enable

     	global $langs;

 

-    	$out='';

+    	$out = '';

 

     	$sql = "SELECT r.taux, r.revenuestamp_type";

-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

-    	$sql.= " AND c.code = '".$country_code."'";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

+    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

+    	$sql .= " AND c.code = '".$country_code."'";

 

     	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

-    	$resql=$this->db->query($sql);

+    	$resql = $this->db->query($sql);

     	if ($resql)

     	{

-    		$out.='<select class="flat" name="'.$htmlname.'">';

+    		$out .= '<select class="flat" name="'.$htmlname.'">';

     		$num = $this->db->num_rows($resql);

     		$i = 0;

-    		$out.='<option value="0">&nbsp;</option>'."\n";

+    		$out .= '<option value="0">&nbsp;</option>'."\n";

     		if ($num)

     		{

     			while ($i < $num)

@@ -255,19 +255,19 @@ 
     				$obj = $this->db->fetch_object($resql);

     				if (($selected && $selected == $obj->taux) || $num == 1)

     				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

     				}

     				else

     				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

     				}

-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

-    				$out.='</option>';

+    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

+    				$out .= '</option>';

     				$i++;

     			}

     		}

-    		$out.='</select>';

+    		$out .= '</select>';

     		return $out;

     	}

     	else

@@ -291,27 +291,27 @@ 
      *    @param    int     $showempty      Add also an empty line

      *    @return   string					HTML select string

      */

-    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0)

+    function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)

     {

         // phpcs:enable

-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';

-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';

+        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';

+        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';

 

-        for ($i = $start ; $i <= $end ; $i += $increment)

+        for ($i = $start; $i <= $end; $i += $increment)

         {

             if ($selected != '' && (int) $selected == $i)

             {

-                $return.= '<option value="'.$i.'" selected>';

+                $return .= '<option value="'.$i.'" selected>';

             }

             else

             {

-                $return.= '<option value="'.$i.'">';

+                $return .= '<option value="'.$i.'">';

             }

-            $return.= $i.' % ';

-            $return.= '</option>';

+            $return .= $i.' % ';

+            $return .= '</option>';

         }

 

-        $return.= '</select>';

+        $return .= '</select>';

 

         return $return;

     }

@@ -329,7 +329,7 @@ 
      * @return  string		        	Html combo list code

      * @see	select_all_categories

      */

-    function select_categories($type, $selected=0, $htmlname='search_categ', $nocateg=0, $showempty=1, $morecss='')

+    function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')

     {

         // phpcs:enable

         global $conf, $langs;

@@ -338,7 +338,7 @@ 
         // For backward compatibility

         if (is_numeric($type))

         {

-            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

         }

 

         // Load list of "categories"

@@ -349,30 +349,30 @@ 
         // Enhance with select2

         if ($conf->use_javascript_ajax)

         {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $comboenhancement = ajax_combobox('select_categ_'.$htmlname);

-            $moreforfilter.=$comboenhancement;

+            $moreforfilter .= $comboenhancement;

         }

 

         // Print a select with each of them

-        $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing

+        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing

 

         if (is_array($tab_categs))

         {

             foreach ($tab_categs as $categ)

             {

-                $moreforfilter.='<option value="'.$categ['id'].'"';

-                if ($categ['id'] == $selected) $moreforfilter.=' selected';

-                $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';

+                $moreforfilter .= '<option value="'.$categ['id'].'"';

+                if ($categ['id'] == $selected) $moreforfilter .= ' selected';

+                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';

             }

         }

         if ($nocateg)

         {

         	$langs->load("categories");

-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

+        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';

         }

-        $moreforfilter.='</select>';

+        $moreforfilter .= '</select>';

 

         return $moreforfilter;

     }

@@ -390,44 +390,44 @@ 
      *  @param	string	$morecss		More CSS

      *  @return string					Html combo list code

      */

-    function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1,$morecss='')

+    function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '')

     {

         // phpcs:enable

-        global $conf,$langs;

+        global $conf, $langs;

         $langs->load('users');

 

         $out = '';

         // Enhance with select2

         if ($conf->use_javascript_ajax)

         {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

 

             $comboenhancement = ajax_combobox($htmlname);

             if ($comboenhancement)

             {

-            	$out.=$comboenhancement;

+            	$out .= $comboenhancement;

             }

         }

         // Select each sales and print them in a select input

-        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $out.='<option value="0">&nbsp;</option>';

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $out .= '<option value="0">&nbsp;</option>';

 

         // Get list of users allowed to be viewed

         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";

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

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

-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;

-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;

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

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

+        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;

+        if (!empty($user->societe_id)) $sql_usr .= " AND u.fk_soc = ".$user->societe_id;

         // Add existing sales representatives of thirdparty of external user

         if (empty($user->rights->user->user->lire) && $user->societe_id)

         {

-            $sql_usr.=" UNION ";

-            $sql_usr.= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";

-            $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-            $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";

-            $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

+            $sql_usr .= " UNION ";

+            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";

+            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+            $sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";

+            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

         }

-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

+	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

         //print $sql_usr;exit;

 

         $resql_usr = $this->db->query($sql_usr);

@@ -436,34 +436,34 @@ 
             while ($obj_usr = $this->db->fetch_object($resql_usr))

             {

 

-                $out.='<option value="'.$obj_usr->rowid.'"';

+                $out .= '<option value="'.$obj_usr->rowid.'"';

 

-                if ($obj_usr->rowid == $selected) $out.=' selected';

+                if ($obj_usr->rowid == $selected) $out .= ' selected';

 

-                $out.='>';

-                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);

+                $out .= '>';

+                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);

                 // Complete name with more info

-                $moreinfo=0;

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

+                $moreinfo = 0;

+                if (!empty($conf->global->MAIN_SHOW_LOGIN))

                 {

-                    $out.=($moreinfo?' - ':' (').$obj_usr->login;

+                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;

                     $moreinfo++;

                 }

                 if ($showstatus >= 0)

                 {

 					if ($obj_usr->statut == 1 && $showstatus == 1)

 					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

 	                	$moreinfo++;

 					}

 					if ($obj_usr->statut == 0)

 					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');

                 		$moreinfo++;

 					}

 				}

-				$out.=($moreinfo?')':'');

-                $out.='</option>';

+				$out .= ($moreinfo ? ')' : '');

+                $out .= '</option>';

             }

             $this->db->free($resql_usr);

         }

@@ -471,7 +471,7 @@ 
         {

             dol_print_error($this->db);

         }

-        $out.='</select>';

+        $out .= '</select>';

 

         return $out;

     }

@@ -491,21 +491,21 @@ 
      *  @param	string	$morecss				More css

      *  @return	void

      */

-    function selectProjectTasks($selectedtask='', $projectid=0, $htmlname='task_parent', $modeproject=0, $modetask=0, $mode=0, $useempty=0, $disablechildoftaskid=0, $filteronprojstatus='', $morecss='')

+    function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')

     {

         global $user, $langs;

 

         require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

 

         //print $modeproject.'-'.$modetask;

-        $task=new Task($this->db);

-        $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);

+        $task = new Task($this->db);

+        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);

         if ($tasksarray)

         {

-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

             if ($useempty) print '<option value="0">&nbsp;</option>';

-            $j=0;

-            $level=0;

+            $j = 0;

+            $level = 0;

             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

             print '</select>';

 

@@ -529,14 +529,14 @@ 
      * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

      * @return	void

      */

-    private function _pLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0, $disablechildoftaskid=0)

+    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)

     {

         global $langs, $user, $conf;

 

-        $lastprojectid=0;

+        $lastprojectid = 0;

 

-        $numlines=count($lines);

-        for ($i = 0 ; $i < $numlines ; $i++)

+        $numlines = count($lines);

+        for ($i = 0; $i < $numlines; $i++)

         {

         	if ($lines[$i]->fk_parent == $parent)

             {

@@ -552,7 +552,7 @@ 
                         if ($i > 0) print '<option value="0" disabled>----------</option>';

                         print '<option value="'.$lines[$i]->fk_project.'_0"';

                         if ($selectedproject == $lines[$i]->fk_project) print ' selected';

-                        print '>';	// Project -> Task

+                        print '>'; // Project -> Task

                         print $langs->trans("Project").' '.$lines[$i]->projectref;

                         if (empty($lines[$i]->public))

                         {

@@ -565,22 +565,22 @@ 
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;

                         print "</option>\n";

 

-                        $lastprojectid=$lines[$i]->fk_project;

+                        $lastprojectid = $lines[$i]->fk_project;

                         $inc++;

                     }

                 }

 

-                $newdisablechildoftaskid=$disablechildoftaskid;

+                $newdisablechildoftaskid = $disablechildoftaskid;

 

                 // Print task

                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

                 {

                 	// Check if we must disable entry

-                	$disabled=0;

+                	$disabled = 0;

                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

                 	{

                			$disabled++;

-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too

                 	}

 

                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

@@ -598,7 +598,7 @@ 
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                     }

                     if ($lines[$i]->id) print ' > ';

-                    for ($k = 0 ; $k < $level ; $k++)

+                    for ($k = 0; $k < $level; $k++)

                     {

                         print "&nbsp;&nbsp;&nbsp;";

                     }

@@ -622,13 +622,13 @@ 
      * 		@return	string							HTML code for color thumb

      *		@see selectColor

      */

-    static function showColor($color, $textifnotdefined='')

+    static function showColor($color, $textifnotdefined = '')

     {

-    	$textcolor='FFF';

+    	$textcolor = 'FFF';

     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-    	if(colorIsLight($color)) $textcolor='000';

+    	if (colorIsLight($color)) $textcolor = '000';

 

-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');

+    	$color = colorArrayToHex(colorStringToArray($color, array()), '');

 

 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

 		else print $textifnotdefined;

@@ -647,7 +647,7 @@ 
      * 		@deprecated Use instead selectColor

      *      @see selectColor()

      */

-    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')

+    function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')

     {

         // phpcs:enable

     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

@@ -665,25 +665,25 @@ 
      * 		@return	string

      *		@see showColor

      */

-    static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')

+    static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')

     {

 	    // Deprecation warning

 	    if ($form_name) {

-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

+		    dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);

 	    }

 

-        global $langs,$conf;

+        global $langs, $conf;

 

-        $out='';

+        $out = '';

 

-        if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)

+        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)

         {

             $langs->load("other");

             if (empty($conf->dol_use_jmobile))

             {

-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

-	            $out.= '<script type="text/javascript">

+	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

+	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

+	            $out .= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                $(\'#colorpicker'.$prefix.'\').jPicker( {

 	                window: {

@@ -721,15 +721,15 @@ 
 			        } ); });

 	             </script>';

             }

-            $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';

+            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.$set_color.'" />';

         }

         else  // In most cases, this is not used. We used instead function with no specific list of colors

         {

             if (empty($conf->dol_use_jmobile))

             {

-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

-	            $out.= '<script type="text/javascript">

+	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

+	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

+	            $out .= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({

 	                     size: 14,

@@ -739,15 +739,15 @@ 
 	             });

 	             </script>';

             }

-            $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';

+            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';

             //print '<option value="-1">&nbsp;</option>';

             foreach ($arrayofcolors as $val)

             {

-                $out.= '<option value="'.$val.'"';

-                if ($set_color == $val) $out.= ' selected';

-                $out.= '>'.$val.'</option>';

+                $out .= '<option value="'.$val.'"';

+                if ($set_color == $val) $out .= ' selected';

+                $out .= '>'.$val.'</option>';

             }

-            $out.= '</select>';

+            $out .= '</select>';

         }

 

         return $out;

@@ -764,7 +764,7 @@ 
      *	@param	int		$y      	Hauteur de l'image en pixels

      *	@return	void

      */

-    function CreateColorIcon($color,$module,$name,$x='12',$y='12')

+    function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')

     {

         // phpcs:enable

         global $conf;

@@ -772,25 +772,25 @@ 
         $file = $conf->$module->dir_temp.'/'.$name.'.png';

 

         // On cree le repertoire contenant les icones

-        if (! file_exists($conf->$module->dir_temp))

+        if (!file_exists($conf->$module->dir_temp))

         {

             dol_mkdir($conf->$module->dir_temp);

         }

 

         // On cree l'image en vraies couleurs

-        $image = imagecreatetruecolor($x,$y);

+        $image = imagecreatetruecolor($x, $y);

 

-        $color = substr($color,1,6);

+        $color = substr($color, 1, 6);

 

-        $rouge = hexdec(substr($color,0,2)); //conversion du canal rouge

-        $vert  = hexdec(substr($color,2,2)); //conversion du canal vert

-        $bleu  = hexdec(substr($color,4,2)); //conversion du canal bleu

+        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge

+        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert

+        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu

 

-        $couleur = imagecolorallocate($image,$rouge,$vert,$bleu);

+        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);

         //print $rouge.$vert.$bleu;

-        imagefill($image,0,0,$couleur); //on remplit l'image

+        imagefill($image, 0, 0, $couleur); //on remplit l'image

         // On cree la couleur et on l'attribue a une variable pour ne pas la perdre

-        ImagePng($image,$file); //renvoie une image sous format png

+        ImagePng($image, $file); //renvoie une image sous format png

         ImageDestroy($image);

     }

 

@@ -803,7 +803,7 @@ 
      *    	@param  int			$useempty          Affiche valeur vide dans liste

      *    	@return	string

      */

-    function select_dayofweek($selected='',$htmlname='weekid',$useempty=0)

+    function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)

     {

         // phpcs:enable

         global $langs;

@@ -851,17 +851,17 @@ 
      *      @param	string		$morecss			More Css

      *      @return string

      */

-    function select_month($selected='', $htmlname='monthid', $useempty=0, $longlabel=0, $morecss='')

+    function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = '')

     {

         // phpcs:enable

         global $langs;

 

         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array

+        if ($longlabel) $montharray = monthArray($langs, 0); // Get array

         else $montharray = monthArray($langs, 1);

 

-        $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

         if ($useempty)

         {

             $select_month .= '<option value="0">&nbsp;</option>';

@@ -898,10 +898,10 @@ 
      *  @param	string		$morecss		More CSS

      *  @return	string

      */

-    function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')

+    function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')

     {

         // phpcs:enable

-        print $this->selectyear($selected,$htmlname,$useempty,$min_year,$max_year,$offset,$invert,$option,$morecss);

+        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);

     }

 

     /**

@@ -918,41 +918,41 @@ 
      *  @param	string	$morecss		More css

      *  @return	string

      */

-    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')

+    function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')

     {

-        $out='';

+        $out = '';

 

-        $currentyear = date("Y")+$offset;

-        $max_year = $currentyear+$max_year;

-        $min_year = $currentyear-$min_year;

-        if(empty($selected) && empty($useempty)) $selected = $currentyear;

+        $currentyear = date("Y") + $offset;

+        $max_year = $currentyear + $max_year;

+        $min_year = $currentyear - $min_year;

+        if (empty($selected) && empty($useempty)) $selected = $currentyear;

 

-        $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';

-        if($useempty)

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';

+        if ($useempty)

         {

-        	$selected_html='';

+        	$selected_html = '';

             if ($selected == '') $selected_html = ' selected';

-            $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

+            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';

         }

-        if (! $invert)

+        if (!$invert)

         {

             for ($y = $max_year; $y >= $min_year; $y--)

             {

-                $selected_html='';

+                $selected_html = '';

                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';

-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

         else

         {

             for ($y = $min_year; $y <= $max_year; $y++)

             {

-                $selected_html='';

+                $selected_html = '';

                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';

-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

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

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

 

         return $out;

     }

@@ -969,10 +969,10 @@ 
      * @param  	int		$originid      	Id de l'origine

      * @return	void

      */

-    function form_address($page, $selected, $socid, $htmlname='address_id', $origin='', $originid='')

+    function form_address($page, $selected, $socid, $htmlname = 'address_id', $origin = '', $originid = '')

     {

         // phpcs:enable

-        global $langs,$conf;

+        global $langs, $conf;

         global $form;

 

         if ($htmlname != "none")

@@ -990,9 +990,9 @@ 
         {

             if ($selected)

             {

-                require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php';

-                $address=new Address($this->db);

-                $result=$address->fetch_address($selected);

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php';

+                $address = new Address($this->db);

+                $result = $address->fetch_address($selected);

                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';

             }

             else

@@ -1012,72 +1012,72 @@ 
      * 	@param	   String       $areacode    Code of area for pages ('0'=value for Home page)

      * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)

      */

-    static function getBoxesArea($user,$areacode)

+    static function getBoxesArea($user, $areacode)

     {

-        global $conf,$langs,$db;

+        global $conf, $langs, $db;

 

         include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';

 

-        $confuserzone='MAIN_BOXES_'.$areacode;

+        $confuserzone = 'MAIN_BOXES_'.$areacode;

 

         // $boxactivated will be array of boxes enabled into global setup

         // $boxidactivatedforuser will be array of boxes choosed by user

 

-        $selectboxlist='';

-        $boxactivated=InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone)?null:$user), array(), 0);	// Search boxes of common+user (or common only if user has no specific setup)

+        $selectboxlist = '';

+        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)

 

-        $boxidactivatedforuser=array();

-        foreach($boxactivated as $box)

+        $boxidactivatedforuser = array();

+        foreach ($boxactivated as $box)

         {

-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user

         }

 

         // Define selectboxlist

-        $arrayboxtoactivatelabel=array();

-        if (! empty($user->conf->$confuserzone))

+        $arrayboxtoactivatelabel = array();

+        if (!empty($user->conf->$confuserzone))

         {

-        	$boxorder='';

-        	$langs->load("boxes");	// Load label of boxes

-        	foreach($boxactivated as $box)

+        	$boxorder = '';

+        	$langs->load("boxes"); // Load label of boxes

+        	foreach ($boxactivated as $box)

         	{

-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);

+        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user

+        		$label = $langs->transnoentitiesnoconv($box->boxlabel);

         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

-        		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

+        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')

         		{

-        			$label=$label.' <span class="fa fa-bar-chart"></span>';

+        			$label = $label.' <span class="fa fa-bar-chart"></span>';

         		}

-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

+        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list

         	}

-            foreach($boxidactivatedforuser as $boxid)

+            foreach ($boxidactivatedforuser as $boxid)

         	{

-       			if (empty($boxorder)) $boxorder.='A:';

-  				$boxorder.=$boxid.',';

+       			if (empty($boxorder)) $boxorder .= 'A:';

+  				$boxorder .= $boxid.',';

         	}

 

         	//var_dump($boxidactivatedforuser);

 

         	// Class Form must have been already loaded

-        	$selectboxlist.='<!-- Form with select box list -->'."\n";

-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

-            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

-            $selectboxlist.='</form>';

-            if (! empty($conf->use_javascript_ajax))

+        	$selectboxlist .= '<!-- Form with select box list -->'."\n";

+			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

+			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';

+			$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';

+			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';

+			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';

+			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

+            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

+            $selectboxlist .= '</form>';

+            if (!empty($conf->use_javascript_ajax))

             {

-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-            	$selectboxlist.=ajax_combobox("boxcombo");

+            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+            	$selectboxlist .= ajax_combobox("boxcombo");

             }

         }

 

         // Javascript code for dynamic actions

-        if (! empty($conf->use_javascript_ajax))

+        if (!empty($conf->use_javascript_ajax))

         {

-	        $selectboxlist.='<script type="text/javascript" language="javascript">

+	        $selectboxlist .= '<script type="text/javascript" language="javascript">

 

 	        // To update list of activated boxes

 	        function updateBoxOrder(closing) {

@@ -1091,7 +1091,7 @@ 
 	        			async: false

 	        		});

 	        		// We force reload to be sure to get all boxes into list

-	        		window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=delbox\';

+	        		window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=delbox\';

 	        	}

 	        	else

 	        	{

@@ -1113,11 +1113,11 @@ 
 	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',

 	    			        async: false

 	    		        });

-	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;

+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;

 	                }

 	        	});';

-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

-	        	$selectboxlist.='

+	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';

+	        	$selectboxlist .= '

 

 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({

 	    	    	handle: \'.boxhandle\',

@@ -1142,80 +1142,80 @@ 
 

         	});'."\n";

 

-	        $selectboxlist.='</script>'."\n";

+	        $selectboxlist .= '</script>'."\n";

         }

 

         // Define boxlista and boxlistb

-        $nbboxactivated=count($boxidactivatedforuser);

+        $nbboxactivated = count($boxidactivatedforuser);

 

         if ($nbboxactivated)

         {

         	// Load translation files required by the page

-            $langs->loadLangs(array("boxes","projects"));

+            $langs->loadLangs(array("boxes", "projects"));

 

-        	$emptybox=new ModeleBoxes($db);

+        	$emptybox = new ModeleBoxes($db);

 

-            $boxlista.="\n<!-- Box left container -->\n";

+            $boxlista .= "\n<!-- Box left container -->\n";

 

             // Define $box_max_lines

-            $box_max_lines=5;

-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;

+            $box_max_lines = 5;

+            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;

 

-            $ii=0;

+            $ii = 0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^A/i',$box->box_order)) // column A

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^A/i', $box->box_order)) // column A

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

                     $box->loadBox($box_max_lines);

-                    $boxlista.= $box->outputBox();

+                    $boxlista .= $box->outputBox();

                 }

             }

 

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

             {

-            	$emptybox->box_id='A';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlista.= $emptybox->outputBox(array(),array());

+            	$emptybox->box_id = 'A';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlista .= $emptybox->outputBox(array(), array());

             }

-            $boxlista.= "<!-- End box left container -->\n";

+            $boxlista .= "<!-- End box left container -->\n";

 

-            $boxlistb.= "\n<!-- Box right container -->\n";

+            $boxlistb .= "\n<!-- Box right container -->\n";

 

-            $ii=0;

+            $ii = 0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^B/i',$box->box_order)) // colonne B

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^B/i', $box->box_order)) // colonne B

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

                     $box->loadBox($box_max_lines);

-                    $boxlistb.= $box->outputBox();

+                    $boxlistb .= $box->outputBox();

                 }

             }

 

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

             {

-            	$emptybox->box_id='B';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlistb.= $emptybox->outputBox(array(),array());

+            	$emptybox->box_id = 'B';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlistb .= $emptybox->outputBox(array(), array());

             }

 

-            $boxlistb.= "<!-- End box right container -->\n";

+            $boxlistb .= "<!-- End box right container -->\n";

         }

 

-        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

+        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

     }

 

 

@@ -1232,7 +1232,7 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag

      * 	@return	void

      */

-    function select_dictionary($htmlname,$dictionarytable,$keyfield='code',$labelfield='label',$selected='',$useempty=0,$moreattrib='')

+    function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')

     {

         // phpcs:enable

         global $langs, $conf;

@@ -1240,8 +1240,8 @@ 
         $langs->load("admin");

 

         $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;

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

-        $sql.= " ORDER BY ".$labelfield;

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

+        $sql .= " ORDER BY ".$labelfield;

 

         dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);

         $result = $this->db->query($sql);

@@ -1251,7 +1251,7 @@ 
             $i = 0;

             if ($num)

             {

-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';

+                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1))

                 {

                     print '<option value="-1">&nbsp;</option>';

Braces +149 added lines, -87 removed lines

@@ -74,7 +74,9 @@ 
         $sql = "SELECT rowid, label";

         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";

         $sql.= " WHERE type = '".$type."'";

-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

+		if (!empty($fk_user)) {
+		    $sql.=" AND fk_user=".$fk_user;
+		}
         $sql.= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

@@ -93,8 +95,7 @@ 
                 if ($selected == $obj->rowid)

                 {

                     print '<option value="'.$obj->rowid.'" selected>';

-                }

-                else

+                } else

                 {

                     print '<option value="'.$obj->rowid.'">';

                 }

@@ -103,8 +104,7 @@ 
                 $i++;

             }

             print "</select>";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -144,8 +144,7 @@ 
                 if ($selected == $obj->rowid)

                 {

                     print '<option value="'.$obj->rowid.'" selected>';

-                }

-                else

+                } else

                 {

                     print '<option value="'.$obj->rowid.'">';

                 }

@@ -154,8 +153,7 @@ 
                 $i++;

             }

             print "</select>";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -196,8 +194,7 @@ 
                     if ($selected && $selected == $obj->rowid)

                     {

                         print '<option value="'.$obj->rowid.'" selected>';

-                    }

-                    else

+                    } else

                     {

                         print '<option value="'.$obj->rowid.'">';

                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

@@ -210,8 +207,7 @@ 
             }

             print '</select>';

             return 0;

-        }

-        else

+        } else

         {

             dol_print_error($this->db);

             return 1;

@@ -256,8 +252,7 @@ 
     				if (($selected && $selected == $obj->taux) || $num == 1)

     				{

     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

-    				}

-    				else

+    				} else

     				{

     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

@@ -269,8 +264,7 @@ 
     		}

     		$out.='</select>';

     		return $out;

-    	}

-    	else

+    	} else

     	{

     		dol_print_error($this->db);

     		return '';

@@ -295,15 +289,16 @@ 
     {

         // phpcs:enable

         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';

-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';

+        if ($showempty) {
+            $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        }
 

         for ($i = $start ; $i <= $end ; $i += $increment)

         {

             if ($selected != '' && (int) $selected == $i)

             {

                 $return.= '<option value="'.$i.'" selected>';

-            }

-            else

+            } else

             {

                 $return.= '<option value="'.$i.'">';

             }

@@ -356,14 +351,19 @@ 
 

         // Print a select with each of them

         $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing

+        if ($showempty) {
+            $moreforfilter.='<option value="0">&nbsp;</option>';
+        }
+        // Should use -1 to say nothing

 

         if (is_array($tab_categs))

         {

             foreach ($tab_categs as $categ)

             {

                 $moreforfilter.='<option value="'.$categ['id'].'"';

-                if ($categ['id'] == $selected) $moreforfilter.=' selected';

+                if ($categ['id'] == $selected) {
+                    $moreforfilter.=' selected';
+                }
                 $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';

             }

         }

@@ -410,14 +410,20 @@ 
         }

         // Select each sales and print them in a select input

         $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $out.='<option value="0">&nbsp;</option>';

+        if ($showempty) {
+            $out.='<option value="0">&nbsp;</option>';
+        }
 

         // Get list of users allowed to be viewed

         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";

         $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";

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

-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;

-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;

+        if (empty($user->rights->user->user->lire)) {
+            $sql_usr.=" AND u.rowid = ".$user->id;
+        }
+        if (! empty($user->societe_id)) {
+            $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        }
         // Add existing sales representatives of thirdparty of external user

         if (empty($user->rights->user->user->lire) && $user->societe_id)

         {

@@ -438,7 +444,9 @@ 
 

                 $out.='<option value="'.$obj_usr->rowid.'"';

 

-                if ($obj_usr->rowid == $selected) $out.=' selected';

+                if ($obj_usr->rowid == $selected) {
+                    $out.=' selected';
+                }
 

                 $out.='>';

                 $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);

@@ -466,8 +474,7 @@ 
                 $out.='</option>';

             }

             $this->db->free($resql_usr);

-        }

-        else

+        } else

         {

             dol_print_error($this->db);

         }

@@ -503,15 +510,16 @@ 
         if ($tasksarray)

         {

         	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

-            if ($useempty) print '<option value="0">&nbsp;</option>';

+            if ($useempty) {
+                print '<option value="0">&nbsp;</option>';
+            }
             $j=0;

             $level=0;

             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

             print '</select>';

 

             print ajax_combobox($htmlname);

-        }

-        else

+        } else

         {

             print '<div class="warning">'.$langs->trans("NoProject").'</div>';

         }

@@ -545,20 +553,23 @@ 
 				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

 

                 // Break on a new project

-                if ($parent == 0)	// We are on a task at first level

+                if ($parent == 0) {
+                    // We are on a task at first level

                 {

                     if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project

                     {

-                        if ($i > 0) print '<option value="0" disabled>----------</option>';

+                        if ($i > 0) print '<option value="0" disabled>----------</option>';
+                }
                         print '<option value="'.$lines[$i]->fk_project.'_0"';

-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';

+                        if ($selectedproject == $lines[$i]->fk_project) {
+                            print ' selected';
+                        }
                         print '>';	// Project -> Task

                         print $langs->trans("Project").' '.$lines[$i]->projectref;

                         if (empty($lines[$i]->public))

                         {

                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

-                        }

-                        else

+                        } else

                         {

                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                         }

@@ -573,31 +584,41 @@ 
                 $newdisablechildoftaskid=$disablechildoftaskid;

 

                 // Print task

-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

+                if (isset($lines[$i]->id)) {
+                    // We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

                 {

                 	// Check if we must disable entry

-                	$disabled=0;

+                	$disabled=0;
+                }
                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

                 	{

                			$disabled++;

-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) {
+               			    $newdisablechildoftaskid=$lines[$i]->id;
+               			}
+               			// If task is child of a disabled parent, we will propagate id to disable next child too

                 	}

 

                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';

-                    if ($disabled) print ' disabled';

+                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) {
+                        print ' selected';
+                    }
+                    if ($disabled) {
+                        print ' disabled';
+                    }
                     print '>';

                     print $langs->trans("Project").' '.$lines[$i]->projectref;

                     print ' '.$lines[$i]->projectlabel;

                     if (empty($lines[$i]->public))

                     {

                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

-                    }

-                    else

+                    } else

                     {

                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                     }

-                    if ($lines[$i]->id) print ' > ';

+                    if ($lines[$i]->id) {
+                        print ' > ';
+                    }
                     for ($k = 0 ; $k < $level ; $k++)

                     {

                         print "&nbsp;&nbsp;&nbsp;";

@@ -607,7 +628,9 @@ 
                 }

 

                 $level++;

-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);

+                if ($lines[$i]->id) {
+                    $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                }
                 $level--;

             }

         }

@@ -626,12 +649,17 @@ 
     {

     	$textcolor='FFF';

     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-    	if(colorIsLight($color)) $textcolor='000';

+    	if(colorIsLight($color)) {
+    	    $textcolor='000';
+    	}
 

     	$color = colorArrayToHex(colorStringToArray($color,array()),'');

 

-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

-		else print $textifnotdefined;

+		if ($color) {
+		    print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
+		} else {
+		    print $textifnotdefined;
+		}
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -722,8 +750,7 @@ 
 	             </script>';

             }

             $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';

-        }

-        else  // In most cases, this is not used. We used instead function with no specific list of colors

+        } else  // In most cases, this is not used. We used instead function with no specific list of colors

         {

             if (empty($conf->dol_use_jmobile))

             {

@@ -744,7 +771,9 @@ 
             foreach ($arrayofcolors as $val)

             {

                 $out.= '<option value="'.$val.'"';

-                if ($set_color == $val) $out.= ' selected';

+                if ($set_color == $val) {
+                    $out.= ' selected';
+                }
                 $out.= '>'.$val.'</option>';

             }

             $out.= '</select>';

@@ -828,8 +857,7 @@ 
             if ($selected == $key)

             {

                 $select_week .= '<option value="'.$key.'" selected>';

-            }

-            else

+            } else

             {

                 $select_week .= '<option value="'.$key.'">';

             }

@@ -858,8 +886,13 @@ 
 

         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array

-        else $montharray = monthArray($langs, 1);

+        if ($longlabel) {
+            $montharray = monthArray($langs, 0);
+        }
+        // Get array

+        else {
+            $montharray = monthArray($langs, 1);
+        }
 

         $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

         if ($useempty)

@@ -871,8 +904,7 @@ 
             if ($selected == $key)

             {

                 $select_month .= '<option value="'.$key.'" selected>';

-            }

-            else

+            } else

             {

                 $select_month .= '<option value="'.$key.'">';

             }

@@ -925,13 +957,17 @@ 
         $currentyear = date("Y")+$offset;

         $max_year = $currentyear+$max_year;

         $min_year = $currentyear-$min_year;

-        if(empty($selected) && empty($useempty)) $selected = $currentyear;

+        if(empty($selected) && empty($useempty)) {
+            $selected = $currentyear;
+        }
 

         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';

         if($useempty)

         {

         	$selected_html='';

-            if ($selected == '') $selected_html = ' selected';

+            if ($selected == '') {
+                $selected_html = ' selected';
+            }
             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

         }

         if (! $invert)

@@ -939,16 +975,19 @@ 
             for ($y = $max_year; $y >= $min_year; $y--)

             {

                 $selected_html='';

-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

-        }

-        else

+        } else

         {

             for ($y = $min_year; $y <= $max_year; $y++)

             {

                 $selected_html='';

-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

@@ -985,8 +1024,7 @@ 
             $langs->load("companies");

             print ' &nbsp; <a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';

             print '</form>';

-        }

-        else

+        } else

         {

             if ($selected)

             {

@@ -994,8 +1032,7 @@ 
                 $address=new Address($this->db);

                 $result=$address->fetch_address($selected);

                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';

-            }

-            else

+            } else

             {

                 print "&nbsp;";

             }

@@ -1029,7 +1066,10 @@ 
         $boxidactivatedforuser=array();

         foreach($boxactivated as $box)

         {

-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) {
+        	    $boxidactivatedforuser[$box->id]=$box->id;
+        	}
+        	// We keep only boxes to show for user

         }

 

         // Define selectboxlist

@@ -1040,7 +1080,10 @@ 
         	$langs->load("boxes");	// Load label of boxes

         	foreach($boxactivated as $box)

         	{

-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

+        		if (! empty($boxidactivatedforuser[$box->id])) {
+        		    continue;
+        		}
+        		// Already visible for user

         		$label=$langs->transnoentitiesnoconv($box->boxlabel);

         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

         		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

@@ -1051,7 +1094,9 @@ 
         	}

             foreach($boxidactivatedforuser as $boxid)

         	{

-       			if (empty($boxorder)) $boxorder.='A:';

+       			if (empty($boxorder)) {
+       			    $boxorder.='A:';
+       			}
   				$boxorder.=$boxid.',';

         	}

 

@@ -1065,7 +1110,9 @@ 
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

 			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

 			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

-            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

+            if (empty($conf->use_javascript_ajax)) {
+                $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            }
             $selectboxlist.='</form>';

             if (! empty($conf->use_javascript_ajax))

             {

@@ -1116,7 +1163,9 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;

 	                }

 	        	});';

-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

+	        	if (! count($arrayboxtoactivatelabel)) {
+	        	    $selectboxlist.='jQuery("#boxcombo").hide();';
+	        	}
 	        	$selectboxlist.='

 

 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({

@@ -1159,16 +1208,25 @@ 
 

             // Define $box_max_lines

             $box_max_lines=5;

-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;

+            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) {
+                $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            }
 

             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^A/i',$box->box_order)) // column A

+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+				    $box->box_order='A'.sprintf("%02d",($ii+1));
+				}
+				// When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^A/i',$box->box_order)) {
+            	    // column A

                 {

-                    $ii++;

+                    $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

@@ -1191,11 +1249,18 @@ 
             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^B/i',$box->box_order)) // colonne B

+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+            	    $box->box_order='B'.sprintf("%02d",($ii+1));
+            	}
+            	// When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^B/i',$box->box_order)) {
+            	    // colonne B

                 {

-                    $ii++;

+                    $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

@@ -1263,8 +1328,7 @@ 
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)

                     {

                         print '<option value="'.$obj->$keyfield.'" selected>';

-                    }

-                    else

+                    } else

                     {

                         print '<option value="'.$obj->$keyfield.'">';

                     }

@@ -1273,13 +1337,11 @@ 
                     $i++;

                 }

                 print "</select>";

-            }

-            else

+            } else

 			{

                 print $langs->trans("DictionaryEmpty");

             }

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

Base/AlixarView.php

Spacing +92 added lines, -92 removed lines

@@ -116,7 +116,7 @@ 
 // html header
         $this->top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"' . ($morecssonbody ? ' class="' . $morecssonbody . '"' : '') . '>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 // top menu and left menu area
         if (empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
@@ -124,7 +124,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu)) {
-            $this->left_menu('', $help_url, '', '', 1, $title, 1);  // $menumanager is retreived with a global $menumanager inside this function
+            $this->left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
         }
 
 // main area
@@ -175,13 +175,13 @@ 
          * Top menu
          */
         if ((empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
-            print "\n" . '<!-- Start top horizontal -->' . "\n";
+            print "\n".'<!-- Start top horizontal -->'."\n";
 
-            print '<div class="side-nav-vert' . (DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '') . '"><div id="id-top">';  // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+            print '<div class="side-nav-vert'.(DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 // Show menu entries
-            print '<div id="tmenu_tooltip' . (empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert') . '" class="tmenu">' . "\n";
+            print '<div id="tmenu_tooltip'.(empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
             $this->menumanager->atarget = $target;
-            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks));      // This contains a \n
+            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks)); // This contains a \n
             print "</div>\n";
 
 // Define link to login card
@@ -189,34 +189,34 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                    if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                        $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
 
             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+                $appli .= "<br>".Globals::$langs->trans("LevelOfFeature").': '.Globals::$conf->global->MAIN_FEATURES_LEVEL;
 
 $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 //$logouthtmltext=$appli.'<br>';
                 if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
-                    $logouthtmltext .= Globals::$langs->trans("Logout") . '<br>';
+                    $logouthtmltext .= Globals::$langs->trans("Logout").'<br>';
 
 //$logouttext .='<a accesskey="l" href="'.DOL_BASE_URI.'/user/logout.php">';
-                    $logouttext .= '<a accesskey="l" href="' . BASE_URI . '?controller=user&method=logout">';
+                    $logouttext .= '<a accesskey="l" href="'.BASE_URI.'?controller=user&method=logout">';
 //$logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                     $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
                     $logouttext .= '</a>';
                 } else {
                     $logouthtmltext .= Globals::$langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-                    $logouttext .= img_picto(Globals::$langs->trans('Logout') . ":" . Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                    $logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 }
             }
 
-            print '<div class="login_block">' . "\n";
+            print '<div class="login_block">'."\n";
 
 // Add login user link
             $toprightmenu .= '<div class="login_block_user">';
@@ -227,18 +227,18 @@ 
             $toprightmenu .= Globals::$user->getNomUrl($mode, '', 1, 0, 11, 0, (Globals::$user->firstname ? 'firstname' : -1), 'atoplogin');
             $toprightmenu .= '</div></div>';
 
-            $toprightmenu .= '</div>' . "\n";
+            $toprightmenu .= '</div>'."\n";
 
             $toprightmenu .= '<div class="login_block_other">';
 
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
             $parameters = array();
-            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
                 if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
+                    $toprightmenu .= Globals::$hookManager->resPrint; // add
                 else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
+                    $toprightmenu = Globals::$hookManager->resPrint; // replace
             }
             else {
                 $toprightmenu .= $result; // For backward compatibility
@@ -247,7 +247,7 @@ 
 // Link to module builder
             if (!empty(Globals::$conf->modulebuilder->enabled)) {
 //$text = '<a href="' . DOL_BASE_URI . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-                $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+                $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 //$text.= img_picto(":".Globals::$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-bug atoplogin"></span>';
                 $text .= '</a>';
@@ -261,12 +261,12 @@ 
                 if (is_array($_POST)) {
                     foreach ($_POST as $key => $value) {
                         if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
-                            $qs .= '&' . $key . '=' . urlencode($value);
+                            $qs .= '&'.$key.'='.urlencode($value);
                         }
                     }
                 }
-                $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
-                $text = '<a href="' . dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?' . $qs . ($qs ? '&' : '') . 'optioncss=print" target="_blank">';
+                $qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+                $text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 //$text.= img_picto(":".Globals::$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-print atoplogin"></span>';
                 $text .= '</a>';
@@ -295,12 +295,12 @@ 
                     $text = '';
                     if (!empty(Globals::$conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                         Globals::$langs->load('admin');
-$appli .= '<br>' . Globals::$langs->trans("Database") . ': ' . $db->database_name;
+$appli .= '<br>'.Globals::$langs->trans("Database").': '.$db->database_name;
 }
-                    $title = $appli . '<br>';
+                    $title = $appli.'<br>';
                     $title .= Globals::$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
                     if ($mode == 'wiki') {
-                        $title .= ' - ' . Globals::$langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                        $title .= ' - '.Globals::$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
                     }
                     $text .= '<a class="help" target="_blank" rel="noopener" href="';
                     if ($mode == 'wiki') {
@@ -326,7 +326,7 @@ 
 
             print $toprightmenu;
 
-            print "</div>\n";  // end div class="login_block"
+            print "</div>\n"; // end div class="login_block"
 
             print '</div></div>';
 
@@ -335,7 +335,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
     }
 
     /**
@@ -367,7 +367,7 @@ 
 // Instantiate hooks of thirdparty module
             Globals::$hookManager->initHooks(array('searchform', 'leftblock'));
 
-            print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
+            print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
             if (Globals::$conf->browser->layout == 'phone')
                 Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
@@ -379,7 +379,7 @@ 
             }
             $selected = -1;
             $usedbyinclude = 1;
-            include_once DOL_BASE_PATH . '/core/ajax/selectsearchbox.php'; // This set $arrayresult
+            include_once DOL_BASE_PATH.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
             if (Globals::$conf->use_javascript_ajax && empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
 //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_BASE_URI.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, Globals::$langs->trans("Search"), 1);
@@ -394,7 +394,7 @@ 
 // Execute hook printSearchForm
             $parameters = array('searchform' => $searchform);
 
-            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
             } else
@@ -402,10 +402,10 @@ 
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
-                $urltosearch = DOL_BASE_URI . '/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div></div>';
-            } elseif (Globals::$conf->use_javascript_ajax &&!empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+                $urltosearch = DOL_BASE_URI.'/core/search_page.php?showtitlebefore=1';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div></div>';
+            } elseif (Globals::$conf->use_javascript_ajax && !empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
 $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -418,16 +418,16 @@ 
 
 // Define $bookmarks
             if (!empty(Globals::$conf->bookmark->enabled) && Globals::$user->rights->bookmark->lire) {
-                include_once DOL_BASE_PATH . '/bookmarks/bookmarks.lib.php';
+                include_once DOL_BASE_PATH.'/bookmarks/bookmarks.lib.php';
                 Globals::$langs->load("bookmarks");
 
                 $bookmarks = printBookmarksList($db, Globals::$langs);
 }
 
 // Left column
-            print '<!-- Begin left menu -->' . "\n";
+            print '<!-- Begin left menu -->'."\n";
 
-            print '<div class="vmenu"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"') . '>' . "\n\n";
+            print '<div class="vmenu"'.(empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 // Show left menu with other forms
             $this->menumanager->menu_array = $menu_array_before;
@@ -436,7 +436,7 @@ 
 // Dolibarr version + help + bug report link
             print "\n";
             print "<!-- Begin Help Block-->\n";
-            print '<div id="blockvmenuhelp" class="blockvmenuhelp">' . "\n";
+            print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 // Version
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
@@ -458,15 +458,15 @@ 
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                            $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                     } else
-                        $appli .= " " . DOL_VERSION;
+                        $appli .= " ".DOL_VERSION;
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
                 if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                    print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
                 else
                     print '<span class="help">';
                 print $appli;
@@ -474,12 +474,12 @@ 
                     print '</a>';
                 else
                     print '</span>';
-                print '</div>' . "\n";
+                print '</div>'."\n";
             }
 
 // Link to bugtrack
             if (!empty(Globals::$conf->global->MAIN_BUGTRACK_ENABLELINK)) {
-                require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+                require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
                 $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
                 $bugbaseurl .= '?title=';
@@ -488,16 +488,16 @@ 
                 $bugbaseurl .= urlencode("# Bug\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Environment\n");
-                $bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-                $bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-                $bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-                $bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-                $bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-                $bugbaseurl .= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+                $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+                $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+                $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+                $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+                $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+                $bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Report\n");
                 print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-                print '<a class="help" target="_blank" rel="noopener" href="' . $bugbaseurl . '">' . Globals::$langs->trans("FindBug") . '</a>';
+                print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.Globals::$langs->trans("FindBug").'</a>';
                 print '</div>';
             }
 
@@ -511,14 +511,14 @@ 
 
 // Execute hook printLeftBlock
             $parameters = array();
-            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
             print Globals::$hookManager->resPrint;
 
             print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
         }
 
         print "\n";
-        print '<!-- Begin right area -->' . "\n";
+        print '<!-- Begin right area -->'."\n";
 
         if (empty($leftmenuwithoutmainarea))
             main_area($title);
@@ -539,7 +539,7 @@ 
 
         print "\n";
 
-        print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
+        print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
         if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
             print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
@@ -605,17 +605,17 @@ 
         // global Globals::$conf, Globals::$langs, Globals::$user;
 
         $ret = '';
-        $ret .= '<form action="' . $urlaction . '" method="post" class="searchform">';
-        $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+        $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         $ret .= '<input type="hidden" name="mode" value="search">';
-        $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
+        $ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag(Globals::$user->login).'">';
         if ($showtitlebefore)
-            $ret .= $title . ' ';
-        $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
-        $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
-        $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
-        $ret .= ' placeholder="' . strip_tags($title) . '"';
-        $ret .= ' name="' . $htmlinputname . '" id="' . $prefhtmlinputname . $htmlinputname . '" />';
+            $ret .= $title.' ';
+        $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+        $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+        $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+        $ret .= ' placeholder="'.strip_tags($title).'"';
+        $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
 //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.Globals::$langs->trans("Go").'">';
         $ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
         $ret .= '<span class="fa fa-search"></span>';
@@ -640,7 +640,7 @@ 
         // global $delayedhtmlcontent;
         // global $contextpage, $page, $limit;
 
-        $ext = 'layout=' . Globals::$conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.Globals::$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events($disabledoutputofmessages);
@@ -650,15 +650,15 @@ 
         if (is_object(Globals::$user) && !empty(Globals::$user->lastsearch_values_tmp) && is_array(Globals::$user->lastsearch_values_tmp)) {
 // Clean and save data
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
-                unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
+                unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
                     if (empty($val['sortfield']))
                         unset($val['sortfield']);
                     if (empty($val['sortorder']))
                         unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
-                    $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
-                    unset($_SESSION['lastsearch_values_' . $key]);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
@@ -667,37 +667,37 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
         if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
-            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
             if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+                $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
             if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+                $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
             if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+                $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
-            unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
         }
 
 // Core error message
         if (!empty(Globals::$conf->global->MAIN_CORE_ERROR)) {
 // Ajax version
             if (Globals::$conf->use_javascript_ajax) {
-                $title = img_warning() . ' ' . Globals::$langs->trans('CoreErrorTitle');
+                $title = img_warning().' '.Globals::$langs->trans('CoreErrorTitle');
 print ajax_dialog($title, Globals::$langs->trans('CoreErrorMessage'));
 }
 // html version
             else {
-                $msg = img_warning() . ' ' . Globals::$langs->trans('CoreErrorMessage');
-                print '<div class="error">' . $msg . '</div>';
+                $msg = img_warning().' '.Globals::$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
             }
 
 //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
@@ -705,17 +705,17 @@ 
 
         print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
         if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+            print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+            print '</div> <!-- End div id-container -->'."\n"; // End div container
 
         print "\n";
         if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+            print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
 
@@ -723,8 +723,8 @@ 
             print $delayedhtmlcontent;
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
-            print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_foot.js&lang=' . Globals::$langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_foot.js&lang='.Globals::$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
         }
 
 // Wrapper to add log when clicking on download or preview
@@ -736,7 +736,7 @@ 
                 <script type="text/javascript">
                     jQuery(document).ready(function () {
                         $('a.documentpreview').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -745,7 +745,7 @@ 
                             );
                         });
                         $('a.documentdownload').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -761,7 +761,7 @@ 
 
 // A div for the address popup
         print "\n<!-- A div to allow dialog popup -->\n";
-        print '<div id="dialogforpopup" style="display: none;"></div>' . "\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
         print "</body>\n";
 

Braces +124 added lines, -81 removed lines

@@ -189,15 +189,20 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
 
-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            }
 
 $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -235,12 +240,15 @@ 
             $parameters = array();
             $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
-                if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
-                else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
-            }
-            else {
+                if ($result == 0) {
+                                    $toprightmenu .= Globals::$hookManager->resPrint;
+                }
+                // add
+                else {
+                                    $toprightmenu = Globals::$hookManager->resPrint;
+                }
+                // replace
+            } else {
                 $toprightmenu .= $result; // For backward compatibility
             }
 
@@ -334,8 +342,9 @@ 
             print "<!-- End top horizontal menu -->\n\n";
         }
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        }
     }
 
     /**
@@ -360,8 +369,9 @@ 
         $searchform = '';
         $bookmarks = '';
 
-        if (!empty($menu_array_before))
-            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        if (!empty($menu_array_before)) {
+                    dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 // Instantiate hooks of thirdparty module
@@ -369,8 +379,10 @@ 
 
             print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-            if (Globals::$conf->browser->layout == 'phone')
-                Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+            if (Globals::$conf->browser->layout == 'phone') {
+                            Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+            }
+            // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
 print "\n";
 
@@ -397,8 +409,9 @@ 
             $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
-            } else
-                $searchform = Globals::$hookManager->resPrint;
+            } else {
+                            $searchform = Globals::$hookManager->resPrint;
+            }
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
@@ -442,38 +455,49 @@ 
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
                 $doliurl = 'https://www.dolibarr.org';
 //local communities
-                if (preg_match('/fr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.fr';
-                if (preg_match('/es/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.es';
-                if (preg_match('/de/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.de';
-                if (preg_match('/it/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.it';
-                if (preg_match('/gr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.gr';
+                if (preg_match('/fr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.fr';
+                }
+                if (preg_match('/es/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.es';
+                }
+                if (preg_match('/de/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.de';
+                }
+                if (preg_match('/it/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.it';
+                }
+                if (preg_match('/gr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.gr';
+                }
 
                 $appli = constant('DOL_APPLICATION_TITLE');
                 if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                    } else
-                        $appli .= " " . DOL_VERSION;
-                } else
-                    $appli .= " " . DOL_VERSION;
+                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                                    $appli .= " (" . DOL_VERSION . ")";
+                        }
+                        // If new title contains a version that is different than core
+                    } else {
+                                            $appli .= " " . DOL_VERSION;
+                    }
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-                if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-                else
-                    print '<span class="help">';
+                if ($doliurl) {
+                                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                } else {
+                                    print '<span class="help">';
+                }
                 print $appli;
-                if ($doliurl)
-                    print '</a>';
-                else
-                    print '</span>';
+                if ($doliurl) {
+                                    print '</a>';
+                } else {
+                                    print '</span>';
+                }
                 print '</div>' . "\n";
             }
 
@@ -520,8 +544,9 @@ 
         print "\n";
         print '<!-- Begin right area -->' . "\n";
 
-        if (empty($leftmenuwithoutmainarea))
-            main_area($title);
+        if (empty($leftmenuwithoutmainarea)) {
+                    main_area($title);
+        }
     }
 
     /**
@@ -534,16 +559,18 @@ 
     {
 // global Globals::$conf, Globals::$langs;
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-    print '<div id="id-right">';
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+        }
 
         print "\n";
 
         print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-            print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+                    print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        }
+        }
 
     /**
      *  Return helpbaseurl, helppage and mode
@@ -567,18 +594,21 @@ 
 // If WIKI URL
             if (preg_match('/^es/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (preg_match('/^fr/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (empty($helppage)) { // If help page not already found
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             $mode = 'wiki';
         }
@@ -609,8 +639,9 @@ 
         $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         $ret .= '<input type="hidden" name="mode" value="search">';
         $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
-        if ($showtitlebefore)
-            $ret .= $title . ' ';
+        if ($showtitlebefore) {
+                    $ret .= $title . ' ';
+        }
         $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
         $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
         $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -652,10 +683,12 @@ 
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -666,8 +699,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -675,12 +709,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != Globals::$conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -707,20 +744,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";