alxarafe / alixar

Helpers/AlixarDispatcher.php

Spacing +12 added lines, -12 removed lines

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

         parent::__construct();

 

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

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

         $this->nameSpaces[] = 'Alixar';

         $this->path = null;

     }

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

           define('BASE_URI', SITE_URL . APP_URI);

          */

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

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

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

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

         //define('DOL_DOCUMENT_ROOT', DOL_BASE_PATH);

 

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

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

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

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

         /**

dolibarr/htdocs/admin/modules.php

Spacing +148 added lines, -148 removed lines

@@ -30,13 +30,13 @@ 
  */

 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>

 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');

-require DOL_BASE_PATH . '/main.inc.php';

+require DOL_BASE_PATH.'/main.inc.php';

 

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

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

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

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

-require_once DOL_DOCUMENT_ROOT . '/admin/dolistore/class/dolistore.class.php';

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

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

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

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

+require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';

 

 // Load translation files required by the page

 $langs->loadLangs(array("errors", "admin", "modulebuilder"));

@@ -87,16 +87,16 @@ 
 $param = '';

 if (!GETPOST('buttonreset', 'alpha')) {

     if ($search_keyword)

-        $param .= '&search_keyword=' . urlencode($search_keyword);

+        $param .= '&search_keyword='.urlencode($search_keyword);

     if ($search_status && $search_status != '-1')

-        $param .= '&search_status=' . urlencode($search_status);

+        $param .= '&search_status='.urlencode($search_status);

     if ($search_nature && $search_nature != '-1')

-        $param .= '&search_nature=' . urlencode($search_nature);

+        $param .= '&search_nature='.urlencode($search_nature);

     if ($search_version && $search_version != '-1')

-        $param .= '&search_version=' . urlencode($search_version);

+        $param .= '&search_version='.urlencode($search_version);

 }

 

-$dirins = DOL_DOCUMENT_ROOT . '/custom';

+$dirins = DOL_DOCUMENT_ROOT.'/custom';

 $urldolibarrmodules = 'https://www.dolistore.com/';

 

 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

@@ -110,7 +110,7 @@ 
 $formconfirm = '';

 

 $parameters = array();

-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

 if ($reshook < 0)

     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

 

@@ -126,7 +126,7 @@ 
 

     // $original_file should match format module_modulename-x.y[.z].zip

     $original_file = basename($_FILES["fileinstall"]["name"]);

-    $newfile = $conf->admin->dir_temp . '/' . $original_file . '/' . $original_file;

+    $newfile = $conf->admin->dir_temp.'/'.$original_file.'/'.$original_file;

 

     if (!$original_file) {

         $langs->load("Error");

@@ -147,19 +147,19 @@ 
 

     if (!$error) {

         if ($original_file) {

-            @dol_delete_dir_recursive($conf->admin->dir_temp . '/' . $original_file);

-            dol_mkdir($conf->admin->dir_temp . '/' . $original_file);

+            @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file);

+            dol_mkdir($conf->admin->dir_temp.'/'.$original_file);

         }

 

-        $tmpdir = preg_replace('/\.zip$/', '', $original_file) . '.dir';

+        $tmpdir = preg_replace('/\.zip$/', '', $original_file).'.dir';

         if ($tmpdir) {

-            @dol_delete_dir_recursive($conf->admin->dir_temp . '/' . $tmpdir);

-            dol_mkdir($conf->admin->dir_temp . '/' . $tmpdir);

+            @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir);

+            dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir);

         }

 

         $result = dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'], $newfile, 1, 0, $_FILES['fileinstall']['error']);

         if ($result > 0) {

-            $result = dol_uncompress($newfile, $conf->admin->dir_temp . '/' . $tmpdir);

+            $result = dol_uncompress($newfile, $conf->admin->dir_temp.'/'.$tmpdir);

 

             if (!empty($result['error'])) {

                 $langs->load("errors");

@@ -170,26 +170,26 @@ 
                 $modulename = preg_replace('/module_/', '', $original_file);

                 $modulename = preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename);

                 // Search dir $modulename

-                $modulenamedir = $conf->admin->dir_temp . '/' . $tmpdir . '/' . $modulename;

+                $modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;

                 //var_dump($modulenamedir);

                 if (!dol_is_dir($modulenamedir)) {

-                    $modulenamedir = $conf->admin->dir_temp . '/' . $tmpdir . '/htdocs/' . $modulename;

+                    $modulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;

                     //var_dump($modulenamedir);

                     if (!dol_is_dir($modulenamedir)) {

-                        setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat") . '<br>Dir not found: ' . $conf->admin->dir_temp . '/' . $tmpdir . '/' . $modulename . '<br>' . $conf->admin->dir_temp . '/' . $tmpdir . '/htdocs/' . $modulename, null, 'errors');

+                        setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat").'<br>Dir not found: '.$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename.'<br>'.$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename, null, 'errors');

                         $error++;

                     }

                 }

 

                 if (!$error) {

                     //var_dump($dirins);

-                    @dol_delete_dir_recursive($dirins . '/' . $modulename);

-                    dol_syslog("Uncompress of module file is a success. We copy it from " . $modulenamedir . " into target dir " . $dirins . '/' . $modulename);

-                    $result = dolCopyDir($modulenamedir, $dirins . '/' . $modulename, '0444', 1);

+                    @dol_delete_dir_recursive($dirins.'/'.$modulename);

+                    dol_syslog("Uncompress of module file is a success. We copy it from ".$modulenamedir." into target dir ".$dirins.'/'.$modulename);

+                    $result = dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);

                     if ($result <= 0) {

-                        dol_syslog('Failed to call dolCopyDir result=' . $result . " with param " . $modulenamedir . " and " . $dirins . '/' . $modulename, LOG_WARNING);

+                        dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulename, LOG_WARNING);

                         $langs->load("errors");

-                        setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins . '/' . $modulename), null, 'errors');

+                        setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulename), null, 'errors');

                         $error++;

                     }

                 }

@@ -200,7 +200,7 @@ 
     }

 

     if (!$error) {

-        setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT . '/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home") . ' - ' . $langs->transnoentitiesnoconv("Setup") . ' - ' . $langs->transnoentitiesnoconv("Modules")), null, 'warnings');

+        setEventMessages($langs->trans("SetupIsReadyForUse", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules")), null, 'warnings');

     }

 }

 

@@ -211,7 +211,7 @@ 
     else {

         //var_dump($resarray);exit;

         if ($resarray['nbperms'] > 0) {

-            $tmpsql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "user WHERE admin <> 1";

+            $tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";

             $resqltmp = $db->query($tmpsql);

             if ($resqltmp) {

                 $obj = $db->fetch_object($resqltmp);

@@ -225,7 +225,7 @@ 
         }

     }

     //header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));

-    header("Location: ?controller=admin&method=modules&mode=" . $mode . $param . ($page_y ? '&page_y=' . $page_y : ''));

+    header("Location: ?controller=admin&method=modules&mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));

     exit;

 }

 else if ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {

@@ -234,7 +234,7 @@ 
         setEventMessages($result, null, 'errors');

     }

     //header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));

-    header("Location: ?controller=admin&method=modules&mode=" . $mode . $param . ($page_y ? '&page_y=' . $page_y : ''));

+    header("Location: ?controller=admin&method=modules&mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));

     exit;

 }

 

@@ -262,9 +262,9 @@ 
 // Search modules dirs

 $modulesdir = dolGetModulesDirs();

 

-$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("Core"), 'external' => $langs->transnoentitiesnoconv("External") . ' - [' . $langs->trans("AllPublishers") . ']');

-$arrayofwarnings = array();    // Array of warning each module want to show when activated

-$arrayofwarningsext = array();    // Array of warning each module want to show when we activate an external module

+$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("Core"), 'external' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');

+$arrayofwarnings = array(); // Array of warning each module want to show when activated

+$arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module

 $filename = array();

 $modules = array();

 $orders = array();

@@ -277,37 +277,37 @@ 
 foreach ($modulesdir as $dir) {

     // Load modules attributes in arrays (name, numero, orders) from dir directory

     //print $dir."\n<br>";

-    dol_syslog("Scan directory " . $dir . " for module descriptor files (modXXX.class.php)");

+    dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");

     $handle = @opendir($dir);

     if (is_resource($handle)) {

         while (($file = readdir($handle)) !== false) {

             //print "$i ".$file."\n<br>";

-            if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {

+            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {

                 $modName = substr($file, 0, dol_strlen($file) - 10);

 

                 if ($modName) {

                     if (!empty($modNameLoaded[$modName])) {   // In cache of already loaded modules ?

-                        $mesg = "Error: Module " . $modName . " was found twice: Into " . $modNameLoaded[$modName] . " and " . $dir . ". You probably have an old file on your disk.<br>";

+                        $mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";

                         setEventMessages($mesg, null, 'warnings');

                         dol_syslog($mesg, LOG_ERR);

                         continue;

                     }

 

                     try {

-                        $res = include_once $dir . $file;     // A class already exists in a different file will send a non catchable fatal error.

+                        $res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.

                         if (class_exists($modName)) {

                             try {

                                 $objMod = new $modName($db);

                                 $modNameLoaded[$modName] = $dir;

                                 if (!$objMod->numero > 0 && $modName != 'modUser') {

-                                    dol_syslog('The module descriptor ' . $modName . ' must have a numero property', LOG_ERR);

+                                    dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);

                                 }

                                 $j = $objMod->numero;

 

                                 $modulequalified = 1;

 

                                 // We discard modules according to features level (PS: if module is activated we always show it)

-                                $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

+                                $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

                                 if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2)))

                                     $modulequalified = 0;

                                 if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1)))

@@ -324,9 +324,9 @@ 
                                     $external = ($objMod->isCoreOrExternalModule() == 'external');

                                     if ($external) {

                                         if ($publisher) {

-                                            $arrayofnatures['external_' . $publisher] = $langs->trans("External") . ' - ' . $publisher;

+                                            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;

                                         } else {

-                                            $arrayofnatures['external_'] = $langs->trans("External") . ' - ' . $langs->trans("UnknownPublishers");

+                                            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");

                                         }

                                     }

                                     ksort($arrayofnatures);

@@ -347,7 +347,7 @@ 
 

                                     $moduleposition = ($objMod->module_position ? $objMod->module_position : '50');

                                     if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external')) {

-                                        $moduleposition = '80';  // External modules at end by default

+                                        $moduleposition = '80'; // External modules at end by default

                                     }

 

                                     // Add list of warnings to show into arrayofwarnings and arrayofwarningsext

@@ -358,7 +358,7 @@ 
                                         $arrayofwarningsext[$modName] = $objMod->warnings_activation_ext;

                                     }

 

-                                    $orders[$i] = $familyinfo[$familykey]['position'] . "_" . $familykey . "_" . $moduleposition . "_" . $j;   // Sort by family, then by module position then number

+                                    $orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number

                                     $dirmod[$i] = $dir;

                                     //print $i.'-'.$dirmod[$i].'<br>';

                                     // Set categ[$i]

@@ -366,28 +366,28 @@ 
                                     if ($objMod->version == 'development' || $objMod->version == 'experimental')

                                         $specialstring = 'expdev';

                                     if (isset($categ[$specialstring]))

-                                        $categ[$specialstring] ++;     // Array of all different modules categories

+                                        $categ[$specialstring]++; // Array of all different modules categories

                                     else

                                         $categ[$specialstring] = 1;

                                     $j++;

                                     $i++;

                                 } else

-                                    dol_syslog("Module " . get_class($objMod) . " not qualified");

+                                    dol_syslog("Module ".get_class($objMod)." not qualified");

                             } catch (Exception $e) {

-                                dol_syslog("Failed to load " . $dir . $file . " " . $e->getMessage(), LOG_ERR);

+                                dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);

                             }

                         } else {

-                            print "Warning bad descriptor file : " . $dir . $file . " (Class " . $modName . " not found into file)<br>";

+                            print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";

                         }

                     } catch (Exception $e) {

-                        dol_syslog("Failed to load " . $dir . $file . " " . $e->getMessage(), LOG_ERR);

+                        dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);

                     }

                 }

             }

         }

         closedir($handle);

     } else {

-        dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);

+        dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);

     }

 }

 

@@ -399,7 +399,7 @@ 
             $langs->loadLangs($objMod->langfiles);

 

         $form = new Form($db);

-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?value=' . $value . '&mode=' . $mode . $param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);

+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);

     }

 }

 

@@ -413,18 +413,18 @@ 
 $nbofactivatedmodules = count($conf->modules);

 $moreinfo = $langs->trans("TotalNumberOfActivatedModules", ($nbofactivatedmodules - 1), count($modules));

 if ($nbofactivatedmodules <= 1)

-    $moreinfo .= ' ' . img_warning($langs->trans("YouMustEnableOneModule"));

+    $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));

 print load_fiche_titre($langs->trans("ModulesSetup"), $moreinfo, 'title_setup');

 

 // Start to show page

 if ($mode == 'common')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDesc") . "</span><br>\n";

+    print '<span class="opacitymedium">'.$langs->trans("ModulesDesc")."</span><br>\n";

 if ($mode == 'marketplace')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesMarketPlaceDesc") . "</span><br>\n";

+    print '<span class="opacitymedium">'.$langs->trans("ModulesMarketPlaceDesc")."</span><br>\n";

 if ($mode == 'deploy')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules")) . "</span><br>\n";

+    print '<span class="opacitymedium">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."</span><br>\n";

 if ($mode == 'develop')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDevelopDesc") . "</span><br>\n";

+    print '<span class="opacitymedium">'.$langs->trans("ModulesDevelopDesc")."</span><br>\n";

 

 $head = modules_prepare_head();

 

@@ -435,22 +435,22 @@ 
 if ($mode == 'common') {

     dol_set_focus('#search_keyword');

 

-    print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';

+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';

     if ($optioncss != '')

-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';

-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-    print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';

-    print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

-    print '<input type="hidden" name="page" value="' . $page . '">';

+        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

+    print '<input type="hidden" name="page" value="'.$page.'">';

 

     dol_fiche_head($head, $mode, '', -1);

 

     $moreforfilter = '';

     $moreforfilter .= '<div class="divsearchfield">';

-    $moreforfilter .= $langs->trans('Keyword') . ': <input type="text" id="search_keyword" name="search_keyword" value="' . dol_escape_htmltag($search_keyword) . '">';

+    $moreforfilter .= $langs->trans('Keyword').': <input type="text" id="search_keyword" name="search_keyword" value="'.dol_escape_htmltag($search_keyword).'">';

     $moreforfilter .= '</div>';

     $moreforfilter .= '<div class="divsearchfield">';

-    $moreforfilter .= $langs->trans('Origin') . ': ' . $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1);

+    $moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1);

     $moreforfilter .= '</div>';

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

         $array_version = array('stable' => $langs->transnoentitiesnoconv("Stable"));

@@ -461,23 +461,23 @@ 
         if ($conf->global->MAIN_FEATURES_LEVEL > 1)

             $array_version['development'] = $langs->trans("Development");

         $moreforfilter .= '<div class="divsearchfield">';

-        $moreforfilter .= $langs->trans('Version') . ': ' . $form->selectarray('search_version', $array_version, $search_version, 1);

+        $moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1);

         $moreforfilter .= '</div>';

     }

     $moreforfilter .= '<div class="divsearchfield">';

-    $moreforfilter .= $langs->trans('Status') . ': ' . $form->selectarray('search_status', array('active' => $langs->transnoentitiesnoconv("Enabled"), 'disabled' => $langs->transnoentitiesnoconv("Disabled")), $search_status, 1);

+    $moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active' => $langs->transnoentitiesnoconv("Enabled"), 'disabled' => $langs->transnoentitiesnoconv("Disabled")), $search_status, 1);

     $moreforfilter .= '</div>';

     $moreforfilter .= ' ';

     $moreforfilter .= '<div class="divsearchfield">';

-    $moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="' . dol_escape_htmltag($langs->trans("Refresh")) . '">';

+    $moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';

     $moreforfilter .= ' ';

-    $moreforfilter .= '<input type="submit" name="buttonreset" class="button" value="' . dol_escape_htmltag($langs->trans("Reset")) . '">';

+    $moreforfilter .= '<input type="submit" name="buttonreset" class="button" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';

     $moreforfilter .= '</div>';

 

     if (!empty($moreforfilter)) {

         print $moreforfilter;

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook

         print $hookmanager->resPrint;

     }

 

@@ -486,7 +486,7 @@ 
     print '<div class="clearboth"></div><br>';

 

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

+    $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

     if ($reshook < 0)

         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

 

@@ -508,14 +508,14 @@ 
         //print $objMod->name." - ".$key." - ".$objMod->version."<br>";

         //if (($mode != (isset($specialtostring[$special])?$specialtostring[$special]:'unknown') && $mode != 'expdev')

         if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental')

-            continue;    // Discard if not for current tab

+            continue; // Discard if not for current tab

 

         if (!$objMod->getName()) {

-            dol_syslog("Error for module " . $key . " - Property name of module looks empty", LOG_WARNING);

+            dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING);

             continue;

         }

 

-        $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

+        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

 

         // Check filters

         $modulename = $objMod->getName();

@@ -527,7 +527,7 @@ 
         // We discard showing according to filters

         if ($search_keyword) {

             $qualified = 0;

-            if (preg_match('/' . preg_quote($search_keyword) . '/i', $modulename) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduletechnicalname) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesc) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesclong) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduleauthor)

+            if (preg_match('/'.preg_quote($search_keyword).'/i', $modulename) || preg_match('/'.preg_quote($search_keyword).'/i', $moduletechnicalname) || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesc) || preg_match('/'.preg_quote($search_keyword).'/i', $moduledesclong) || preg_match('/'.preg_quote($search_keyword).'/i', $moduleauthor)

             )

                 $qualified = 1;

             if (!$qualified)

@@ -581,7 +581,7 @@ 
             print load_fiche_titre($familytext, '', '');

 

             print '<div class="div-table-responsive">';

-            print '<table class="tagtable liste" summary="list_of_modules">' . "\n";

+            print '<table class="tagtable liste" summary="list_of_modules">'."\n";

 

             $atleastoneforfamily = 0;

         }

@@ -613,9 +613,9 @@ 
             $imginfo = "info_black";

         }

 

-        print '<tr class="oddeven">' . "\n";

+        print '<tr class="oddeven">'."\n";

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

-            print '<td width="20px">' . ++$linenum . '</td>';

+            print '<td width="20px">'.++$linenum.'</td>';

 

         // Picto + Name of module

         print '  <td width="200px">';

@@ -631,7 +631,7 @@ 
         else {

             print img_object($alttext, 'generic', 'class="valignmiddle"');

         }

-        print ' <span class="valignmiddle">' . $objMod->getName() . '</span>';

+        print ' <span class="valignmiddle">'.$objMod->getName().'</span>';

         print "</td>\n";

 

         // Desc

@@ -642,19 +642,19 @@ 
         // Help

         print '<td class="center nowrap" style="width: 82px;">';

         //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1);

-        print '<a href="javascript:document_preview(\'' . DOL_URL_ROOT . '/admin/modulehelp.php?id=' . $objMod->numero . '\',\'text/html\',\'' . dol_escape_js($langs->trans("Module")) . '\')">' . img_picto($langs->trans("ClickToShowDescription"), $imginfo) . '</a>';

+        print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';

         print '</td>';

 

         // Version

         print '<td class="center nowrap" width="120px">';

         print $versiontrans;

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

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

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

             if (!empty($objMod->url_last_version)) {

                 $newversion = getURLContent($objMod->url_last_version);

                 if (isset($newversion['content'])) {

                     if (version_compare($newversion['content'], $versiontrans) > 0) {

-                        print "&nbsp;<span class='butAction' title='" . $langs->trans('LastStableVersion') . "'>" . $newversion['content'] . "</span>";

+                        print "&nbsp;<span class='butAction' title='".$langs->trans('LastStableVersion')."'>".$newversion['content']."</span>";

                     }

                 }

             }

@@ -668,7 +668,7 @@ 
             // Link enable/disabme

             print '<td class="center valignmiddle" width="60px">';

             if (!empty($arrayofwarnings[$modName])) {

-                print '<!-- This module has a warning to show when we activate it (note: your country is ' . $mysoc->country_code . ') -->' . "\n";

+                print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";

             }

             if (!empty($objMod->disabled)) {

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

@@ -685,30 +685,30 @@ 
             else {

                 if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {

                     //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

-                    print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=reset_confirm&amp;confirm_message_code=' . $objMod->warnings_unactivation[$mysoc->country_code] . '&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

+                    print '<a class="reposition" href="?controller=admin&method=modules&id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';

                     print img_picto($langs->trans("Activated"), 'switch_on');

                     print '</a>';

                 } else {

                     //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode .'&amp;confirm=yes' . $param . '">';

-                    print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode . '&amp;confirm=yes' . $param . '">';

+                    print '<a class="reposition" href="?controller=admin&method=modules&id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';

                     print img_picto($langs->trans("Activated"), 'switch_on');

                     print '</a>';

                 }

             }

-            print '</td>' . "\n";

+            print '</td>'."\n";

 

             // Link config

             if (!empty($objMod->config_page_url) && !$disableSetup) {

                 $backtourlparam = '';

                 if ($search_keyword != '')

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_keyword=' . $search_keyword; // No urlencode here, done later

+                    $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later

                 if ($search_nature > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_nature=' . $search_nature;

+                    $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;

                 if ($search_version > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_version=' . $search_version;

+                    $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;

                 if ($search_status > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_status=' . $search_status;

-                $backtourl = $_SERVER["PHP_SELF"] . $backtourlparam;

+                    $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;

+                $backtourl = $_SERVER["PHP_SELF"].$backtourlparam;

 

                 if (is_array($objMod->config_page_url)) {

                     print '<td class="tdsetuppicto right" width="60px">';

@@ -716,30 +716,30 @@ 
                     foreach ($objMod->config_page_url as $page) {

                         $urlpage = str_replace('.php', '', $page);

                         if ($i++) {

-                            print '<a href="' . $urlpage . '" title="' . $langs->trans($page) . '">' . img_picto(ucfirst($page), "setup") . '</a>';

+                            print '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';

                             //    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';

                         } else {

                             if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) {

                                 //$urltouse=dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1);

-                                $urltouse = '?controller=' . $regs[2] . '/admin&method=' . $regs[1];

-                                print '<a href="' . $urltouse . (preg_match('/\?/', $urltouse) ? '&' : '?') . 'save_lastsearch_values=1&backtopage=' . urlencode($backtourl) . '" title="' . $langs->trans("Setup") . '">' . img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"') . '</a>';

+                                $urltouse = '?controller='.$regs[2].'/admin&method='.$regs[1];

+                                print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';

                             } else {

                                 //$urltouse=$urlpage;

-                                $urltouse = '?controller=' . $urlpage . '&method=admin';

-                                print '<a href="' . $urltouse . (preg_match('/\?/', $urltouse) ? '&' : '?') . 'save_lastsearch_values=1&backtopage=' . urlencode($backtourl) . '" title="' . $langs->trans("Setup") . '">' . img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"') . '</a>';

+                                $urltouse = '?controller='.$urlpage.'&method=admin';

+                                print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';

                             }

                         }

                     }

                     print "</td>\n";

                 } else if (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {

                     //print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';

-                    print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="?controller=' . $regs[2] . '/admin&method=' . $regs[1] . '&save_lastsearch_values=1&backtopage=' . urlencode($backtourl) . '" title="' . $langs->trans("Setup") . '">' . img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"') . '</a></td>';

+                    print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="?controller='.$regs[2].'/admin&method='.$regs[1].'&save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';

                 } else {

                     //print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';

-                    print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="?controller=' . $objMod->config_page_url . '&method=admin&save_lastsearch_values=1&backtopage=' . urlencode($backtourl) . '" title="' . $langs->trans("Setup") . '">' . img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"') . '</a></td>';

+                    print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="?controller='.$objMod->config_page_url.'&method=admin&save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';

                 }

             } else {

-                print '<td class="tdsetuppicto right valignmiddle" width="60px">' . img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"') . '</td>';

+                print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';

             }

         } else { // Module not yet activated

             // Link enable/disable

@@ -752,34 +752,34 @@ 
                 // Module qualified for activation

                 $warningmessage = '';

                 if (!empty($arrayofwarnings[$modName])) {

-                    print '<!-- This module has a warning to show when we activate it (note: your country is ' . $mysoc->country_code . ') -->' . "\n";

+                    print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";

                     foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage) {

-                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);

+                        $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);

                     }

                 }

                 if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext)) {

-                    print '<!-- This module is an external module and it may have a warning to show (note: your country is ' . $mysoc->country_code . ') -->' . "\n";

+                    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";

                     foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry) {

                         $keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));

                         if (in_array($keymodulelowercase, $conf->modules)) {    // If module that request warning is on

                             foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage) {

-                                if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^' . $mysoc->country_code . '/', $keycountry))) {

-                                    $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());

-                                    $warningmessage .= ($warningmessage ? "\n" : "") . ($warningmessage ? "\n" : "") . $langs->trans("Module") . ' : ' . $objMod->getName();

+                                if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) {

+                                    $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());

+                                    $warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();

                                     if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("Publisher") . ' : ' . $objMod->editor_name;

+                                        $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;

                                     if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("ModuleTriggeringThisWarning") . ' : ' . $modules[$keymodule]->getName();

+                                        $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();

                                 }

                             }

                         }

                     }

                 }

-                print '<!-- Message to show: ' . $warningmessage . ' -->' . "\n";

+                print '<!-- Message to show: '.$warningmessage.' -->'."\n";

                 //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

-                print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

+                print '<a class="reposition" href="?controller=admin&method=modules&id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';

                 if ($warningmessage)

-                    print ' onclick="return confirm(\'' . dol_escape_js($warningmessage) . '\');"';

+                    print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';

                 print '>';

                 print img_picto($langs->trans("Disabled"), 'switch_off');

                 print "</a>\n";

@@ -787,7 +787,7 @@ 
             print "</td>\n";

 

             // Link config

-            print '<td class="tdsetuppicto right valignmiddle" width="60px">' . img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"') . '</td>';

+            print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';

         }

 

         print "</tr>\n";

@@ -803,7 +803,7 @@ 
     print '<br>';

 

     // Show warning about external users

-    print info_admin(showModulesExludedForExternal($modules)) . "\n";

+    print info_admin(showModulesExludedForExternal($modules))."\n";

 

     print '</form>';

 }

@@ -815,16 +815,16 @@ 
     print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";

     print "<tr class=\"liste_titre\">\n";

     //print '<td>'.$langs->trans("Logo").'</td>';

-    print '<td colspan="2">' . $langs->trans("WebSiteDesc") . '</td>';

-    print '<td>' . $langs->trans("URL") . '</td>';

+    print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';

+    print '<td>'.$langs->trans("URL").'</td>';

     print '</tr>';

 

     print "<tr class=\"oddeven\">\n";

     $url = 'https://www.dolistore.com';

     // print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';

-    print '<td align="left"><a href="' . $url . '" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="' . DOL_BASE_URI . '/theme/dolistore_logo.png"></a></td>';

-    print '<td>' . $langs->trans("DoliStoreDesc") . '</td>';

-    print '<td><a href="' . $url . '" target="_blank" rel="external">' . $url . '</a></td>';

+    print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_BASE_URI.'/theme/dolistore_logo.png"></a></td>';

+    print '<td>'.$langs->trans("DoliStoreDesc").'</td>';

+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';

     print '</tr>';

 

     print "</table>\n";

@@ -838,7 +838,7 @@ 
         //var_dump($options);

         $dolistore->getRemoteData($options);

 

-        print '<span class="opacitymedium">' . $langs->trans('DOLISTOREdescriptionLong') . '</span><br><br>';

+        print '<span class="opacitymedium">'.$langs->trans('DOLISTOREdescriptionLong').'</span><br><br>';

 

         $previouslink = $dolistore->get_previous_link();

         $nextlink = $dolistore->get_next_link();

@@ -898,14 +898,14 @@ 
     $dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);

     $allowonlineinstall = true;

     $allowfromweb = 1;

-    if (dol_is_file($dolibarrdataroot . '/installmodules.lock'))

+    if (dol_is_file($dolibarrdataroot.'/installmodules.lock'))

         $allowonlineinstall = false;

 

-    $fullurl = '<a href="' . $urldolibarrmodules . '" target="_blank">' . $urldolibarrmodules . '</a>';

+    $fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';

     $message = '';

     if (!empty($allowonlineinstall)) {

         if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt))) {

-            $message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT . '/custom', DOL_DOCUMENT_ROOT));

+            $message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));

             $allowfromweb = -1;

         } else {

             if ($dirins_ok) {

@@ -915,12 +915,12 @@ 
                     $allowfromweb = 0;

                 }

             } else {

-                $message = info_admin($langs->trans("NotExistsDirect", $dirins) . $langs->trans("InfDirAlt") . $langs->trans("InfDirExample"));

+                $message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));

                 $allowfromweb = 0;

             }

         }

     } else {

-        $message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot . '/installmodules.lock'));

+        $message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'));

         $allowfromweb = 0;

     }

 

@@ -937,26 +937,26 @@ 
         if ($allowfromweb == 1) {

             //print $langs->trans("ThisIsProcessToFollow").'<br>';

         } else {

-            print $langs->trans("ThisIsAlternativeProcessToFollow") . '<br>';

-            print '<b>' . $langs->trans("StepNb", 1) . '</b>: ';

-            print $langs->trans("FindPackageFromWebSite", $fullurl) . '<br>';

-            print '<b>' . $langs->trans("StepNb", 2) . '</b>: ';

-            print $langs->trans("DownloadPackageFromWebSite", $fullurl) . '<br>';

-            print '<b>' . $langs->trans("StepNb", 3) . '</b>: ';

+            print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';

+            print '<b>'.$langs->trans("StepNb", 1).'</b>: ';

+            print $langs->trans("FindPackageFromWebSite", $fullurl).'<br>';

+            print '<b>'.$langs->trans("StepNb", 2).'</b>: ';

+            print $langs->trans("DownloadPackageFromWebSite", $fullurl).'<br>';

+            print '<b>'.$langs->trans("StepNb", 3).'</b>: ';

         }

 

         if ($allowfromweb == 1) {

-            print $langs->trans("UnpackPackageInModulesRoot", $dirins) . '<br>';

+            print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';

 

             print '<br>';

 

-            print '<form enctype="multipart/form-data" method="POST" class="noborder" action="' . $_SERVER["PHP_SELF"] . '" name="forminstall">';

+            print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';

             print '<input type="hidden" name="action" value="install">';

             print '<input type="hidden" name="mode" value="deploy">';

 

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

 

-            $max = $conf->global->MAIN_UPLOAD_DOC;  // En Kb

+            $max = $conf->global->MAIN_UPLOAD_DOC; // En Kb

             $maxphp = @ini_get('upload_max_filesize'); // En inconnu

             if (preg_match('/k$/i', $maxphp))

                 $maxphp = $maxphp * 1;

@@ -975,20 +975,20 @@ 
                 print '<script type="text/javascript">

 				$(document).ready(function() {

 					jQuery("#fileinstall").on("change", function() {

-						if(this.files[0].size > ' . ($maxmin * 1024) . '){

-							alert("' . dol_escape_js($langs->trans("ErrorFileSizeTooLarge")) . '");

+						if(this.files[0].size > ' . ($maxmin * 1024).'){

+							alert("' . dol_escape_js($langs->trans("ErrorFileSizeTooLarge")).'");

 							this.value = "";

 						};

 					});

 				});

 				</script>' . "\n";

                 // MAX_FILE_SIZE doit précéder le champ input de type file

-                print '<input type="hidden" name="max_file_size" value="' . ($maxmin * 1024) . '">';

+                print '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';

             }

 

             print '<input class="flat minwidth400" type="file" name="fileinstall" id="fileinstall"> ';

 

-            print '<input type="submit" name="send" value="' . dol_escape_htmltag($langs->trans("Send")) . '" class="button">';

+            print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';

 

             print '</form>';

 

@@ -997,9 +997,9 @@ 
 

             print '<div class="center"><div class="logo_setup"></div></div>';

         } else {

-            print $langs->trans("UnpackPackageInModulesRoot", $dirins) . '<br>';

-            print '<b>' . $langs->trans("StepNb", 4) . '</b>: ';

-            print $langs->trans("SetupIsReadyForUse") . '<br>';

+            print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';

+            print '<b>'.$langs->trans("StepNb", 4).'</b>: ';

+            print $langs->trans("SetupIsReadyForUse").'<br>';

         }

     }

 

@@ -1007,7 +1007,7 @@ 
         print '<br>';

 

         foreach ($result['return'] as $value) {

-            echo $value . '<br>';

+            echo $value.'<br>';

         }

     }

 

@@ -1021,28 +1021,28 @@ 
     print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";

     print "<tr class=\"liste_titre\">\n";

     //print '<td>'.$langs->trans("Logo").'</td>';

-    print '<td colspan="2">' . $langs->trans("DevelopYourModuleDesc") . '</td>';

-    print '<td>' . $langs->trans("URL") . '</td>';

+    print '<td colspan="2">'.$langs->trans("DevelopYourModuleDesc").'</td>';

+    print '<td>'.$langs->trans("URL").'</td>';

     print '</tr>';

 

-    print '<tr class="oddeven" height="80">' . "\n";

+    print '<tr class="oddeven" height="80">'."\n";

     print '<td align="left">';

     //span class="fa fa-bug"></span>

     //print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png">';

     print '<div class="imgmaxheight50 logo_setup"></div>';

     print '</td>';

-    print '<td>' . $langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")) . '</td>';

-    print '<td>' . $langs->trans("SeeTopRightMenu") . '</td>';

+    print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';

+    print '<td>'.$langs->trans("SeeTopRightMenu").'</td>';

     print '</tr>';

 

-    print '<tr class="oddeven" height="80">' . "\n";

+    print '<tr class="oddeven" height="80">'."\n";

     $url = 'https://partners.dolibarr.org';

     print '<td align="left">';

     //print'<a href="' . $url . '" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="' . DOL_URL_ROOT . '/theme/dolibarr_preferred_partner_int.png"></a>';

-    print'<a href="' . $url . '" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="' . DOL_BASE_URI . '/theme/dolibarr_preferred_partner_int.png"></a>';

+    print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_BASE_URI.'/theme/dolibarr_preferred_partner_int.png"></a>';

     print '</td>';

-    print '<td>' . $langs->trans("DoliPartnersDesc") . '</td>';

-    print '<td><a href="' . $url . '" target="_blank" rel="external">' . $url . '</a></td>';

+    print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';

+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';

     print '</tr>';

 

     print "</table>\n";

Braces +192 added lines, -133 removed lines

@@ -42,8 +42,9 @@ 
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));

 

 $mode = GETPOST('mode', 'alpha');

-if (empty($mode))

-    $mode = 'common';

+if (empty($mode)) {
+    $mode = 'common';
+}
 $action = GETPOST('action', 'alpha');

 //var_dump($_POST);exit;

 $value = GETPOST('value', 'alpha');

@@ -64,8 +65,9 @@ 
 $dolistore = new Dolistore(false);

 

 

-if (!$user->admin)

-    accessforbidden();

+if (!$user->admin) {
+    accessforbidden();
+}
 

 $specialtostring = array(0 => 'common', 1 => 'interfaces', 2 => 'other', 3 => 'functional', 4 => 'marketplace');

 

@@ -86,15 +88,19 @@ 
 

 $param = '';

 if (!GETPOST('buttonreset', 'alpha')) {

-    if ($search_keyword)

-        $param .= '&search_keyword=' . urlencode($search_keyword);

-    if ($search_status && $search_status != '-1')

-        $param .= '&search_status=' . urlencode($search_status);

-    if ($search_nature && $search_nature != '-1')

-        $param .= '&search_nature=' . urlencode($search_nature);

-    if ($search_version && $search_version != '-1')

-        $param .= '&search_version=' . urlencode($search_version);

-}

+    if ($search_keyword) {
+            $param .= '&search_keyword=' . urlencode($search_keyword);
+    }
+    if ($search_status && $search_status != '-1') {
+            $param .= '&search_status=' . urlencode($search_status);
+    }
+    if ($search_nature && $search_nature != '-1') {
+            $param .= '&search_nature=' . urlencode($search_nature);
+    }
+    if ($search_version && $search_version != '-1') {
+            $param .= '&search_version=' . urlencode($search_version);
+    }
+    }

 

 $dirins = DOL_DOCUMENT_ROOT . '/custom';

 $urldolibarrmodules = 'https://www.dolistore.com/';

@@ -111,8 +117,9 @@ 
 

 $parameters = array();

 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

-if ($reshook < 0)

-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 

 if (GETPOST('buttonreset', 'alpha')) {

     $search_keyword = '';

@@ -206,9 +213,9 @@ 
 

 if ($action == 'set' && $user->admin) {

     $resarray = activateModule($value);

-    if (!empty($resarray['errors']))

-        setEventMessages('', $resarray['errors'], 'errors');

-    else {

+    if (!empty($resarray['errors'])) {
+            setEventMessages('', $resarray['errors'], 'errors');
+    } else {

         //var_dump($resarray);exit;

         if ($resarray['nbperms'] > 0) {

             $tmpsql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "user WHERE admin <> 1";

@@ -220,15 +227,15 @@ 
                     $msg = $langs->trans('ModuleEnabledAdminMustCheckRights');

                     setEventMessages($msg, null, 'warnings');

                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

     }

     //header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));

     header("Location: ?controller=admin&method=modules&mode=" . $mode . $param . ($page_y ? '&page_y=' . $page_y : ''));

     exit;

-}

-else if ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {

+} else if ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {

     $result = unActivateModule($value);

     if ($result) {

         setEventMessages($result, null, 'errors');

@@ -308,16 +315,20 @@ 
 

                                 // We discard modules according to features level (PS: if module is activated we always show it)

                                 $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

-                                if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2)))

-                                    $modulequalified = 0;

-                                if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1)))

-                                    $modulequalified = 0;

-                                if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0)))

-                                    $modulequalified = 0;

+                                if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) {
+                                                                    $modulequalified = 0;
+                                }
+                                if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) {
+                                                                    $modulequalified = 0;
+                                }
+                                if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) {
+                                                                    $modulequalified = 0;
+                                }
 

                                 // We discard modules according to property ->hidden

-                                if (!empty($objMod->hidden))

-                                    $modulequalified = 0;

+                                if (!empty($objMod->hidden)) {
+                                                                    $modulequalified = 0;
+                                }
 

                                 if ($modulequalified > 0) {

                                     $publisher = dol_escape_htmltag($objMod->getPublisher());

@@ -363,16 +374,21 @@ 
                                     //print $i.'-'.$dirmod[$i].'<br>';

                                     // Set categ[$i]

                                     $specialstring = 'unknown';

-                                    if ($objMod->version == 'development' || $objMod->version == 'experimental')

-                                        $specialstring = 'expdev';

-                                    if (isset($categ[$specialstring]))

-                                        $categ[$specialstring] ++;     // Array of all different modules categories

-                                    else

-                                        $categ[$specialstring] = 1;

+                                    if ($objMod->version == 'development' || $objMod->version == 'experimental') {
+                                                                            $specialstring = 'expdev';
+                                    }
+                                    if (isset($categ[$specialstring])) {
+                                                                            $categ[$specialstring] ++;
+                                    }
+                                    // Array of all different modules categories

+                                    else {
+                                                                            $categ[$specialstring] = 1;
+                                    }
                                     $j++;

                                     $i++;

-                                } else

-                                    dol_syslog("Module " . get_class($objMod) . " not qualified");

+                                } else {
+                                                                    dol_syslog("Module " . get_class($objMod) . " not qualified");
+                                }
                             } catch (Exception $e) {

                                 dol_syslog("Failed to load " . $dir . $file . " " . $e->getMessage(), LOG_ERR);

                             }

@@ -395,8 +411,9 @@ 
     if (!empty($modules[$value])) {

         $objMod = $modules[$value];

 

-        if (!empty($objMod->langfiles))

-            $langs->loadLangs($objMod->langfiles);

+        if (!empty($objMod->langfiles)) {
+                    $langs->loadLangs($objMod->langfiles);
+        }
 

         $form = new Form($db);

         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?value=' . $value . '&mode=' . $mode . $param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);

@@ -412,19 +429,24 @@ 
 

 $nbofactivatedmodules = count($conf->modules);

 $moreinfo = $langs->trans("TotalNumberOfActivatedModules", ($nbofactivatedmodules - 1), count($modules));

-if ($nbofactivatedmodules <= 1)

-    $moreinfo .= ' ' . img_warning($langs->trans("YouMustEnableOneModule"));

+if ($nbofactivatedmodules <= 1) {
+    $moreinfo .= ' ' . img_warning($langs->trans("YouMustEnableOneModule"));
+}
 print load_fiche_titre($langs->trans("ModulesSetup"), $moreinfo, 'title_setup');

 

 // Start to show page

-if ($mode == 'common')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDesc") . "</span><br>\n";

-if ($mode == 'marketplace')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesMarketPlaceDesc") . "</span><br>\n";

-if ($mode == 'deploy')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules")) . "</span><br>\n";

-if ($mode == 'develop')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDevelopDesc") . "</span><br>\n";

+if ($mode == 'common') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDesc") . "</span><br>\n";
+}
+if ($mode == 'marketplace') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesMarketPlaceDesc") . "</span><br>\n";
+}
+if ($mode == 'deploy') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules")) . "</span><br>\n";
+}
+if ($mode == 'develop') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDevelopDesc") . "</span><br>\n";
+}
 

 $head = modules_prepare_head();

 

@@ -436,8 +458,9 @@ 
     dol_set_focus('#search_keyword');

 

     print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';

-    if ($optioncss != '')

-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';

+    if ($optioncss != '') {
+            print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+    }
     print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

     print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';

     print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

@@ -454,12 +477,15 @@ 
     $moreforfilter .= '</div>';

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

         $array_version = array('stable' => $langs->transnoentitiesnoconv("Stable"));

-        if ($conf->global->MAIN_FEATURES_LEVEL < 0)

-            $array_version['deprecated'] = $langs->trans("Deprecated");

-        if ($conf->global->MAIN_FEATURES_LEVEL > 0)

-            $array_version['experimental'] = $langs->trans("Experimental");

-        if ($conf->global->MAIN_FEATURES_LEVEL > 1)

-            $array_version['development'] = $langs->trans("Development");

+        if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
+                    $array_version['deprecated'] = $langs->trans("Deprecated");
+        }
+        if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+                    $array_version['experimental'] = $langs->trans("Experimental");
+        }
+        if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+                    $array_version['development'] = $langs->trans("Development");
+        }
         $moreforfilter .= '<div class="divsearchfield">';

         $moreforfilter .= $langs->trans('Version') . ': ' . $form->selectarray('search_version', $array_version, $search_version, 1);

         $moreforfilter .= '</div>';

@@ -487,8 +513,9 @@ 
 

     $parameters = array();

     $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

-    if ($reshook < 0)

-        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+    if ($reshook < 0) {
+            setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+    }
 

     // Show list of modules

 

@@ -507,8 +534,10 @@ 
 

         //print $objMod->name." - ".$key." - ".$objMod->version."<br>";

         //if (($mode != (isset($specialtostring[$special])?$specialtostring[$special]:'unknown') && $mode != 'expdev')

-        if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental')

-            continue;    // Discard if not for current tab

+        if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') {
+                    continue;
+        }
+        // Discard if not for current tab

 

         if (!$objMod->getName()) {

             dol_syslog("Error for module " . $key . " - Property name of module looks empty", LOG_WARNING);

@@ -528,40 +557,52 @@ 
         if ($search_keyword) {

             $qualified = 0;

             if (preg_match('/' . preg_quote($search_keyword) . '/i', $modulename) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduletechnicalname) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesc) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesclong) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduleauthor)

-            )

-                $qualified = 1;

-            if (!$qualified)

-                continue;

+            ) {
+                            $qualified = 1;
+            }
+            if (!$qualified) {
+                            continue;
+            }
         }

         if ($search_status) {

-            if ($search_status == 'active' && empty($conf->global->$const_name))

-                continue;

-            if ($search_status == 'disabled' && !empty($conf->global->$const_name))

-                continue;

+            if ($search_status == 'active' && empty($conf->global->$const_name)) {
+                            continue;
+            }
+            if ($search_status == 'disabled' && !empty($conf->global->$const_name)) {
+                            continue;
+            }
         }

         if ($search_nature) {

-            if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external')

-                continue;

+            if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') {
+                            continue;
+            }
             if (preg_match('/^external_(.*)$/', $search_nature, $reg)) {

                 //print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());

                 $publisher = dol_escape_htmltag($objMod->getPublisher());

-                if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher)

-                    continue;

-                if (!$reg[1] && !empty($publisher))

-                    continue;

+                if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) {
+                                    continue;
+                }
+                if (!$reg[1] && !empty($publisher)) {
+                                    continue;
+                }
             }

-            if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external')

-                continue;

+            if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') {
+                            continue;
+            }
         }

         if ($search_version) {

-            if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable')

-                continue;

-            if ($objMod->version != 'development' && ($search_version == 'development'))

-                continue;

-            if ($objMod->version != 'experimental' && ($search_version == 'experimental'))

-                continue;

-            if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated'))

-                continue;

+            if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') {
+                            continue;
+            }
+            if ($objMod->version != 'development' && ($search_version == 'development')) {
+                            continue;
+            }
+            if ($objMod->version != 'experimental' && ($search_version == 'experimental')) {
+                            continue;
+            }
+            if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) {
+                            continue;
+            }
         }

 

         // Load all lang files of module

@@ -599,12 +640,15 @@ 
         // Version (with picto warning or not)

         $version = $objMod->getVersion(0);

         $versiontrans = '';

-        if (preg_match('/development/i', $version))

-            $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');

-        if (preg_match('/experimental/i', $version))

-            $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');

-        if (preg_match('/deprecated/i', $version))

-            $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');

+        if (preg_match('/development/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
+        }
+        if (preg_match('/experimental/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
+        }
+        if (preg_match('/deprecated/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
+        }
         $versiontrans .= $objMod->getVersion(1);

 

         // Define imginfo

@@ -614,8 +658,9 @@ 
         }

 

         print '<tr class="oddeven">' . "\n";

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

-            print '<td width="20px">' . ++$linenum . '</td>';

+        if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
+                    print '<td width="20px">' . ++$linenum . '</td>';
+        }
 

         // Picto + Name of module

         print '  <td width="200px">';

@@ -623,12 +668,12 @@ 
         //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);

         //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);

         if (!empty($objMod->picto)) {

-            if (preg_match('/^\//i', $objMod->picto))

-                print img_picto($alttext, $objMod->picto, ' width="14px"', 1);

-            else

-                print img_object($alttext, $objMod->picto, 'class="valignmiddle" width="14px"');

-        }

-        else {

+            if (preg_match('/^\//i', $objMod->picto)) {
+                            print img_picto($alttext, $objMod->picto, ' width="14px"', 1);
+            } else {
+                            print img_object($alttext, $objMod->picto, 'class="valignmiddle" width="14px"');
+            }
+        } else {

             print img_object($alttext, 'generic', 'class="valignmiddle"');

         }

         print ' <span class="valignmiddle">' . $objMod->getName() . '</span>';

@@ -673,16 +718,16 @@ 
             if (!empty($objMod->disabled)) {

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

             } else if (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {

-                if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed())

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

-                else {

+                if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+                                    print $langs->trans("Used");
+                } else {

                     print img_picto($langs->trans("Required"), 'switch_on');

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

                 }

-                if (!empty($conf->multicompany->enabled) && $user->entity)

-                    $disableSetup++;

-            }

-            else {

+                if (!empty($conf->multicompany->enabled) && $user->entity) {
+                                    $disableSetup++;
+                }
+            } else {

                 if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {

                     //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

                     print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=reset_confirm&amp;confirm_message_code=' . $objMod->warnings_unactivation[$mysoc->country_code] . '&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

@@ -700,14 +745,19 @@ 
             // Link config

             if (!empty($objMod->config_page_url) && !$disableSetup) {

                 $backtourlparam = '';

-                if ($search_keyword != '')

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_keyword=' . $search_keyword; // No urlencode here, done later

-                if ($search_nature > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_nature=' . $search_nature;

-                if ($search_version > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_version=' . $search_version;

-                if ($search_status > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_status=' . $search_status;

+                if ($search_keyword != '') {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_keyword=' . $search_keyword;
+                }
+                // No urlencode here, done later

+                if ($search_nature > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_nature=' . $search_nature;
+                }
+                if ($search_version > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_version=' . $search_version;
+                }
+                if ($search_status > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_status=' . $search_status;
+                }
                 $backtourl = $_SERVER["PHP_SELF"] . $backtourlparam;

 

                 if (is_array($objMod->config_page_url)) {

@@ -766,10 +816,12 @@ 
                                 if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^' . $mysoc->country_code . '/', $keycountry))) {

                                     $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());

                                     $warningmessage .= ($warningmessage ? "\n" : "") . ($warningmessage ? "\n" : "") . $langs->trans("Module") . ' : ' . $objMod->getName();

-                                    if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("Publisher") . ' : ' . $objMod->editor_name;

-                                    if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("ModuleTriggeringThisWarning") . ' : ' . $modules[$keymodule]->getName();

+                                    if (!empty($objMod->editor_name)) {
+                                                                            $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("Publisher") . ' : ' . $objMod->editor_name;
+                                    }
+                                    if (!empty($objMod->editor_name)) {
+                                                                            $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("ModuleTriggeringThisWarning") . ' : ' . $modules[$keymodule]->getName();
+                                    }
                                 }

                             }

                         }

@@ -778,8 +830,9 @@ 
                 print '<!-- Message to show: ' . $warningmessage . ' -->' . "\n";

                 //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

                 print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

-                if ($warningmessage)

-                    print ' onclick="return confirm(\'' . dol_escape_js($warningmessage) . '\');"';

+                if ($warningmessage) {
+                                    print ' onclick="return confirm(\'' . dol_escape_js($warningmessage) . '\');"';
+                }
                 print '>';

                 print img_picto($langs->trans("Disabled"), 'switch_off');

                 print "</a>\n";

@@ -898,8 +951,9 @@ 
     $dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);

     $allowonlineinstall = true;

     $allowfromweb = 1;

-    if (dol_is_file($dolibarrdataroot . '/installmodules.lock'))

-        $allowonlineinstall = false;

+    if (dol_is_file($dolibarrdataroot . '/installmodules.lock')) {
+            $allowonlineinstall = false;
+    }
 

     $fullurl = '<a href="' . $urldolibarrmodules . '" target="_blank">' . $urldolibarrmodules . '</a>';

     $message = '';

@@ -958,18 +1012,23 @@ 
 

             $max = $conf->global->MAIN_UPLOAD_DOC;  // En Kb

             $maxphp = @ini_get('upload_max_filesize'); // En inconnu

-            if (preg_match('/k$/i', $maxphp))

-                $maxphp = $maxphp * 1;

-            if (preg_match('/m$/i', $maxphp))

-                $maxphp = $maxphp * 1024;

-            if (preg_match('/g$/i', $maxphp))

-                $maxphp = $maxphp * 1024 * 1024;

-            if (preg_match('/t$/i', $maxphp))

-                $maxphp = $maxphp * 1024 * 1024 * 1024;

+            if (preg_match('/k$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1;
+            }
+            if (preg_match('/m$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024;
+            }
+            if (preg_match('/g$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024 * 1024;
+            }
+            if (preg_match('/t$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024 * 1024 * 1024;
+            }
             // Now $max and $maxphp are in Kb

             $maxmin = $max;

-            if ($maxphp > 0)

-                $maxmin = min($max, $maxphp);

+            if ($maxphp > 0) {
+                            $maxmin = min($max, $maxphp);
+            }
 

             if ($maxmin > 0) {

                 print '<script type="text/javascript">

dolibarr/htdocs/core/get_info.php

Spacing +17 added lines, -17 removed lines

@@ -39,7 +39,7 @@ 
     define('NOREQUIREMENU', 1);

 }

 

-require_once DOL_BASE_PATH . '/main.inc.php';

+require_once DOL_BASE_PATH.'/main.inc.php';

 

 if (GETPOST('lang', 'aZ09')) {

     $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php

@@ -57,12 +57,12 @@ 
 $title = $langs->trans("Info");

 

 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests

-$head = '<!-- Quick access -->' . "\n";

+$head = '<!-- Quick access -->'."\n";

 $arrayofjs = array();

 $arrayofcss = array();

 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

 

-print '<body>' . "\n";

+print '<body>'."\n";

 print '<div style="padding: 20px;">';

 //print '<br>';

 

@@ -73,38 +73,38 @@ 
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {

     $appli = $conf->global->MAIN_APPLICATION_TITLE;

     if (preg_match('/\d\.\d/', $appli)) {

-        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {

-            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core

+        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {

+            $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core

         }

     } else {

-        $appli .= " " . DOL_VERSION;

+        $appli .= " ".DOL_VERSION;

     }

 } else {

-    $appli .= " " . DOL_VERSION;

+    $appli .= " ".DOL_VERSION;

 }

 

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

-    $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;

+    $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;

 }

 

 $logouttext = '';

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

     //$logouthtmltext=$appli.'<br>';

     if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {

-        $logouthtmltext .= $langs->trans("Logout") . '<br>';

+        $logouthtmltext .= $langs->trans("Logout").'<br>';

 

         // $logouttext .= '<a href="' . DOL_URL_ROOT . '/user/logout.php">';

-        $logouttext .= '<a href="' . BASE_URI . '?controller=user&method=logout">';

+        $logouttext .= '<a href="'.BASE_URI.'?controller=user&method=logout">';

         //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);

         $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';

         $logouttext .= '</a>';

     } else {

         $logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);

-        $logouttext .= img_picto($langs->trans('Logout') . ":" . $langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);

+        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);

     }

 }

 

-print '<div class="login_block_getinfo">' . "\n";

+print '<div class="login_block_getinfo">'."\n";

 

 // Add login user link

 $toprightmenu .= '<div class="login_block_user">';

@@ -115,13 +115,13 @@ 
 $toprightmenu .= $user->getNomUrl($mode, '', -1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');

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

 

-$toprightmenu .= '</div>' . "\n";

+$toprightmenu .= '</div>'."\n";

 

 $toprightmenu .= '<div class="login_block_other">';

 

 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')

 $parameters = array();

-$result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks

+$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks

 if (is_numeric($result)) {

     if (empty($result)) {

         $toprightmenu .= $hookmanager->resPrint; // add

@@ -137,7 +137,7 @@ 
 // Link to module builder

 if (!empty($conf->modulebuilder->enabled)) {

     // $text = '<a href="' . DOL_URL_ROOT . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';

-    $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';

+    $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';

     //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');

     $text .= '<span class="fa fa-bug atoplogin"></span>';

     $text .= '</a>';

@@ -153,9 +153,9 @@ 
 

 print $toprightmenu;

 

-print "</div>\n";  // end div class="login_block"

+print "</div>\n"; // end div class="login_block"

 

 print '</div>';

-print '</body></html>' . "\n";

+print '</body></html>'."\n";

 

 $db->close();

Braces +4 added lines, -2 removed lines

@@ -128,8 +128,10 @@
     } else {

         $toprightmenu = $hookmanager->resPrint; // replace

     }

-} else

-    $toprightmenu .= $result; // For backward compatibility

+} else {
+    $toprightmenu .= $result;
+}
+// For backward compatibility

 

 

 

dolibarr/htdocs/user/class/user.class.php

Spacing +337 added lines, -337 removed lines

@@ -34,7 +34,7 @@ 
  * 	\brief      File of class to manage users

  *  \ingroup	core

  */

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

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

 

 /**

  * 	Class to manage Dolibarr users

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

     public $twitter;

     public $facebook;

-    public $job;   // job position

+    public $job; // job position

     public $signature;

 

     /**

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

     public $zip;

     public $town;

-    public $state_id;  // The state/department

+    public $state_id; // The state/department

     public $state_code;

     public $state;

     public $office_phone;

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

     public $photo;

     public $lang;

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

-    public $all_permissions_are_loaded;    // All permission are loaded

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

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

-    public $conf;             // To store personal config

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

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

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

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

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

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

+    public $all_permissions_are_loaded; // All permission are loaded

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

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

+    public $conf; // To store personal config

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

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

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

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

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

     private $cache_childids;

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

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

-    public $tjm;     // Average cost of employee

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

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

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

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

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

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

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

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

+    public $tjm; // Average cost of employee

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

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

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

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

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

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

     public $default_c_exp_tax_cat;

     public $default_range;

     public $fields = array(

@@ -233,34 +233,34 @@ 
         $sql .= " u.color,";

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

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

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

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

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

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

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

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

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

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

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

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

 

         if ($entity < 0) {

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

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

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

             } else {

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

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

             }

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

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

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

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

             else

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

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

         }

 

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

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

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

         } else if ($login) {

-            $sql .= " AND u.login = '" . $this->db->escape($login) . "'";

+            $sql .= " AND u.login = '".$this->db->escape($login)."'";

         } else {

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

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

         }

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

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

 

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

         if ($result) {

@@ -330,7 +330,7 @@ 
                 $this->datelastlogin = $this->db->jdate($obj->datel);

                 $this->datepreviouslogin = $this->db->jdate($obj->datep);

 

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

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

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

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

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

@@ -353,7 +353,7 @@ 
             }

             else {

                 $this->error = "USERNOTFOUND";

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

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

 

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

                 return 0;

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

         if ($loadpersonalconf) {

             // Load user->conf for user

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

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

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

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

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

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

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

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

             if ($resql) {

@@ -410,9 +410,9 @@ 
 

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

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

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

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

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

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

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

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

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

         if ($resql) {

             while ($obj = $this->db->fetch_object($resql)) {

@@ -464,7 +464,7 @@ 
 

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

 

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

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

         $error = 0;

         $whereforadd = '';

 

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

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

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

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

-            $sql .= " WHERE id = '" . $this->db->escape($rid) . "'";

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

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

+            $sql .= " WHERE id = '".$this->db->escape($rid)."'";

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

 

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

             if ($result) {

@@ -490,7 +490,7 @@ 
             }

 

             // Where pour la liste des droits a ajouter

-            $whereforadd = "id=" . $this->db->escape($rid);

+            $whereforadd = "id=".$this->db->escape($rid);

             // Ajout des droits induits

             if (!empty($subperms))

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

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

                     $whereforadd = 'allmodules';

                 } else {

-                    $whereforadd = "module='" . $this->db->escape($allmodule) . "'";

+                    $whereforadd = "module='".$this->db->escape($allmodule)."'";

                     if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";

                 }

             }

         }

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

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

             $sql = "SELECT id";

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

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

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

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

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

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

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

             }

 

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

@@ -530,10 +530,10 @@ 
                     $obj = $this->db->fetch_object($result);

                     $nid = $obj->id;

 

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

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

                     if (!$this->db->query($sql))

                         $error++;

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

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

                     if (!$this->db->query($sql))

                         $error++;

 

@@ -548,7 +548,7 @@ 
 

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

             $langs->load("other");

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

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

 

             // Call trigger

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

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

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

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

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

-            $sql .= " WHERE id = '" . $this->db->escape($rid) . "'";

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

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

+            $sql .= " WHERE id = '".$this->db->escape($rid)."'";

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

 

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

             if ($result) {

@@ -608,7 +608,7 @@ 
             }

 

             // Where pour la liste des droits a supprimer

-            $wherefordel = "id=" . $this->db->escape($rid);

+            $wherefordel = "id=".$this->db->escape($rid);

             // Suppression des droits induits

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

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

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

                     $wherefordel = 'allmodules';

                 } else {

-                    $wherefordel = "module='" . $this->db->escape($allmodule) . "'";

+                    $wherefordel = "module='".$this->db->escape($allmodule)."'";

                     if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                        $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";

                 }

             }

         }

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

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

             $sql = "SELECT id";

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

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

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

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

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

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

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

             }

 

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

@@ -647,9 +647,9 @@ 
                     $obj = $this->db->fetch_object($result);

                     $nid = $obj->id;

 

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

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

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

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

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

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

                     if (!$this->db->query($sql))

                         $error++;

 

@@ -664,7 +664,7 @@ 
 

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

             $langs->load("other");

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

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

 

             // Call trigger

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

@@ -691,7 +691,7 @@ 
      */

     function clearrights()

     {

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

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

         $this->rights = '';

         $this->all_permissions_are_loaded = false;

         $this->_tab_loaded = array();

@@ -724,18 +724,18 @@ 
         // Recuperation des droits utilisateurs + recuperation des droits groupes

         // D'abord les droits utilisateurs

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

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

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

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

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

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

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

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

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

         } else {

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

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

         }

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

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

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

         if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+            $sql .= " AND r.module = '".$this->db->escape($moduletag)."'";

 

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

         if ($resql) {

@@ -775,25 +775,25 @@ 
 

         // Maintenant les droits groupes

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

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

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

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

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

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

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

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

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

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

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

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

             } else {

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

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

             }

         } else {

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

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

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

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

         }

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

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

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

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

         if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+            $sql .= " AND r.module = '".$this->db->escape($moduletag)."'";

 

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

         if ($resql) {

@@ -868,12 +868,12 @@ 
         $this->db->begin();

 

         // Deactivate user

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

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

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

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

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

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

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

 

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

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

         if ($result) {

             // Call trigger

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

@@ -910,7 +910,7 @@ 
         }

 

         // Get current categories

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

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

         $c = new Categorie($this->db);

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

 

@@ -953,10 +953,10 @@ 
 

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

 

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

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

 

         // Remove rights

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

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

 

         if (!$error && !$this->db->query($sql)) {

             $error++;

@@ -964,7 +964,7 @@ 
         }

 

         // Remove group

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

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

         if (!$error && !$this->db->query($sql)) {

             $error++;

             $this->error = $this->db->lasterror();

@@ -972,7 +972,7 @@ 
 

         // If contact, remove link

         if ($this->contact_id) {

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

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

             if (!$error && !$this->db->query($sql)) {

                 $error++;

                 $this->error = $this->db->lasterror();

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

             if ($result < 0) {

                 $error++;

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

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

             }

         }

 

         // Remove user

         if (!$error) {

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

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

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

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

             if (!$this->db->query($sql)) {

                 $error++;

                 $this->error = $this->db->lasterror();

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

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

 

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

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

 

         // Check parameters

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

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

         $this->db->begin();

 

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

-        $sql .= " WHERE login ='" . $this->db->escape($this->login) . "'";

-        $sql .= " AND entity IN (0," . $this->db->escape($conf->entity) . ")";

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

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

+        $sql .= " AND entity IN (0,".$this->db->escape($conf->entity).")";

 

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

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

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

         if ($resql) {

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

@@ -1064,17 +1064,17 @@ 
 

             if ($num) {

                 $this->error = 'ErrorLoginAlreadyExists';

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

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

                 $this->db->rollback();

                 return -6;

             } else {

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

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

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

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

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

 

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

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

                 if ($result) {

-                    $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "user");

+                    $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");

 

                     // Set default rights

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

@@ -1091,7 +1091,7 @@ 
                     }

 

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

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

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

                         $langs->load("stocks");

                         $entrepot = new Entrepot($this->db);

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

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

                     } else {

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

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

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

                         $this->db->rollback();

                         return -3;

                     }

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

 

         if (empty($login))

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

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

         $this->login = $login;

 

         $this->db->begin();

@@ -1176,14 +1176,14 @@ 
         // Cree et positionne $this->id

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

         if ($result > 0) {

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

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

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

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

             if ($contact->socid)

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

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

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

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

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

 

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

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

             if ($resql) {

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

 

@@ -1206,7 +1206,7 @@ 
             }

         } else {

             // $this->error deja positionne

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

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

 

             $this->db->rollback();

             return $result;

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

 

         if (empty($login))

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

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

         $this->login = $login;

 

         $this->db->begin();

@@ -1254,11 +1254,11 @@ 
                 $result = -2;

 

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

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

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

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

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

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

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

 

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

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

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

                 if ($resql) {

                     $this->db->commit();

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

         global $conf;

 

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

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

         $sql .= " WHERE bydefault = 1";

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

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

 

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

         if ($resql) {

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

         while ($i < $num) {

 

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

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

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

 

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

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

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

             if (!$result)

                 return -1;

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

         $error = 0;

 

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

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

 

         // Clean parameters

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

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

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

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

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

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

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

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

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

@@ -1395,54 +1395,54 @@ 
         $this->db->begin();

 

         // Update datas

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

-        $sql .= " lastname = '" . $this->db->escape($this->lastname) . "'";

-        $sql .= ", firstname = '" . $this->db->escape($this->firstname) . "'";

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

-        $sql .= ", login = '" . $this->db->escape($this->login) . "'";

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

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

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

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

+        $sql .= " lastname = '".$this->db->escape($this->lastname)."'";

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

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

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

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

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

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

         if (!empty($user->admin))

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

-        $sql .= ", address = '" . $this->db->escape($this->address) . "'";

-        $sql .= ", zip = '" . $this->db->escape($this->zip) . "'";

-        $sql .= ", town = '" . $this->db->escape($this->town) . "'";

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

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

-        $sql .= ", office_phone = '" . $this->db->escape($this->office_phone) . "'";

-        $sql .= ", office_fax = '" . $this->db->escape($this->office_fax) . "'";

-        $sql .= ", user_mobile = '" . $this->db->escape($this->user_mobile) . "'";

-        $sql .= ", email = '" . $this->db->escape($this->email) . "'";

-        $sql .= ", skype = '" . $this->db->escape($this->skype) . "'";

-        $sql .= ", twitter = '" . $this->db->escape($this->twitter) . "'";

-        $sql .= ", facebook = '" . $this->db->escape($this->facebook) . "'";

-        $sql .= ", job = '" . $this->db->escape($this->job) . "'";

-        $sql .= ", signature = '" . $this->db->escape($this->signature) . "'";

-        $sql .= ", accountancy_code = '" . $this->db->escape($this->accountancy_code) . "'";

-        $sql .= ", color = '" . $this->db->escape($this->color) . "'";

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

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

-        $sql .= ", note = '" . $this->db->escape($this->note) . "'";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-        $sql .= ", entity = '" . $this->db->escape($this->entity) . "'";

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

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

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

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

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

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

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

 

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

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

 

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

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

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

         if ($resql) {

             $nbrowsaffected += $this->db->affected_rows($resql);

@@ -1459,8 +1459,8 @@ 
 

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

             if ($this->fk_member > 0) {

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

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

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

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

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

                 if (!$resql) {

                     $this->error = $this->db->error();

@@ -1469,8 +1469,8 @@ 
                 }

             }

             // Set link to user

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

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

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

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

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

             if (!$resql) {

                 $this->error = $this->db->error();

@@ -1480,9 +1480,9 @@ 
 

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

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

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

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

 

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

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

 

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

                     // if this is an update.

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

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

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

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

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

                             $error++;

                         }

                     } else {

@@ -1533,9 +1533,9 @@ 
                 }

 

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

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

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

 

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

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

 

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

                     // if this is an update.

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

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

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

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

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

                             $error++;

                         }

                     } else {

@@ -1609,7 +1609,7 @@ 
                 $this->db->commit();

                 return $nbrowsaffected;

             } else {

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

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

                 $this->db->rollback();

                 return -1;

             }

@@ -1632,20 +1632,20 @@ 
         // phpcs:enable

         $now = dol_now();

 

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

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

         $sql .= " datepreviouslogin = datelastlogin,";

-        $sql .= " datelastlogin = '" . $this->db->idate($now) . "',";

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

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

+        $sql .= " datelastlogin = '".$this->db->idate($now)."',";

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

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

 

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

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

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

         if ($resql) {

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

             $this->datelastlogin = $now;

             return 1;

         } else {

-            $this->error = $this->db->lasterror() . ' sql=' . $sql;

+            $this->error = $this->db->lasterror().' sql='.$sql;

             return -1;

         }

     }

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

     {

         global $conf, $langs;

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

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

 

         $error = 0;

 

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

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

 

         // If new password not provided, we generate one

         if (!$password) {

@@ -1684,17 +1684,17 @@ 
 

             $this->db->begin();

 

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

-            $sql .= " SET pass_crypted = '" . $this->db->escape($password_crypted) . "',";

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

+            $sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";

             $sql .= " pass_temp = null";

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

                 $sql .= ", pass = null";

             } else {

-                $sql .= ", pass = '" . $this->db->escape($password) . "'";

+                $sql .= ", pass = '".$this->db->escape($password)."'";

             }

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

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

 

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

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

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

             if ($result) {

                 if ($this->db->affected_rows($result)) {

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

 

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

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

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

 

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

                         // if this is an update.

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

                             if ($result < 0) {

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

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

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

                                 $error++;

                             }

                         } else {

@@ -1723,7 +1723,7 @@ 
                         }

                     }

 

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

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

 

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

                         // Call trigger

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

             // We store clear password in password temporary field.

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

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

-            $sql .= " SET pass_temp = '" . $this->db->escape($password) . "'";

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

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

+            $sql .= " SET pass_temp = '".$this->db->escape($password)."'";

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

 

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

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

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

             if ($result) {

                 return $password;

@@ -1780,7 +1780,7 @@ 
         global $conf, $langs;

         global $dolibarr_main_url_root;

 

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

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

 

         $msgishtml = 0;

 

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

 

         // Define $urlwithroot

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

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

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

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

 

         if (!$changelater) {

-            $url = $urlwithroot . '/';

+            $url = $urlwithroot.'/';

 

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

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

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

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

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

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

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

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

             $mesg .= "\n";

 

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

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

             $mesg .= "--\n";

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

 

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

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

         } else {

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

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

 

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

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

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

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

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

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

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

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

             $mesg .= "\n";

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

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

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

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

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

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

 

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

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

         }

 

         $mailfile = new CMailFile(

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

         } else {

             $langs->trans("errors");

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

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

             return -1;

         }

     }

@@ -1869,8 +1869,8 @@ 
     {

         // phpcs:enable

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

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

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

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

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

 

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

         if ($resql) {

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

         $this->db->begin();

 

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

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

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

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

 

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

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

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

 

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

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

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

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

-        $sql .= ", '" . $this->db->escape($this->clicktodial_url) . "'";

-        $sql .= ", '" . $this->db->escape($this->clicktodial_login) . "'";

-        $sql .= ", '" . $this->db->escape($this->clicktodial_password) . "'";

-        $sql .= ", '" . $this->db->escape($this->clicktodial_poste) . "')";

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

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

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

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

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

 

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

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

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

         if ($result) {

             $this->db->commit();

@@ -1948,20 +1948,20 @@ 
 

         $this->db->begin();

 

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

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

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

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

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

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

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

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

 

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

 

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

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

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

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

 

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

         if ($result) {

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

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

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

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

 

                 // Call trigger

@@ -1976,7 +1976,7 @@ 
                 $this->db->commit();

                 return 1;

             } else {

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

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

                 $this->db->rollback();

                 return -2;

             }

@@ -2005,15 +2005,15 @@ 
 

         $this->db->begin();

 

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

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

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

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

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

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

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

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

 

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

         if ($result) {

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

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

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

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

 

                 // Call trigger

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

             } else {

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

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

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

                 $this->db->rollback();

                 return -2;

             }

@@ -2052,7 +2052,7 @@ 
      */

     function getPhotoUrl($width, $height, $cssclass = '', $imagesize = '')

     {

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

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

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

         $result .= '</a>';

 

@@ -2102,56 +2102,56 @@ 
 

         // Info Login

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

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

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

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

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

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

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

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

         }

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

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

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

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

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

         }

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

             $thirdpartystatic = new Societe($db);

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

             if (empty($hidethirdpartylogo)) {

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

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

             }

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

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

         }

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

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

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

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

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

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

         $label .= '</div>';

         if ($infologin > 0) {

             $label .= '<br>';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

             $s = picto_from_langcode($langs->getDefaultLang());

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         }

         if ($infologin < 0)

             $label = '';

 

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

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

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

         if ($option == 'leave') {

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

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

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

         }

         if ($option != 'nolink') {

             // Add param to save lastsearch_values or not

@@ -2162,16 +2162,16 @@ 
                 $url .= '&save_lastsearch_values=1';

         }

 

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

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

         $linkclose = "";

         if (empty($notooltip)) {

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

                 $langs->load("users");

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

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

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

             }

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

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

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

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

 

             /*

               $hookmanager->initHooks(array('userdao'));

@@ -2181,7 +2181,7 @@ 
              */

         }

 

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

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

         $linkend = '</a>';

 

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

@@ -2192,15 +2192,15 @@ 
                 $paddafterimage = 'style="margin-right: 3px;"';

             // Only picto

             if ($withpictoimg > 0)

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

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

             // Picto must be a photo

             else

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

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

             $result .= $picto;

         }

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

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

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

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

             if ($mode == 'login')

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

             else

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

         $hookmanager->initHooks(array('userdao'));

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

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

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

         if ($reshook > 0) {

             $result = $hookmanager->resPrint;

         } else {

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

 

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

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

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

         $linkend = '</a>';

 

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

@@ -2249,7 +2249,7 @@ 
 

         if ($option == 'xxx') {

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

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

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

             $linkend = '</a>';

         }

 

@@ -2305,9 +2305,9 @@ 
         }

         elseif ($mode == 2) {

             if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

+                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');

             elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

+                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');

         }

         elseif ($mode == 3) {

             if ($statut == 1)

@@ -2317,15 +2317,15 @@ 
         }

         elseif ($mode == 4) {

             if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

+                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');

             elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

+                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');

         }

         elseif ($mode == 5) {

             if ($statut == 1)

-                return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

+                return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

             elseif ($statut == 0)

-                return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+                return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

         }

     }

 

@@ -2345,11 +2345,11 @@ 
         global $conf;

         $dn = '';

         if ($mode == 0)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . $conf->global->LDAP_USER_DN;

+            $dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS].",".$conf->global->LDAP_USER_DN;

         elseif ($mode == 1)

             $dn = $conf->global->LDAP_USER_DN;

         elseif ($mode == 2)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS];

+            $dn = $conf->global->LDAP_KEY_USERS."=".$info[$conf->global->LDAP_KEY_USERS];

         return $dn;

     }

 

@@ -2532,8 +2532,8 @@ 
     {

         $sql = "SELECT u.rowid, u.login as ref, u.datec,";

         $sql .= " u.tms as date_modification, u.entity";

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

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

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

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

 

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

         if ($result) {

@@ -2562,9 +2562,9 @@ 
     function getNbOfEMailings()

     {

         $sql = "SELECT count(mc.email) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";

-        $sql .= " WHERE mc.email = '" . $this->db->escape($this->email) . "'";

-        $sql .= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes

+        $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";

+        $sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";

+        $sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes

 

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

         if ($resql) {

@@ -2592,18 +2592,18 @@ 
         global $conf;

 

         $sql = "SELECT count(rowid) as nb";

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

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

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

             if ($admin >= 0)

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

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

         }

         else {

-            $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

+            $sql .= " WHERE entity IN (".getEntity('user', 0).")";

             if ($limitTo == 'active')

                 $sql .= " AND statut = 1";

             if ($admin >= 0)

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

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

         }

 

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

@@ -2653,7 +2653,7 @@ 
 

         $result = $this->update($user);

 

-        dol_syslog(get_class($this) . "::update_ldap2dolibarr result=" . $result, LOG_DEBUG);

+        dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);

 

         return $result;

     }

@@ -2668,10 +2668,10 @@ 
     function get_children()

     {

         // phpcs:enable

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

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

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

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

 

-        dol_syslog(get_class($this) . "::get_children result=" . $result, LOG_DEBUG);

+        dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);

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

         if ($res) {

             $users = array();

@@ -2700,11 +2700,11 @@ 
 

         // Load array[child]=parent

         $sql = "SELECT fk_user as id_parent, rowid as id_son";

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

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

         $sql .= " WHERE fk_user <> 0";

-        $sql .= " AND entity IN (" . getEntity('user') . ")";

+        $sql .= " AND entity IN (".getEntity('user').")";

 

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

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

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

         if ($resql) {

             while ($obj = $this->db->fetch_object($resql)) {

@@ -2747,19 +2747,19 @@ 
 

         // Init $this->users array

         $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates

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

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

         // Add fields from hooks

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('printUserListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook

         if ($reshook > 0) {

             $sql .= $hookmanager->resPrint;

         } else {

-            $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

+            $sql .= " WHERE u.entity IN (".getEntity('user').")";

         }

         if ($filter)

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

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

 

-        dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

+        dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);

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

         if ($resql) {

             $i = 0;

@@ -2785,7 +2785,7 @@ 
         }

 

         // We add the fullpath property to each elements of first level (no parent exists)

-        dol_syslog(get_class($this) . "::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

+        dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

         foreach ($this->users as $key => $val) {

             $result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)

             if ($result < 0) {

@@ -2797,18 +2797,18 @@ 
         // Exclude leaf including $deleteafterid from tree

         if ($deleteafterid) {

             //print "Look to discard user ".$deleteafterid."\n";

-            $keyfilter1 = '^' . $deleteafterid . '$';

-            $keyfilter2 = '_' . $deleteafterid . '$';

-            $keyfilter3 = '^' . $deleteafterid . '_';

-            $keyfilter4 = '_' . $deleteafterid . '_';

+            $keyfilter1 = '^'.$deleteafterid.'$';

+            $keyfilter2 = '_'.$deleteafterid.'$';

+            $keyfilter3 = '^'.$deleteafterid.'_';

+            $keyfilter4 = '_'.$deleteafterid.'_';

             foreach ($this->users as $key => $val) {

-                if (preg_match('/' . $keyfilter1 . '/', $val['fullpath']) || preg_match('/' . $keyfilter2 . '/', $val['fullpath']) || preg_match('/' . $keyfilter3 . '/', $val['fullpath']) || preg_match('/' . $keyfilter4 . '/', $val['fullpath'])) {

+                if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath']) || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {

                     unset($this->users[$key]);

                 }

             }

         }

 

-        dol_syslog(get_class($this) . "::get_full_tree dol_sort_array", LOG_DEBUG);

+        dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);

         $this->users = dol_sort_array($this->users, 'fullname', 'asc', true, false);

 

         //var_dump($this->users);

@@ -2836,10 +2836,10 @@ 
 

             $idtoscan = $this->id;

 

-            dol_syslog("Build childid for id = " . $idtoscan);

+            dol_syslog("Build childid for id = ".$idtoscan);

             foreach ($this->users as $id => $val) {

                 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath']))

+                if (preg_match('/_'.$idtoscan.'_/', $val['fullpath']))

                     $childids[$val['id']] = $val['id'];

             }

         }

@@ -2863,16 +2863,16 @@ 
     function build_path_from_id_user($id_user, $protection = 0)

     {

         // phpcs:enable

-        dol_syslog(get_class($this) . "::build_path_from_id_user id_user=" . $id_user . " protection=" . $protection, LOG_DEBUG);

+        dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);

 

         if (!empty($this->users[$id_user]['fullpath'])) {

             // Already defined

-            dol_syslog(get_class($this) . "::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

+            dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

             return 0;

         }

 

         // Define fullpath and fullname

-        $this->users[$id_user]['fullpath'] = '_' . $id_user;

+        $this->users[$id_user]['fullpath'] = '_'.$id_user;

         $this->users[$id_user]['fullname'] = $this->users[$id_user]['lastname'];

         $i = 0;

         $cursor_user = $id_user;

@@ -2881,11 +2881,11 @@ 
         while (!empty($this->parentof[$cursor_user])) {

             if (in_array($this->parentof[$cursor_user], $useridfound)) {

                 dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);

-                return -1;     // Should not happen. Protection against looping hierarchy

+                return -1; // Should not happen. Protection against looping hierarchy

             }

             $useridfound[] = $this->parentof[$cursor_user];

-            $this->users[$id_user]['fullpath'] = '_' . $this->parentof[$cursor_user] . $this->users[$id_user]['fullpath'];

-            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'] . ' >> ' . $this->users[$id_user]['fullname'];

+            $this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];

+            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'].' >> '.$this->users[$id_user]['fullname'];

             $i++;

             $cursor_user = $this->parentof[$cursor_user];

         }

@@ -2927,10 +2927,10 @@ 
         $this->nb = array();

 

         $sql = "SELECT count(u.rowid) as nb";

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

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

         $sql .= " WHERE u.statut > 0";

         //$sql.= " AND employee != 0";

-        $sql .= " AND u.entity IN (" . getEntity('user') . ")";

+        $sql .= " AND u.entity IN (".getEntity('user').")";

 

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

         if ($resql) {

@@ -2994,8 +2994,8 @@ 
             return '';

 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

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

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

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

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

 

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

         if ($resql) {

@@ -3005,7 +3005,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 if ($mode == 'email')

-                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

+                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";

                 else if ($mode == 'mobile')

                     $user_property = $obj->user_mobile;

             }

@@ -3032,7 +3032,7 @@ 
         global $conf;

 

         $sql = "SELECT t.rowid";

-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t ';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';

         $sql .= " WHERE 1";

 

         // Manage filter

@@ -3040,24 +3040,24 @@ 
         if (!empty($filter)) {

             foreach ($filter as $key => $value) {

                 if ($key == 't.rowid') {

-                    $sqlwhere[] = $key . '=' . $value;

+                    $sqlwhere[] = $key.'='.$value;

                 } elseif (strpos($key, 'date') !== false) {

-                    $sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';

+                    $sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';

                 } elseif ($key == 'customsql') {

                     $sqlwhere[] = $value;

                 } else {

-                    $sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';

+                    $sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';

                 }

             }

         }

         if (count($sqlwhere) > 0) {

-            $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

+            $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';

         }

         $sql .= $this->db->order($sortfield, $sortorder);

         if ($limit)

             $sql .= $this->db->plimit($limit + 1, $offset);

 

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

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

 

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

         if ($resql) {

Braces +308 added lines, -226 removed lines

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

             }

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

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

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

-            else

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

+            if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+                            $sql .= " WHERE u.entity IS NOT NULL";
+            }
+            // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

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

         }

 

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

@@ -342,16 +346,16 @@ 
 

                 // Protection when module multicompany was set, admin was set to first entity and then, the module was disabled,

                 // in such case, this admin user must be admin for ALL entities.

-                if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1)

-                    $this->entity = 0;

+                if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) {
+                                    $this->entity = 0;
+                }
 

                 // Retreive all extrafield

                 // fetch optionals attributes and labels

                 $this->fetch_optionals();

 

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

-            }

-            else {

+            } else {

                 $this->error = "USERNOTFOUND";

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

 

@@ -377,13 +381,13 @@ 
                 while ($i < $num) {

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

                     $p = (!empty($obj->param) ? $obj->param : '');

-                    if (!empty($p))

-                        $this->conf->$p = $obj->value;

+                    if (!empty($p)) {
+                                            $this->conf->$p = $obj->value;
+                    }
                     $i++;

                 }

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

-            }

-            else {

+            } else {

                 $this->error = $this->db->lasterror();

                 return -2;

             }

@@ -492,12 +496,12 @@ 
             // Where pour la liste des droits a ajouter

             $whereforadd = "id=" . $this->db->escape($rid);

             // Ajout des droits induits

-            if (!empty($subperms))

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

-            else if (!empty($perms))

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

-        }

-        else {

+            if (!empty($subperms)) {
+                            $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
+            } else if (!empty($perms)) {
+                            $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
+            }
+        } else {

             // On a pas demande un droit en particulier mais une liste de droits

             // sur la base d'un nom de module de de perms

             // Where pour la liste des droits a ajouter

@@ -506,8 +510,9 @@ 
                     $whereforadd = 'allmodules';

                 } else {

                     $whereforadd = "module='" . $this->db->escape($allmodule) . "'";

-                    if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                    if (!empty($allperms)) {
+                                            $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";
+                    }
                 }

             }

         }

@@ -531,16 +536,17 @@ 
                     $nid = $obj->id;

 

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

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
                     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error($this->db);

             }

@@ -610,12 +616,13 @@ 
             // Where pour la liste des droits a supprimer

             $wherefordel = "id=" . $this->db->escape($rid);

             // Suppression des droits induits

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

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

-            if ($perms == 'lire' || $perms == 'read')

-                $wherefordel .= " OR (module='$module')";

-        }

-        else {

+            if ($subperms == 'lire' || $subperms == 'read') {
+                            $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
+            }
+            if ($perms == 'lire' || $perms == 'read') {
+                            $wherefordel .= " OR (module='$module')";
+            }
+        } else {

             // On a demande suppression d'un droit sur la base d'un nom de module ou perms

             // Where pour la liste des droits a supprimer

             if (!empty($allmodule)) {

@@ -623,8 +630,9 @@ 
                     $wherefordel = 'allmodules';

                 } else {

                     $wherefordel = "module='" . $this->db->escape($allmodule) . "'";

-                    if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                    if (!empty($allperms)) {
+                                            $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";
+                    }
                 }

             }

         }

@@ -650,13 +658,13 @@ 
                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights";

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

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

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error($this->db);

             }

@@ -734,8 +742,9 @@ 
         }

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

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

-        if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+        if ($moduletag) {
+                    $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";
+        }
 

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

         if ($resql) {

@@ -749,21 +758,26 @@ 
                 $subperms = $obj->subperms;

 

                 if ($perms) {

-                    if (!isset($this->rights) || !is_object($this->rights))

-                        $this->rights = new stdClass(); // For avoid error

+                    if (!isset($this->rights) || !is_object($this->rights)) {
+                                            $this->rights = new stdClass();
+                    }
+                    // For avoid error

                     if ($module) {

-                        if (!isset($this->rights->$module) || !is_object($this->rights->$module))

-                            $this->rights->$module = new stdClass();

+                        if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+                                                    $this->rights->$module = new stdClass();
+                        }
                         if ($subperms) {

-                            if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms))

-                                $this->rights->$module->$perms = new stdClass();

-                            if (empty($this->rights->$module->$perms->$subperms))

-                                $this->nb_rights++;

+                            if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+                                                            $this->rights->$module->$perms = new stdClass();
+                            }
+                            if (empty($this->rights->$module->$perms->$subperms)) {
+                                                            $this->nb_rights++;
+                            }
                             $this->rights->$module->$perms->$subperms = 1;

-                        }

-                        else {

-                            if (empty($this->rights->$module->$perms))

-                                $this->nb_rights++;

+                        } else {

+                            if (empty($this->rights->$module->$perms)) {
+                                                            $this->nb_rights++;
+                            }
                             $this->rights->$module->$perms = 1;

                         }

                     }

@@ -792,8 +806,9 @@ 
         $sql .= " AND gr.fk_usergroup = gu.fk_usergroup";

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

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

-        if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+        if ($moduletag) {
+                    $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";
+        }
 

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

         if ($resql) {

@@ -807,23 +822,29 @@ 
                 $subperms = $obj->subperms;

 

                 if ($perms) {

-                    if (!isset($this->rights) || !is_object($this->rights))

-                        $this->rights = new stdClass(); // For avoid error

-                    if (!isset($this->rights->$module) || !is_object($this->rights->$module))

-                        $this->rights->$module = new stdClass();

+                    if (!isset($this->rights) || !is_object($this->rights)) {
+                                            $this->rights = new stdClass();
+                    }
+                    // For avoid error

+                    if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+                                            $this->rights->$module = new stdClass();
+                    }
                     if ($subperms) {

-                        if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms))

-                            $this->rights->$module->$perms = new stdClass();

-                        if (empty($this->rights->$module->$perms->$subperms))

-                            $this->nb_rights++;

+                        if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+                                                    $this->rights->$module->$perms = new stdClass();
+                        }
+                        if (empty($this->rights->$module->$perms->$subperms)) {
+                                                    $this->nb_rights++;
+                        }
                         $this->rights->$module->$perms->$subperms = 1;

-                    }

-                    else {

-                        if (empty($this->rights->$module->$perms))

-                            $this->nb_rights++;

+                    } else {

+                        if (empty($this->rights->$module->$perms)) {
+                                                    $this->nb_rights++;
+                        }
                         // if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group

-                        if (!is_object($this->rights->$module->$perms))

-                            $this->rights->$module->$perms = 1;

+                        if (!is_object($this->rights->$module->$perms)) {
+                                                    $this->rights->$module->$perms = 1;
+                        }
                     }

                 }

                 $i++;

@@ -832,10 +853,12 @@ 
         }

 

         // For backward compatibility

-        if (isset($this->rights->propale) && !isset($this->rights->propal))

-            $this->rights->propal = $this->rights->propale;

-        if (isset($this->rights->propal) && !isset($this->rights->propale))

-            $this->rights->propale = $this->rights->propal;

+        if (isset($this->rights->propale) && !isset($this->rights->propal)) {
+                    $this->rights->propal = $this->rights->propale;
+        }
+        if (isset($this->rights->propal) && !isset($this->rights->propale)) {
+                    $this->rights->propale = $this->rights->propal;
+        }
 

         if (!$moduletag) {

             // Si module etait non defini, alors on a tout charge, on peut donc considerer

@@ -860,10 +883,11 @@ 
         $error = 0;

 

         // Check parameters

-        if ($this->statut == $statut)

-            return 0;

-        else

-            $this->statut = $statut;

+        if ($this->statut == $statut) {
+                    return 0;
+        } else {
+                    $this->statut = $statut;
+        }
 

         $this->db->begin();

 

@@ -1030,8 +1054,10 @@ 
 

         // Clean parameters

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

-        if (!isset($this->entity))

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

+        if (!isset($this->entity)) {
+                    $this->entity = $conf->entity;
+        }
+        // If not defined, we use default value

 

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

 

@@ -1167,8 +1193,9 @@ 
         $this->country_id = $contact->country_id;

         $this->employee = 0;

 

-        if (empty($login))

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

+        if (empty($login)) {
+                    $login = strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
+        }
         $this->login = $login;

 

         $this->db->begin();

@@ -1178,8 +1205,9 @@ 
         if ($result > 0) {

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

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

-            if ($contact->socid)

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

+            if ($contact->socid) {
+                            $sql .= ", fk_soc=" . $contact->socid;
+            }
             $sql .= " WHERE rowid=" . $this->id;

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

 

@@ -1240,8 +1268,9 @@ 
         $this->state_id = $member->state_id;

         $this->country_id = $member->country_id;

 

-        if (empty($login))

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

+        if (empty($login)) {
+                    $login = strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));
+        }
         $this->login = $login;

 

         $this->db->begin();

@@ -1250,8 +1279,9 @@ 
         $result = $this->create($user);

         if ($result > 0) {

             $newpass = $this->setPassword($user, $this->pass);

-            if (is_numeric($newpass) && $newpass < 0)

-                $result = -2;

+            if (is_numeric($newpass) && $newpass < 0) {
+                            $result = -2;
+            }
 

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

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

@@ -1317,8 +1347,9 @@ 
 

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

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

-            if (!$result)

-                return -1;

+            if (!$result) {
+                            return -1;
+            }
             $i++;

         }

 

@@ -1403,8 +1434,10 @@ 
         $sql .= ", api_key = " . ($this->api_key ? "'" . $this->db->escape($this->api_key) . "'" : "null");

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

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

-        if (!empty($user->admin))

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

+        if (!empty($user->admin)) {
+                    $sql .= ", admin = " . $this->admin;
+        }
+        // admin flag can be set/unset only by an admin user

         $sql .= ", address = '" . $this->db->escape($this->address) . "'";

         $sql .= ", zip = '" . $this->db->escape($this->zip) . "'";

         $sql .= ", town = '" . $this->db->escape($this->town) . "'";

@@ -1427,14 +1460,18 @@ 
         $sql .= ", photo = " . ($this->photo ? "'" . $this->db->escape($this->photo) . "'" : "null");

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

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

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

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

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

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

-        if (isset($this->salary) || $this->salary != '')

-            $sql .= ", salary= " . ($this->salary != '' ? "'" . $this->db->escape($this->salary) . "'" : "null");

-        if (isset($this->salaryextra) || $this->salaryextra != '')

-            $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . $this->db->escape($this->salaryextra) . "'" : "null");

+        if (isset($this->thm) || $this->thm != '') {
+                    $sql .= ", thm= " . ($this->thm != '' ? "'" . $this->db->escape($this->thm) . "'" : "null");
+        }
+        if (isset($this->tjm) || $this->tjm != '') {
+                    $sql .= ", tjm= " . ($this->tjm != '' ? "'" . $this->db->escape($this->tjm) . "'" : "null");
+        }
+        if (isset($this->salary) || $this->salary != '') {
+                    $sql .= ", salary= " . ($this->salary != '' ? "'" . $this->db->escape($this->salary) . "'" : "null");
+        }
+        if (isset($this->salaryextra) || $this->salaryextra != '') {
+                    $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . $this->db->escape($this->salaryextra) . "'" : "null");
+        }
         $sql .= ", weeklyhours= " . ($this->weeklyhours != '' ? "'" . $this->db->escape($this->weeklyhours) . "'" : "null");

         $sql .= ", entity = '" . $this->db->escape($this->entity) . "'";

         $sql .= ", default_range = " . ($this->default_range > 0 ? $this->default_range : 'null');

@@ -1452,8 +1489,9 @@ 
                 if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {

                     // Si mot de passe saisi et different de celui en base

                     $result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);

-                    if (!$nbrowsaffected)

-                        $nbrowsaffected++;

+                    if (!$nbrowsaffected) {
+                                            $nbrowsaffected++;
+                    }
                 }

             }

 

@@ -1679,8 +1717,9 @@ 
 

         // Mise a jour

         if (!$changelater) {

-            if (!is_object($this->oldcopy))

-                $this->oldcopy = clone $this;

+            if (!is_object($this->oldcopy)) {
+                            $this->oldcopy = clone $this;
+            }
 

             $this->db->begin();

 

@@ -1798,8 +1837,9 @@ 
         $outputlangs->loadLangs(array("main", "errors", "users", "other"));

 

         $appli = constant('DOL_APPLICATION_TITLE');

-        if (!empty($conf->global->MAIN_APPLICATION_TITLE))

-            $appli = $conf->global->MAIN_APPLICATION_TITLE;

+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+                    $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        }
 

         $subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword", $appli);

 

@@ -2127,8 +2167,9 @@ 
             $label .= '<br>';

             $label .= '<br><u>' . $langs->trans("Connection") . '</u>';

             $label .= '<br><b>' . $langs->trans("IPAddress") . '</b>: ' . $_SERVER["REMOTE_ADDR"];

-            if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY))

-                $label .= '<br><b>' . $langs->trans("ConnectedOnMultiCompany") . ':</b> ' . $conf->entity . ' (user entity ' . $this->entity . ')';

+            if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+                            $label .= '<br><b>' . $langs->trans("ConnectedOnMultiCompany") . ':</b> ' . $conf->entity . ' (user entity ' . $this->entity . ')';
+            }
             $label .= '<br><b>' . $langs->trans("AuthenticationMode") . ':</b> ' . $_SESSION["dol_authmode"] . (empty($dolibarr_main_demo) ? '' : ' (demo)');

             $label .= '<br><b>' . $langs->trans("ConnectedSince") . ':</b> ' . dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

             $label .= '<br><b>' . $langs->trans("PreviousConnexion") . ':</b> ' . dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

@@ -2139,13 +2180,16 @@ 
             $label .= '<br><b>' . $langs->trans("Browser") . ':</b> ' . $conf->browser->name . ($conf->browser->version ? ' ' . $conf->browser->version : '') . ' (' . $_SERVER['HTTP_USER_AGENT'] . ')';

             $label .= '<br><b>' . $langs->trans("Layout") . ':</b> ' . $conf->browser->layout;

             $label .= '<br><b>' . $langs->trans("Screen") . ':</b> ' . $_SESSION['dol_screenwidth'] . ' x ' . $_SESSION['dol_screenheight'];

-            if ($conf->browser->layout == 'phone')

-                $label .= '<br><b>' . $langs->trans("Phone") . ':</b> ' . $langs->trans("Yes");

-            if (!empty($_SESSION["disablemodules"]))

-                $label .= '<br><b>' . $langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));

+            if ($conf->browser->layout == 'phone') {
+                            $label .= '<br><b>' . $langs->trans("Phone") . ':</b> ' . $langs->trans("Yes");
+            }
+            if (!empty($_SESSION["disablemodules"])) {
+                            $label .= '<br><b>' . $langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));
+            }
         }

-        if ($infologin < 0)

-            $label = '';

+        if ($infologin < 0) {
+                    $label = '';
+        }
 

         // $url = DOL_URL_ROOT . '/user/card.php?id=' . $this->id;

         $url = BASE_URI . '?controller=user&method=card&id=' . $this->id;

@@ -2156,10 +2200,12 @@ 
         if ($option != 'nolink') {

             // Add param to save lastsearch_values or not

             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);

-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))

-                $add_save_lastsearch_values = 1;

-            if ($add_save_lastsearch_values)

-                $url .= '&save_lastsearch_values=1';

+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+                            $add_save_lastsearch_values = 1;
+            }
+            if ($add_save_lastsearch_values) {
+                            $url .= '&save_lastsearch_values=1';
+            }
         }

 

         $linkstart = '<a href="' . $url . '"';

@@ -2188,25 +2234,31 @@ 
         $result .= (($option == 'nolink') ? '' : $linkstart);

         if ($withpictoimg) {

             $paddafterimage = '';

-            if (abs($withpictoimg) == 1)

-                $paddafterimage = 'style="margin-right: 3px;"';

+            if (abs($withpictoimg) == 1) {
+                            $paddafterimage = 'style="margin-right: 3px;"';
+            }
             // Only picto

-            if ($withpictoimg > 0)

-                $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';

+            if ($withpictoimg > 0) {
+                            $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';
+            }
             // Picto must be a photo

-            else

-                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';

+            else {
+                            $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';
+            }
             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';

-            if ($mode == 'login')

-                $result .= dol_trunc($this->login, $maxlen);

-            else

-                $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '</div>';

+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';
+            }
+            if ($mode == 'login') {
+                            $result .= dol_trunc($this->login, $maxlen);
+            } else {
+                            $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+            }
+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '</div>';
+            }
         }

         $result .= (($option == 'nolink') ? '' : $linkend);

         //if ($withpictoimg == -1) $result.='</div>';

@@ -2244,8 +2296,9 @@ 
         $linkend = '</a>';

 

         //Check user's rights to see an other user

-        if ((!$user->rights->user->user->lire && $this->id != $user->id))

-            $option = 'nolink';

+        if ((!$user->rights->user->user->lire && $this->id != $user->id)) {
+                    $option = 'nolink';
+        }
 

         if ($option == 'xxx') {

             //$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

@@ -2259,8 +2312,9 @@ 
         }

 

         $result .= $linkstart;

-        if ($withpicto)

-            $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');

+        if ($withpicto) {
+                    $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+        }
         $result .= $this->login;

         $result .= $linkend;

         return $result;

@@ -2292,40 +2346,41 @@ 
         $langs->load('users');

 

         if ($mode == 0) {

-            if ($statut == 1)

-                return $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled');

-        }

-        elseif ($mode == 1) {

-            if ($statut == 1)

-                return $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled');

-        }

-        elseif ($mode == 2) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

-        }

-        elseif ($mode == 3) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

-        }

-        elseif ($mode == 4) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

-        }

-        elseif ($mode == 5) {

-            if ($statut == 1)

-                return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+            if ($statut == 1) {
+                            return $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled');
+            }
+        } elseif ($mode == 1) {

+            if ($statut == 1) {
+                            return $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled');
+            }
+        } elseif ($mode == 2) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');
+            }
+        } elseif ($mode == 3) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+            }
+        } elseif ($mode == 4) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');
+            }
+        } elseif ($mode == 5) {

+            if ($statut == 1) {
+                            return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+            }
         }

     }

 

@@ -2344,12 +2399,13 @@ 
         // phpcs:enable

         global $conf;

         $dn = '';

-        if ($mode == 0)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . $conf->global->LDAP_USER_DN;

-        elseif ($mode == 1)

-            $dn = $conf->global->LDAP_USER_DN;

-        elseif ($mode == 2)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS];

+        if ($mode == 0) {
+                    $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . $conf->global->LDAP_USER_DN;
+        } elseif ($mode == 1) {
+                    $dn = $conf->global->LDAP_USER_DN;
+        } elseif ($mode == 2) {
+                    $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS];
+        }
         return $dn;

     }

 

@@ -2396,38 +2452,51 @@ 
 

                 // Check if it is the LDAP key and if its value has been changed

                 if (!empty($conf->global->LDAP_KEY_USERS) && $conf->global->LDAP_KEY_USERS == $conf->global->$constname) {

-                    if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname)

-                        $keymodified = true; // For check if LDAP key has been modified

+                    if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
+                                            $keymodified = true;
+                    }
+                    // For check if LDAP key has been modified

                 }

             }

         }

-        if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS))

-            $info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;

-        if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP))

-            $info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;

-        if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN))

-            $info[$conf->global->LDAP_FIELD_TOWN] = $this->town;

-        if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION))

-            $info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);

+        if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS)) {
+                    $info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;
+        }
+        if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP)) {
+                    $info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;
+        }
+        if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN)) {
+                    $info[$conf->global->LDAP_FIELD_TOWN] = $this->town;
+        }
+        if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION)) {
+                    $info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);
+        }
         if ($this->socid > 0) {

             $soc = new Societe($this->db);

             $soc->fetch($this->socid);

 

             $info[$conf->global->LDAP_FIELD_COMPANY] = $soc->name;

-            if ($soc->client == 1)

-                $info["businessCategory"] = "Customers";

-            if ($soc->client == 2)

-                $info["businessCategory"] = "Prospects";

-            if ($soc->fournisseur == 1)

-                $info["businessCategory"] = "Suppliers";

+            if ($soc->client == 1) {
+                            $info["businessCategory"] = "Customers";
+            }
+            if ($soc->client == 2) {
+                            $info["businessCategory"] = "Prospects";
+            }
+            if ($soc->fournisseur == 1) {
+                            $info["businessCategory"] = "Suppliers";
+            }
         }

 

         // When password is modified

         if (!empty($this->pass)) {

-            if (!empty($conf->global->LDAP_FIELD_PASSWORD))

-                $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte

-            if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))

-                $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)

+            if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+                            $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass;
+            }
+            // this->pass = mot de passe non crypte

+            if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+                            $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4);
+            }
+            // Create OpenLDAP MD5 password (TODO add type of encryption)

         }

         // Set LDAP password if possible

         elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password

@@ -2441,10 +2510,14 @@ 
             }

             // Use $this->pass_indatabase value if exists

             elseif (!empty($this->pass_indatabase)) {

-                if (!empty($conf->global->LDAP_FIELD_PASSWORD))

-                    $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte

-                if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))

-                    $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption

+                if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+                                    $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase;
+                }
+                // $this->pass_indatabase = mot de passe non crypte

+                if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+                                    $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4);
+                }
+                // md5 for OpenLdap TODO add type of encryption

             }

         }

 

@@ -2467,10 +2540,12 @@ 
 

             $info["phpgwContactOwner"] = $this->egroupware_id;

 

-            if ($this->email)

-                $info["rfc822Mailbox"] = $this->email;

-            if ($this->phone_mobile)

-                $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;

+            if ($this->email) {
+                            $info["rfc822Mailbox"] = $this->email;
+            }
+            if ($this->phone_mobile) {
+                            $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+            }
         }

 

         return $info;

@@ -2595,15 +2670,17 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "user";

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

-            if ($admin >= 0)

-                $sql .= " AND admin = " . $admin;

-        }

-        else {

+            if ($admin >= 0) {
+                            $sql .= " AND admin = " . $admin;
+            }
+        } else {

             $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

-            if ($limitTo == 'active')

-                $sql .= " AND statut = 1";

-            if ($admin >= 0)

-                $sql .= " AND admin = " . $admin;

+            if ($limitTo == 'active') {
+                            $sql .= " AND statut = 1";
+            }
+            if ($admin >= 0) {
+                            $sql .= " AND admin = " . $admin;
+            }
         }

 

         $resql = $this->db->query($sql);

@@ -2756,8 +2833,9 @@ 
         } else {

             $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

         }

-        if ($filter)

-            $sql .= " AND " . $filter;

+        if ($filter) {
+                    $sql .= " AND " . $filter;
+        }
 

         dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

         $resql = $this->db->query($sql);

@@ -2839,14 +2917,16 @@ 
             dol_syslog("Build childid for id = " . $idtoscan);

             foreach ($this->users as $id => $val) {

                 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath']))

-                    $childids[$val['id']] = $val['id'];

+                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath'])) {
+                                    $childids[$val['id']] = $val['id'];
+                }
             }

         }

         $this->cache_childids[$this->id] = $childids;

 

-        if ($addcurrentuser)

-            $childids[$this->id] = $this->id;

+        if ($addcurrentuser) {
+                    $childids[$this->id] = $this->id;
+        }
 

         return $childids;

     }

@@ -2990,8 +3070,9 @@ 
         // phpcs:enable

         $user_property = '';

 

-        if (empty($rowid))

-            return '';

+        if (empty($rowid)) {
+                    return '';
+        }
 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

         $sql .= " FROM " . MAIN_DB_PREFIX . "user";

@@ -3004,14 +3085,14 @@ 
             if ($nump) {

                 $obj = $this->db->fetch_object($resql);

 

-                if ($mode == 'email')

-                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

-                else if ($mode == 'mobile')

-                    $user_property = $obj->user_mobile;

+                if ($mode == 'email') {
+                                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";
+                } else if ($mode == 'mobile') {
+                                    $user_property = $obj->user_mobile;
+                }
             }

             return $user_property;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -3054,8 +3135,9 @@ 
             $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

         }

         $sql .= $this->db->order($sortfield, $sortorder);

-        if ($limit)

-            $sql .= $this->db->plimit($limit + 1, $offset);

+        if ($limit) {
+                    $sql .= $this->db->plimit($limit + 1, $offset);
+        }
 

         dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

 

dolibarr/htdocs/accountancy/index.php

Spacing +23 added lines, -23 removed lines

@@ -22,10 +22,10 @@ 
  * \ingroup Advanced accountancy

  * \brief   Home accounting module

  */

-require DOL_BASE_PATH . '/main.inc.php';

+require DOL_BASE_PATH.'/main.inc.php';

 

-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

 

 // Load translation files required by the page

 $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict"));

@@ -52,23 +52,23 @@ 
 $step = 0;

 

 if ($conf->accounting->enabled) {

-    print $langs->trans("AccountancyAreaDescIntro") . "<br>\n";

+    print $langs->trans("AccountancyAreaDescIntro")."<br>\n";

     print "<br>\n";

     print "<br>\n";

 

-    print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> ' . $langs->trans("AccountancyAreaDescActionOnce"), '', '') . "<br>\n";

+    print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."<br>\n";

     print '<hr>';

     print "<br>\n";

 

     // STEPS

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="' . DOL_URL_ROOT . '/accountancy/admin/journals_list.php?id=35">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("AccountingJournals") . '</strong>' . '</a>');

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>'.'</a>');

     print "<br>\n";

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescChartModel", $step, '<a href="' . DOL_URL_ROOT . '/accountancy/admin/accountmodel.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("Pcg_version") . '</strong>' . '</a>');

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>'.'</a>');

     print "<br>\n";

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescChart", $step, '<a href="' . DOL_URL_ROOT . '/accountancy/admin/account.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("Chartofaccounts") . '</strong>' . '</a>');

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>'.'</a>');

     print "<br>\n";

 

     print "<br>\n";

@@ -77,21 +77,21 @@ 
     print "<br>\n";

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescDefault", $step, '<a href="' . DOL_URL_ROOT . '/accountancy/admin/defaultaccounts.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuDefaultAccounts") . '</strong>' . '</a>');

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>'.'</a>');

     print "<br>\n";

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescBank", $step, '<a href="' . DOL_URL_ROOT . '/compta/bank/list.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuBankAccounts") . '</strong>' . '</a>') . "\n";

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong>'.'</a>')."\n";

     print "<br>\n";

 

     $step++;

-    $textlink = '<a href="' . DOL_URL_ROOT . '/admin/dict.php?id=10&from=accountancy">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . '-' . $langs->transnoentitiesnoconv("MenuVatAccounts") . '</strong>' . '</a>';

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescVat", $step, $textlink);

+    $textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>'.'</a>';

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);

     print "<br>\n";

     if (!empty($conf->tax->enabled)) {

-        $textlink = '<a href="' . DOL_URL_ROOT . '/admin/dict.php?id=7&from=accountancy">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . '-' . $langs->transnoentitiesnoconv("MenuTaxAccounts") . '</strong>' . '</a>';

+        $textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>'.'</a>';

         $step++;

-        print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescContrib", $step, $textlink);

+        print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);

         print "<br>\n";

     }

     /* if (! empty($conf->salaries->enabled))

@@ -104,7 +104,7 @@ 
       } */

     if (!empty($conf->expensereport->enabled)) {  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.

         $step++;

-        print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="' . DOL_URL_ROOT . '/admin/dict.php?id=17&from=accountancy">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuExpenseReportAccounts") . '</strong>' . '</a>');

+        print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>'.'</a>');

         print "<br>\n";

     }

     /*

@@ -122,7 +122,7 @@ 
       } */

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescProd", $step, '<a href="' . DOL_URL_ROOT . '/accountancy/admin/productaccount.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("ProductsBinding") . '</strong>' . '</a>');

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>'.'</a>');

     print "<br>\n";

 

 

@@ -130,7 +130,7 @@ 
 

 

     print "<br>\n";

-    print load_fiche_titre('<span class="fa fa-calendar"></span> ' . $langs->trans("AccountancyAreaDescActionFreq"), '', '');

+    print load_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');

     print '<hr>';

     print "<br>\n";

     $step = 0;

@@ -138,28 +138,28 @@ 
     $langs->loadLangs(array('bills', 'trips'));

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="' . DOL_URL_ROOT . '/accountancy/customer/index.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . "-" . $langs->transnoentitiesnoconv("CustomersVentilation") . '</strong>' . '</a>') . "\n";

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>'.'</a>')."\n";

     print "<br>\n";

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="' . DOL_URL_ROOT . '/accountancy/supplier/index.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . "-" . $langs->transnoentitiesnoconv("SuppliersVentilation") . '</strong>' . '</a>') . "\n";

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>'.'</a>')."\n";

     print "<br>\n";

 

     if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled)) {

         $step++;

-        print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="' . DOL_URL_ROOT . '/accountancy/expensereport/index.php">' . '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . "-" . $langs->transnoentitiesnoconv("ExpenseReportsVentilation") . '</strong>' . '</a>') . "\n";

+        print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php">'.'<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>'.'</a>')."\n";

         print "<br>\n";

     }

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping")) . "\n";

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64 + $step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";

     print "<br>\n";

 

     $step++;

-    print img_picto('', 'puce') . ' ' . $langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step)) . "<br>\n";

+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";

     print "<br>\n";

 } else {

-    print $langs->trans("Module10Desc") . "<br>\n";

+    print $langs->trans("Module10Desc")."<br>\n";

 }

 

 // End of page

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict"));

 

 // Security check

-if ($user->societe_id > 0)

-    accessforbidden();

+if ($user->societe_id > 0) {
+    accessforbidden();
+}
 

 /*

  * Actions

dolibarr/htdocs/home/home.php

Spacing +95 added lines, -95 removed lines

@@ -29,8 +29,8 @@ 
  */
 define('NOCSRFCHECK', 1); // This is main home and login page. We must be able to go on it from another web site.
 
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // If not defined, we select menu "home"
 $_GET['mainmenu'] = GETPOST('mainmenu', 'aZ09') ? GETPOST('mainmenu', 'aZ09') : 'home';
@@ -45,7 +45,7 @@ 
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM)) {
     //header("Location: " . DOL_URL_ROOT . "/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    header('Location: ' . BASE_URI . '?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
+    header('Location: '.BASE_URI.'?controller=admin&method=index&mainmenu=home&leftmenu=setup&mesg=setupnotcomplete');
     exit;
 }
 /*
@@ -59,7 +59,7 @@ 
   }
  */
 if (GETPOST('addbox')) { // Add box (when submit is done from a form when ajax disabled)
-    require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
     $zone = GETPOST('areacode', 'aZ09');
     $userid = GETPOST('userid', 'int');
     $boxorder = GETPOST('boxorder', 'aZ09');
@@ -83,15 +83,15 @@ 
 }
 
 // Title
-$title = $langs->trans("HomeArea") . ' - Dolibarr ' . DOL_VERSION;
+$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
  {
-    $title = $langs->trans("HomeArea") . ' - ' . $conf->global->MAIN_APPLICATION_TITLE;
+    $title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
 }
 
 llxHeader('', $title);
 
-$resultboxes = FormOther::getBoxesArea($user, "0");    // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+$resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 print load_fiche_titre($langs->trans("HomeArea"), $resultboxes['selectboxlist'], 'title_home');
 
@@ -125,16 +125,16 @@ 
 
 if (empty($user->societe_id)) {
     $boxstat .= '<div class="box">';
-    $boxstat .= '<table summary="' . dol_escape_htmltag($langs->trans("DolibarrStateBoard")) . '" class="noborder boxtable boxtablenobottom nohover" width="100%">';
+    $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover" width="100%">';
     $boxstat .= '<tr class="liste_titre">';
-    $boxstat .= '<th class="liste_titre">' . $langs->trans("DolibarrStateBoard") . '</th>';
+    $boxstat .= '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
     $boxstat .= '</tr>';
     $boxstat .= '<tr class="impair"><td class="tdboxstats nohover flexcontainer">';
 
     $object = new stdClass();
     $parameters = array();
     $action = '';
-    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     $boxstat .= $hookmanager->resPrint;
 
     if (empty($reshook)) {
@@ -162,25 +162,25 @@ 
         );
         // Class file containing the method load_state_board for each line
         $includes = array(
-            DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
-            DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
-            DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-            DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
-            DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
-            DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
-            DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
-            DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
-            DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
-            DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
-            DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
-            DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
-            DOL_DOCUMENT_ROOT . "/don/class/don.class.php"
+            DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+            DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+            DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+            DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+            DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+            DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+            DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+            DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+            DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+            DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+            DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+            DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+            DOL_DOCUMENT_ROOT."/don/class/don.class.php"
         );
         // Name class containing the method load_state_board for each line
         $classes = array('User',
@@ -291,25 +291,25 @@ 
           );
          */
         $links = array(
-            BASE_URI . '/?controller=user&method=list',
-            BASE_URI . '/?controller=societe&method=list&type=c&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=p&mainmenu=companies',
-            BASE_URI . '/?controller=societe&method=list&type=f&mainmenu=companies',
-            BASE_URI . '/?controller=contact&method=list&mainmenu=companies',
-            BASE_URI . '/?controller=adherents&method=list&statut=1&mainmenu=members',
-            BASE_URI . '/?controller=product&method=list&type=0&mainmenu=products',
-            BASE_URI . '/?controller=product&method=list&type=1&mainmenu=products',
-            BASE_URI . '/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
-            BASE_URI . '/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
-            BASE_URI . '/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
-            BASE_URI . '/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
-            BASE_URI . '/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
-            BASE_URI . '/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
-            BASE_URI . '/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
-            BASE_URI . '/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
-            BASE_URI . '/?controller=projet&method=list&mainmenu=project',
-            BASE_URI . '/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
-            BASE_URI . '/?controller=don&method=list&leftmenu=donations'
+            BASE_URI.'/?controller=user&method=list',
+            BASE_URI.'/?controller=societe&method=list&type=c&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=p&mainmenu=companies',
+            BASE_URI.'/?controller=societe&method=list&type=f&mainmenu=companies',
+            BASE_URI.'/?controller=contact&method=list&mainmenu=companies',
+            BASE_URI.'/?controller=adherents&method=list&statut=1&mainmenu=members',
+            BASE_URI.'/?controller=product&method=list&type=0&mainmenu=products',
+            BASE_URI.'/?controller=product&method=list&type=1&mainmenu=products',
+            BASE_URI.'/?controller=comm/propal&method=list&mainmenu=commercial&leftmenu=propals',
+            BASE_URI.'/?controller=commande&method=list&mainmenu=commercial&leftmenu=orders',
+            BASE_URI.'/?controller=compta/facture&method=list&mainmenu=billing&leftmenu=customers_bills',
+            BASE_URI.'/?controller=contrat&method=list&mainmenu=commercial&leftmenu=contracts',
+            BASE_URI.'/?controller=fichinter&method=list&mainmenu=commercial&leftmenu=ficheinter',
+            BASE_URI.'/?controller=fourn/commande&method=list&mainmenu=commercial&leftmenu=orders_suppliers',
+            BASE_URI.'/?controller=fourn/facture&method=list&mainmenu=billing&leftmenu=suppliers_bills',
+            BASE_URI.'/?controller=supplier_proposal&method=list&mainmenu=commercial&leftmenu=',
+            BASE_URI.'/?controller=projet&method=list&mainmenu=project',
+            BASE_URI.'/?controller=expensereport&method=list&mainmenu=hrm&leftmenu=expensereport',
+            BASE_URI.'/?controller=don&method=list&leftmenu=donations'
         );
         // Translation lang files
         $langfile = array("users",
@@ -354,10 +354,10 @@ 
                     $langs->load($langfile[$key]);
                 $text = $langs->trans($titres[$key]);
                 //$sep=($conf->dol_use_jmobile?'<br>':' ');
-                $boxstat .= '<a href="' . $links[$key] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+                $boxstat .= '<a href="'.$links[$key].'" class="boxstatsindicator thumbstat nobold nounderline">';
                 $boxstat .= '<div class="boxstats">';
-                $boxstat .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-                $boxstat .= '<span class="boxstatsindicator">' . img_object("", $icons[$key], 'class="inline-block"') . ' ' . ($board->nb[$val] ? $board->nb[$val] : 0) . '</span>';
+                $boxstat .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+                $boxstat .= '<span class="boxstatsindicator">'.img_object("", $icons[$key], 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
                 $boxstat .= '</div>';
                 $boxstat .= '</a>';
             }
@@ -391,11 +391,11 @@ 
 $dashboardlines = array();
 
 // Do not include sections without management permission
-require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
 if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
     $board = new ActionComm($db);
 
     $dashboardlines[] = $board->load_board($user);
@@ -403,21 +403,21 @@ 
 
 // Number of project opened
 if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $board = new Project($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
 if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
     $board = new Task($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board = new Propal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -426,7 +426,7 @@ 
 
 // Number of commercial proposals opened (expired)
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
     $board = new SupplierProposal($db);
     $dashboardlines[] = $board->load_board($user, "opened");
     // Number of commercial proposals CLOSED signed (billed)
@@ -435,21 +435,21 @@ 
 
 // Number of customer orders a deal
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
     $board = new Commande($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
 if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
     $board = new CommandeFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
 if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
     $board = new Contrat($db);
     $dashboardlines[] = $board->load_board($user, "inactives");
     // Number of active services (expired)
@@ -457,23 +457,23 @@ 
 }
 // Number of invoices customers (has paid)
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
     $board = new Facture($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
 if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
-    include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
     $board = new FactureFournisseur($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
     $board = new Account($db);
-    $nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
+    $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
     if ($nb > 0) {
         $dashboardlines[] = $board->load_board($user);
     }
@@ -481,28 +481,28 @@ 
 
 // Number of cheque to send
 if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-    include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
     $board = new RemiseCheque($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of foundation members
 if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id) {
-    include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
     $board = new Adherent($db);
     $dashboardlines[] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'toapprove');
 }
 
 // Number of expense reports to pay
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
-    include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $board = new ExpenseReport($db);
     $dashboardlines[] = $board->load_board($user, 'topay');
 }
@@ -510,7 +510,7 @@ 
 $object = new stdClass();
 $parameters = array();
 $action = '';
-$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook == 0) {
     $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
 }
@@ -540,22 +540,22 @@ 
 //var_dump($totallate);
 $boxwork = '';
 $boxwork .= '<div class="box">';
-$boxwork .= '<table summary="' . dol_escape_htmltag($langs->trans("WorkingBoard")) . '" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">' . "\n";
+$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
 $boxwork .= '<tr class="liste_titre">';
-$boxwork .= '<th class="liste_titre">' . $langs->trans("DolibarrWorkBoard") . '</th>';
-$boxwork .= '</tr>' . "\n";
+$boxwork .= '<th class="liste_titre">'.$langs->trans("DolibarrWorkBoard").'</th>';
+$boxwork .= '</tr>'."\n";
 
 if ($showweather) {
     $boxwork .= '<tr class="nohover">';
-    $boxwork .= '<td class="nohover' . ($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '') . ' center valignmiddle">';
+    $boxwork .= '<td class="nohover'.($conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '').' center valignmiddle">';
     $text = '';
     if ($totallate > 0)
     {
-        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate", $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
+        $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
     } else {
         $text = $langs->transnoentitiesnoconv("NoItemLate");
     }
-    $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
+    $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
     //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
     $options = 'height="64px"';
     $boxwork .= showWeather($totallate, $text, $options);
@@ -575,23 +575,23 @@ 
         }
 
         $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
-        $textlate .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
+        $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
 
         $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $sep = ($conf->dol_use_jmobile ? '<br>' : ' ');
-        $boxwork .= '<span class="boxstatstext" title="' . dol_escape_htmltag($board->label) . '">' . $board->img . ' ' . $board->label . '</span><br>';
-        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . $board->nbtodo . '</span></a>';
+        $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
+        $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
         if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . price($board->total) . '</span></a>';
+            $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
         }
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0) {
             $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-            $boxwork .= '<a title="' . dol_escape_htmltag($textlate) . '" class="valignmiddle dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '" href="' . ((!$board->url_late) ? $board->url : $board->url_late ) . '">';
+            $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
             //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"') . '';
-            $boxwork .= '<span class="dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '">';
+            $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"').'';
+            $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
             $boxwork .= $board->nbtodolate;
             $boxwork .= '</span>';
             $boxwork .= '</a>';
@@ -620,7 +620,7 @@ 
 
 $boxwork .= '</td></tr>';
 
-$boxwork .= '</table>';   // End table array of working board
+$boxwork .= '</table>'; // End table array of working board
 $boxwork .= '</div>';
 
 print '</div></div></div><div class="clearboth"></div>';
@@ -666,11 +666,11 @@ 
     $message = '';
 
     // Check if install lock file is present
-    $lockfile = DOL_DATA_ROOT . '/install.lock';
-    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT . "/install")) {
+    $lockfile = DOL_DATA_ROOT.'/install.lock';
+    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
         $langs->load("errors");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT) . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     // Conf files must be in read only mode
@@ -678,7 +678,7 @@ 
         $langs->load("errors");
         //$langs->load("other");
         //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly") . ' ' . $langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT . "/install"), 0, 0, '1', 'clearboth');
+        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
     }
 
     if ($message) {
@@ -713,20 +713,20 @@ 
     $used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
 
     $level0 = $offset;
-    if (!empty($conf->global->{$used_conf . '0'})) {
-        $level0 = $conf->global->{$used_conf . '0'};
+    if (!empty($conf->global->{$used_conf.'0'})) {
+        $level0 = $conf->global->{$used_conf.'0'};
     }
     $level1 = $offset + 1 * $factor;
-    if (!empty($conf->global->{$used_conf . '1'})) {
-        $level1 = $conf->global->{$used_conf . '1'};
+    if (!empty($conf->global->{$used_conf.'1'})) {
+        $level1 = $conf->global->{$used_conf.'1'};
     }
     $level2 = $offset + 2 * $factor;
-    if (!empty($conf->global->{$used_conf . '2'})) {
-        $level2 = $conf->global->{$used_conf . '2'};
+    if (!empty($conf->global->{$used_conf.'2'})) {
+        $level2 = $conf->global->{$used_conf.'2'};
     }
     $level3 = $offset + 3 * $factor;
-    if (!empty($conf->global->{$used_conf . '3'})) {
-        $level3 = $conf->global->{$used_conf . '3'};
+    if (!empty($conf->global->{$used_conf.'3'})) {
+        $level3 = $conf->global->{$used_conf.'3'};
     }
 
     if ($totallate <= $level0)