alxarafe / alixar

dolibarr/htdocs/admin/menus/index.php

Spacing +80 added lines, -80 removed lines

@@ -24,9 +24,9 @@ 
  *  \ingroup    core

  *  \brief      Index page for menu editor

  */

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

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';

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

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

+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';

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

 

 // Load translation files required by the page

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

@@ -39,8 +39,8 @@ 
 $dirsmartphone = array();

 $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);

 foreach ($dirmenus as $dirmenu) {

-    $dirstandard[] = $dirmenu . 'standard';

-    $dirsmartphone[] = $dirmenu . 'smartphone';

+    $dirstandard[] = $dirmenu.'standard';

+    $dirsmartphone[] = $dirmenu.'smartphone';

 }

 

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

@@ -74,9 +74,9 @@ 
 

     // Get current position

     $sql = "SELECT m.rowid, m.position, m.type, m.fk_menu";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE m.rowid = " . GETPOST("menuId", "int");

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE m.rowid = ".GETPOST("menuId", "int");

+    dol_syslog("admin/menus/index.php ".$sql);

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

     $num = $db->num_rows($result);

     $i = 0;

@@ -91,14 +91,14 @@ 
 

     // Menu before

     $sql = "SELECT m.rowid, m.position";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE (m.position < " . ($current['order']) . " OR (m.position = " . ($current['order']) . " AND rowid < " . GETPOST("menuId", "int") . "))";

-    $sql .= " AND m.menu_handler='" . $db->escape($menu_handler_to_search) . "'";

-    $sql .= " AND m.entity = " . $conf->entity;

-    $sql .= " AND m.type = '" . $db->escape($current['type']) . "'";

-    $sql .= " AND m.fk_menu = '" . $db->escape($current['fk_menu']) . "'";

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE (m.position < ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid < ".GETPOST("menuId", "int")."))";

+    $sql .= " AND m.menu_handler='".$db->escape($menu_handler_to_search)."'";

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

+    $sql .= " AND m.type = '".$db->escape($current['type'])."'";

+    $sql .= " AND m.fk_menu = '".$db->escape($current['fk_menu'])."'";

     $sql .= " ORDER BY m.position, m.rowid";

-    dol_syslog("admin/menus/index.php " . $sql);

+    dol_syslog("admin/menus/index.php ".$sql);

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

     $num = $db->num_rows($result);

     $i = 0;

@@ -109,15 +109,15 @@ 
         $i++;

     }

 

-    $sql = "UPDATE " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " SET m.position = " . $previous['order'];

-    $sql .= " WHERE m.rowid = " . $current['rowid']; // Up the selected entry

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " SET m.position = ".$previous['order'];

+    $sql .= " WHERE m.rowid = ".$current['rowid']; // Up the selected entry

+    dol_syslog("admin/menus/index.php ".$sql);

     $db->query($sql);

-    $sql = "UPDATE " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " SET m.position = " . ($current['order'] != $previous['order'] ? $current['order'] : $current['order'] + 1);

-    $sql .= " WHERE m.rowid = " . $previous['rowid']; // Descend celui du dessus

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " SET m.position = ".($current['order'] != $previous['order'] ? $current['order'] : $current['order'] + 1);

+    $sql .= " WHERE m.rowid = ".$previous['rowid']; // Descend celui du dessus

+    dol_syslog("admin/menus/index.php ".$sql);

     $db->query($sql);

 } elseif ($action == 'down') {

     $current = array();

@@ -125,9 +125,9 @@ 
 

     // Get current position

     $sql = "SELECT m.rowid, m.position, m.type, m.fk_menu";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE m.rowid = " . GETPOST("menuId", "int");

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE m.rowid = ".GETPOST("menuId", "int");

+    dol_syslog("admin/menus/index.php ".$sql);

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

     $num = $db->num_rows($result);

     $i = 0;

@@ -142,14 +142,14 @@ 
 

     // Menu after

     $sql = "SELECT m.rowid, m.position";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE (m.position > " . ($current['order']) . " OR (m.position = " . ($current['order']) . " AND rowid > " . GETPOST("menuId", "int") . "))";

-    $sql .= " AND m.menu_handler='" . $db->escape($menu_handler_to_search) . "'";

-    $sql .= " AND m.entity = " . $conf->entity;

-    $sql .= " AND m.type = '" . $db->escape($current['type']) . "'";

-    $sql .= " AND m.fk_menu = '" . $db->escape($current['fk_menu']) . "'";

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE (m.position > ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid > ".GETPOST("menuId", "int")."))";

+    $sql .= " AND m.menu_handler='".$db->escape($menu_handler_to_search)."'";

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

+    $sql .= " AND m.type = '".$db->escape($current['type'])."'";

+    $sql .= " AND m.fk_menu = '".$db->escape($current['fk_menu'])."'";

     $sql .= " ORDER BY m.position, m.rowid";

-    dol_syslog("admin/menus/index.php " . $sql);

+    dol_syslog("admin/menus/index.php ".$sql);

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

     $num = $db->num_rows($result);

     $i = 0;

@@ -160,28 +160,28 @@ 
         $i++;

     }

 

-    $sql = "UPDATE " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " SET m.position = " . ($current['order'] != $next['order'] ? $next['order'] : $current['order'] + 1); // Down the selected entry

-    $sql .= " WHERE m.rowid = " . $current['rowid'];

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " SET m.position = ".($current['order'] != $next['order'] ? $next['order'] : $current['order'] + 1); // Down the selected entry

+    $sql .= " WHERE m.rowid = ".$current['rowid'];

+    dol_syslog("admin/menus/index.php ".$sql);

     $db->query($sql);

-    $sql = "UPDATE " . MAIN_DB_PREFIX . "menu as m"; // Up the next entry

-    $sql .= " SET m.position = " . $current['order'];

-    $sql .= " WHERE m.rowid = " . $next['rowid'];

-    dol_syslog("admin/menus/index.php " . $sql);

+    $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m"; // Up the next entry

+    $sql .= " SET m.position = ".$current['order'];

+    $sql .= " WHERE m.rowid = ".$next['rowid'];

+    dol_syslog("admin/menus/index.php ".$sql);

     $db->query($sql);

 } elseif ($action == 'confirm_delete' && $confirm == 'yes') {

     $db->begin();

 

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

-    $sql .= " WHERE rowid = " . GETPOST('menuId', 'int');

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

+    $sql .= " WHERE rowid = ".GETPOST('menuId', 'int');

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

     if ($resql) {

         $db->commit();

 

         setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');

 

-        header("Location: " . DOL_URL_ROOT . '/admin/menus/index.php?menu_handler=' . $menu_handler);

+        header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);

         exit;

     } else {

         $db->rollback();

@@ -210,44 +210,44 @@ 
 

 $h = 0;

 

-$head[$h][0] = DOL_URL_ROOT . "/admin/menus.php";

+$head[$h][0] = DOL_URL_ROOT."/admin/menus.php";

 $head[$h][1] = $langs->trans("MenuHandlers");

 $head[$h][2] = 'handler';

 $h++;

 

-$head[$h][0] = DOL_URL_ROOT . "/admin/menus/index.php";

+$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";

 $head[$h][1] = $langs->trans("MenuAdmin");

 $head[$h][2] = 'editor';

 $h++;

 

-$head[$h][0] = DOL_URL_ROOT . "/admin/menus/other.php";

+$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php";

 $head[$h][1] = $langs->trans("Miscellaneous");

 $head[$h][2] = 'misc';

 $h++;

 

 dol_fiche_head($head, 'editor', $langs->trans("Menus"), -1);

 

-print $langs->trans("MenusEditorDesc") . "<br>\n";

+print $langs->trans("MenusEditorDesc")."<br>\n";

 print "<br>\n";

 

 

 // Confirmation for remove menu entry

 if ($action == 'delete') {

     $sql = "SELECT m.titre";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE m.rowid = " . GETPOST('menuId', 'int');

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE m.rowid = ".GETPOST('menuId', 'int');

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

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

 

-    print $form->formconfirm("index.php?menu_handler=" . $menu_handler . "&menuId=" . GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->titre), "confirm_delete");

+    print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->titre), "confirm_delete");

 }

 

 

-print '<form name="newmenu" class="nocellnopadd" action="' . $_SERVER["PHP_SELF"] . '">';

+print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';

 print '<input type="hidden" action="change_menu_handler">';

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

-print $formadmin->select_menu_families($menu_handler . (preg_match('/_menu/', $menu_handler) ? '' : '_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));

-print ' &nbsp; <input type="submit" class="button" value="' . $langs->trans("Refresh") . '">';

+print $langs->trans("MenuHandler").': ';

+print $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler) ? '' : '_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));

+print ' &nbsp; <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';

 print '</form>';

 

 print '<br>';

@@ -255,9 +255,9 @@ 
 print '<table class="noborder centpercent">';

 

 print '<tr class="liste_titre">';

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

-print '<td align="right"><div id="iddivjstreecontrol"><a href="#">' . img_picto('', 'object_category') . ' ' . $langs->trans("UndoExpandAll") . '</a>';

-print ' | <a href="#">' . img_picto('', 'object_category-expanded') . ' ' . $langs->trans("ExpandAll") . '</a></div></td>';

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

+print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'object_category').' '.$langs->trans("UndoExpandAll").'</a>';

+print ' | <a href="#">'.img_picto('', 'object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';

 print '</tr>';

 

 print '<tr>';

@@ -286,11 +286,11 @@ 
     //puis tous les elements enfants

 

     $sql = "SELECT m.rowid, m.titre, m.langs, m.mainmenu, m.leftmenu, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.position, m.module";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

-    $sql .= " WHERE menu_handler = '" . $db->escape($menu_handler_to_search) . "'";

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

+    $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+    $sql .= " WHERE menu_handler = '".$db->escape($menu_handler_to_search)."'";

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

     //$sql.= " AND fk_menu >= 0";

-    $sql .= " ORDER BY m.position, m.rowid";  // Order is position then rowid (because we need a sort criteria when position is same)

+    $sql .= " ORDER BY m.position, m.rowid"; // Order is position then rowid (because we need a sort criteria when position is same)

 

     $res = $db->query($sql);

     if ($res) {

@@ -312,30 +312,30 @@ 
                 'fk_mainmenu' => $menu['fk_mainmenu'],

                 'fk_leftmenu' => $menu['fk_leftmenu'],

                 'position' => $menu['position'],

-                'entry' => '<table class="nobordernopadding centpercent"><tr><td>' .

-                '<strong> &nbsp; <a href="edit.php?menu_handler=' . $menu_handler_to_search . '&action=edit&menuId=' . $menu['rowid'] . '">' . $titre . '</a></strong>' .

-                '</td><td align="right">' .

-                '<a href="edit.php?menu_handler=' . $menu_handler_to_search . '&action=edit&menuId=' . $menu['rowid'] . '">' . img_edit('default', 0, 'class="menuEdit" id="edit' . $menu['rowid'] . '"') . '</a> ' .

-                '<a href="edit.php?menu_handler=' . $menu_handler_to_search . '&action=create&menuId=' . $menu['rowid'] . '">' . img_edit_add('default') . '</a> ' .

-                '<a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=delete&menuId=' . $menu['rowid'] . '">' . img_delete('default') . '</a> ' .

-                '&nbsp; &nbsp; &nbsp;' .

-                '<a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=up&menuId=' . $menu['rowid'] . '">' . img_picto("Up", "1uparrow") . '</a><a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=down&menuId=' . $menu['rowid'] . '">' . img_picto("Down", "1downarrow") . '</a>' .

+                'entry' => '<table class="nobordernopadding centpercent"><tr><td>'.

+                '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.$titre.'</a></strong>'.

+                '</td><td align="right">'.

+                '<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> '.

+                '<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> '.

+                '<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> '.

+                '&nbsp; &nbsp; &nbsp;'.

+                '<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>'.

                 '</td></tr></table>',

-                'buttons' => '<a href="edit.php?menu_handler=' . $menu_handler_to_search . '&action=edit&menuId=' . $menu['rowid'] . '">' . img_edit('default', 0, 'class="menuEdit" id="edit' . $menu['rowid'] . '"') . '</a> ' .

-                '<a href="edit.php?menu_handler=' . $menu_handler_to_search . '&action=create&menuId=' . $menu['rowid'] . '">' . img_edit_add('default') . '</a> ' .

-                '<a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=delete&menuId=' . $menu['rowid'] . '">' . img_delete('default') . '</a> ' .

-                '&nbsp; &nbsp; &nbsp;' .

-                '<a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=up&menuId=' . $menu['rowid'] . '">' . img_picto("Up", "1uparrow") . '</a><a href="index.php?menu_handler=' . $menu_handler_to_search . '&action=down&menuId=' . $menu['rowid'] . '">' . img_picto("Down", "1downarrow") . '</a>'

+                'buttons' => '<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> '.

+                '<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> '.

+                '<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> '.

+                '&nbsp; &nbsp; &nbsp;'.

+                '<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>'

             );

             $i++;

         }

     }

 

-    global $tree_recur_alreadyadded;       // This var was def into tree_recur

+    global $tree_recur_alreadyadded; // This var was def into tree_recur

     //var_dump($data);

     // Appelle de la fonction recursive (ammorce) avec recherche depuis la racine.

     //tree_recur($data, $data[0], 0, 'iddivjstree', 0, 1);  // use this to get info on name and foreign keys of menu entry

-    tree_recur($data, $data[0], 0, 'iddivjstree', 0, 0);  // $data[0] is virtual record 'racine'

+    tree_recur($data, $data[0], 0, 'iddivjstree', 0, 0); // $data[0] is virtual record 'racine'

 

 

     print '</td>';

@@ -357,7 +357,7 @@ 
         print '<table class="noborder centpercent">';

 

         print '<tr class="liste_titre">';

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

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

         print '<td align="right"></td>';

         print '</tr>';

 

@@ -366,7 +366,7 @@ 
         foreach ($remainingdata as $datar) {

             $father = array('rowid' => $datar['rowid'], 'title' => "???", 'mainmenu' => $datar['fk_mainmenu'], 'leftmenu' => $datar['fk_leftmenu'], 'fk_mainmenu' => '', 'fk_leftmenu' => '');

             //print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";

-            tree_recur($data, $father, 0, 'iddivjstree' . $datar['rowid'], 1, 1);

+            tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);

         }

 

         print '</td>';

@@ -383,7 +383,7 @@ 
      * Boutons actions

      */

     print '<div class="tabsAction">';

-    print '<a class="butAction" href="' . DOL_URL_ROOT . '/admin/menus/edit.php?menuId=0&amp;action=create&amp;menu_handler=' . urlencode($menu_handler) . '">' . $langs->trans("NewMenu") . '</a>';

+    print '<a class="butAction" href="'.DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&amp;action=create&amp;menu_handler='.urlencode($menu_handler).'">'.$langs->trans("NewMenu").'</a>';

     print '</div>';

 } else {

     $langs->load("errors");

Braces +6 added lines, -4 removed lines

@@ -298,8 +298,9 @@ 
 

         $i = 1;

         while ($menu = $db->fetch_array($res)) {

-            if (!empty($menu['langs']))

-                $langs->load($menu['langs']);

+            if (!empty($menu['langs'])) {
+                            $langs->load($menu['langs']);
+            }
             $titre = $langs->trans($menu['titre']);

 

             $data[] = array(

@@ -348,8 +349,9 @@ 
     // Process remaining records (records that are not linked to root by any path)

     $remainingdata = array();

     foreach ($data as $datar) {

-        if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']])

-            continue;

+        if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) {
+                    continue;
+        }
         $remainingdata[] = $datar;

     }

 

dolibarr/htdocs/core/menus/standard/eldy_menu.php

Spacing +24 added lines, -24 removed lines

@@ -33,8 +33,8 @@ 
      * @var DoliDB Database handler.

      */

     public $db;

-    var $type_user;         // Put 0 for internal users, 1 for external users

-    var $atarget = "";                                // To store default target to use onto links

+    var $type_user; // Put 0 for internal users, 1 for external users

+    var $atarget = ""; // To store default target to use onto links

     var $name = "eldy";

     var $menu_array;

     var $menu_array_after;

@@ -102,7 +102,7 @@ 
             $leftmenu = $forceleftmenu;

         }

 

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

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

         $tabMenu = array();

         $menuArbo = new Menubase($this->db, 'eldy');

         $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);

@@ -125,14 +125,14 @@ 
 

         //var_dump($this->tabMenu);

 

-        require_once DOL_DOCUMENT_ROOT . '/core/menus/standard/eldy.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';

 

         if ($this->type_user == 1) {

             $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;

             $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;

         }

 

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

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

         $this->menu = new Menu();

 

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

@@ -153,16 +153,16 @@ 
         }

 

         if ($mode == 'topnb') {

-            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);  // no output

+            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output

             return $this->menu->getNbOfVisibleMenuEntries();

         }

 

         if ($mode == 'jmobile') {     // Used to get menu in xml ul/li

-            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);      // Fill this->menu that is empty with top menu

+            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu

             // $this->menu->liste is top menu

             //var_dump($this->menu->liste);exit;

             $lastlevel = array();

-            print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n";

+            print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";

             foreach ($this->menu->liste as $key => $val) {  // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'

                 print '<ul class="ulmenu" data-inset="true">';

                 print '<li class="lilevel0">';

@@ -183,13 +183,13 @@ 
                     }

 

                     print $val['titre'];

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

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

 

                     // Search submenu fot this mainmenu entry

                     $tmpmainmenu = $val['mainmenu'];

                     $tmpleftmenu = 'all';

                     $submenu = new Menu();

-                    print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

+                    print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)

                     // Note: $submenu contains menu entry with substitution not yet done

                     //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }

                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }

@@ -199,21 +199,21 @@ 
                     $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);

                     //var_dump($canonrelurl);

                     //var_dump($canonnexturl);

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

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

                     if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools'))) || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {

                         // We add sub entry

-                        print str_pad('', 1) . '<li class="lilevel1 ui-btn-icon-right ui-btn">';  // ui-btn to highlight on clic

-                        print '<a href="' . $relurl . '">';

-                        if ($langs->trans(ucfirst($val['mainmenu']) . "Dashboard") == ucfirst($val['mainmenu']) . "Dashboard") {  // No translation

+                        print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic

+                        print '<a href="'.$relurl.'">';

+                        if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation

                             if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) {

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

                             } else {

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

                             }

                         } else

-                            print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");

+                            print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");

                         print '</a>';

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

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

                     }

 

                     if ($val['level'] == 0) {

@@ -247,7 +247,7 @@ 
                         if ($showmenu) {  // Visible (option to hide when not allowed is off or allowed)

                             $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

                             $substitarray['__USERID__'] = $user->id; // For backward compatibility

-                            $val2['url'] = make_substitutions($val2['url'], $substitarray);  // Make also substitution of __(XXX)__ and __[XXX]__

+                            $val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__

 

                             if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {

                                 $relurl2 = dol_buildpath($val2['url'], 1);

@@ -266,14 +266,14 @@ 
                             }

 

                             print str_pad('', $val2['level'] + 1);

-                            print '<li class="lilevel' . ($val2['level'] + 1);

+                            print '<li class="lilevel'.($val2['level'] + 1);

                             if ($val2['level'] == 0) {

-                                print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic

+                                print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic

                             }

-                            print $disabled . '">';  // ui-btn to highlight on clic

+                            print $disabled.'">'; // ui-btn to highlight on clic

                             if ($relurl2) {

                                 if ($val2['enabled']) { // Allowed

-                                    print '<a href="' . $relurl2 . '"';

+                                    print '<a href="'.$relurl2.'"';

                                     //print ' data-ajax="false"';

                                     print '>';

                                     $lastlevel2[$val2['level']] = 'enabled';

@@ -297,17 +297,17 @@ 
                                 else

                                     print '</a>';

                             }

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

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

                         }

                     }

                     //var_dump($submenu);

                     print '</ul>';

                 }

                 if ($val['enabled'] == 2) {

-                    print '<font class="vsmenudisabled">' . $val['titre'] . '</font>';

+                    print '<font class="vsmenudisabled">'.$val['titre'].'</font>';

                 }

                 print '</li>';

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

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

             }

         }

 

Braces +9 added lines, -6 removed lines

@@ -210,8 +210,9 @@ 
                             } else {

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

                             }

-                        } else

-                            print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");

+                        } else {
+                                                    print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");
+                        }
                         print '</a>';

                         print '</li>' . "\n";

                     }

@@ -292,10 +293,12 @@ 
                             //var_dump($lastlevel2);

                             print $val2['titre'];

                             if ($relurl2) {

-                                if ($val2['enabled']) // Allowed

-                                    print '</a>';

-                                else

-                                    print '</a>';

+                                if ($val2['enabled']) {
+                                    // Allowed

+                                    print '</a>';
+                                } else {
+                                                                    print '</a>';
+                                }
                             }

                             print '</li>' . "\n";

                         }

dolibarr/htdocs/core/class/menubase.class.php

Spacing +80 added lines, -80 removed lines

@@ -79,7 +79,7 @@ 
     public $titre;

     public $langs;

     public $level;

-    public $leftmenu;  //<! Not used

+    public $leftmenu; //<! Not used

     public $perms;

     public $enabled;

     public $user;

@@ -114,7 +114,7 @@ 
         $this->type = trim($this->type);

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

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

-        $this->fk_menu = (int) $this->fk_menu;          // If -1, fk_mainmenu and fk_leftmenu must be defined

+        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined

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

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

         $this->position = (int) $this->position;

@@ -141,7 +141,7 @@ 
         // may use an already used value because its internal cursor does not increase when we do

         // an insert with a forced id.

         if (in_array($this->db->type, array('pgsql'))) {

-            $sql = "SELECT MAX(rowid) as maxrowid FROM " . MAIN_DB_PREFIX . "menu";

+            $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";

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

             if ($resqlrowid) {

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

@@ -152,7 +152,7 @@ 
                     $maxrowid = 1;

                 }

 

-                $sql = "SELECT setval('" . MAIN_DB_PREFIX . "menu_rowid_seq', " . ($maxrowid) . ")";

+                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";

                 //print $sql; exit;

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

                 if (!$resqlrowidset) {

@@ -165,12 +165,12 @@ 
 

         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql

         $sql = "SELECT count(*)";

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

-        $sql .= " WHERE menu_handler = '" . $this->db->escape($this->menu_handler) . "'";

-        $sql .= " AND fk_menu = " . ((int) $this->fk_menu);

-        $sql .= " AND position = " . ((int) $this->position);

-        $sql .= " AND url = '" . $this->db->escape($this->url) . "'";

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

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

+        $sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";

+        $sql .= " AND fk_menu = ".((int) $this->fk_menu);

+        $sql .= " AND position = ".((int) $this->position);

+        $sql .= " AND url = '".$this->db->escape($this->url)."'";

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

 

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

         if ($result) {

@@ -178,7 +178,7 @@ 
 

             if ($row[0] == 0) {   // If not found

                 // Insert request

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "menu(";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";

                 $sql .= "menu_handler,";

                 $sql .= "entity,";

                 $sql .= "module,";

@@ -197,38 +197,38 @@ 
                 $sql .= "enabled,";

                 $sql .= "usertype";

                 $sql .= ") VALUES (";

-                $sql .= " '" . $this->db->escape($this->menu_handler) . "',";

-                $sql .= " '" . $this->db->escape($conf->entity) . "',";

-                $sql .= " '" . $this->db->escape($this->module) . "',";

-                $sql .= " '" . $this->db->escape($this->type) . "',";

-                $sql .= " " . ($this->mainmenu ? "'" . $this->db->escape($this->mainmenu) . "'" : "''") . ",";    // Can't be null

-                $sql .= " " . ($this->leftmenu ? "'" . $this->db->escape($this->leftmenu) . "'" : "null") . ",";

-                $sql .= " " . ((int) $this->fk_menu) . ",";

-                $sql .= " " . ($this->fk_mainmenu ? "'" . $this->db->escape($this->fk_mainmenu) . "'" : "null") . ",";

-                $sql .= " " . ($this->fk_leftmenu ? "'" . $this->db->escape($this->fk_leftmenu) . "'" : "null") . ",";

-                $sql .= " " . ((int) $this->position) . ",";

-                $sql .= " '" . $this->db->escape($this->url) . "',";

-                $sql .= " '" . $this->db->escape($this->target) . "',";

-                $sql .= " '" . $this->db->escape($this->titre) . "',";

-                $sql .= " '" . $this->db->escape($this->langs) . "',";

-                $sql .= " '" . $this->db->escape($this->perms) . "',";

-                $sql .= " '" . $this->db->escape($this->enabled) . "',";

-                $sql .= " '" . $this->db->escape($this->user) . "'";

+                $sql .= " '".$this->db->escape($this->menu_handler)."',";

+                $sql .= " '".$this->db->escape($conf->entity)."',";

+                $sql .= " '".$this->db->escape($this->module)."',";

+                $sql .= " '".$this->db->escape($this->type)."',";

+                $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null

+                $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";

+                $sql .= " ".((int) $this->fk_menu).",";

+                $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

+                $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

+                $sql .= " ".((int) $this->position).",";

+                $sql .= " '".$this->db->escape($this->url)."',";

+                $sql .= " '".$this->db->escape($this->target)."',";

+                $sql .= " '".$this->db->escape($this->titre)."',";

+                $sql .= " '".$this->db->escape($this->langs)."',";

+                $sql .= " '".$this->db->escape($this->perms)."',";

+                $sql .= " '".$this->db->escape($this->enabled)."',";

+                $sql .= " '".$this->db->escape($this->user)."'";

                 $sql .= ")";

 

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

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

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

                 if ($resql) {

-                    $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "menu");

-                    dol_syslog(get_class($this) . "::create record added has rowid=" . $this->id, LOG_DEBUG);

+                    $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");

+                    dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);

 

                     return $this->id;

                 } else {

-                    $this->error = "Error " . $this->db->lasterror();

+                    $this->error = "Error ".$this->db->lasterror();

                     return -1;

                 }

             } else {

-                dol_syslog(get_class($this) . "::create menu entry already exists", LOG_WARNING);

+                dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);

                 $this->error = 'Error Menu entry already exists';

                 return 0;

             }

@@ -270,29 +270,29 @@ 
         // Check parameters

         // Put here code to add control on parameters values

         // Update request

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

-        $sql .= " menu_handler='" . $this->db->escape($this->menu_handler) . "',";

-        $sql .= " module='" . $this->db->escape($this->module) . "',";

-        $sql .= " type='" . $this->db->escape($this->type) . "',";

-        $sql .= " mainmenu='" . $this->db->escape($this->mainmenu) . "',";

-        $sql .= " leftmenu='" . $this->db->escape($this->leftmenu) . "',";

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

-        $sql .= " fk_mainmenu=" . ($this->fk_mainmenu ? "'" . $this->db->escape($this->fk_mainmenu) . "'" : "null") . ",";

-        $sql .= " fk_leftmenu=" . ($this->fk_leftmenu ? "'" . $this->db->escape($this->fk_leftmenu) . "'" : "null") . ",";

-        $sql .= " position=" . ($this->position > 0 ? $this->position : 0) . ",";

-        $sql .= " url='" . $this->db->escape($this->url) . "',";

-        $sql .= " target='" . $this->db->escape($this->target) . "',";

-        $sql .= " titre='" . $this->db->escape($this->titre) . "',";

-        $sql .= " langs='" . $this->db->escape($this->langs) . "',";

-        $sql .= " perms='" . $this->db->escape($this->perms) . "',";

-        $sql .= " enabled='" . $this->db->escape($this->enabled) . "',";

-        $sql .= " usertype='" . $this->db->escape($this->user) . "'";

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

-

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

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

+        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";

+        $sql .= " module='".$this->db->escape($this->module)."',";

+        $sql .= " type='".$this->db->escape($this->type)."',";

+        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";

+        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";

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

+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

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

+        $sql .= " url='".$this->db->escape($this->url)."',";

+        $sql .= " target='".$this->db->escape($this->target)."',";

+        $sql .= " titre='".$this->db->escape($this->titre)."',";

+        $sql .= " langs='".$this->db->escape($this->langs)."',";

+        $sql .= " perms='".$this->db->escape($this->perms)."',";

+        $sql .= " enabled='".$this->db->escape($this->enabled)."',";

+        $sql .= " usertype='".$this->db->escape($this->user)."'";

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

+

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

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

         if (!$resql) {

-            $this->error = "Error " . $this->db->lasterror();

+            $this->error = "Error ".$this->db->lasterror();

             return -1;

         }

 

@@ -330,10 +330,10 @@ 
         $sql .= " t.enabled,";

         $sql .= " t.usertype as user,";

         $sql .= " t.tms";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "menu as t";

-        $sql .= " WHERE t.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";

+        $sql .= " WHERE t.rowid = ".$id;

 

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

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

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

         if ($resql) {

             if ($this->db->num_rows($resql)) {

@@ -364,7 +364,7 @@ 
 

             return 1;

         } else {

-            $this->error = "Error " . $this->db->lasterror();

+            $this->error = "Error ".$this->db->lasterror();

             return -1;

         }

     }

@@ -379,13 +379,13 @@ 
     {

         global $conf, $langs;

 

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

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

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

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

 

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

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

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

         if (!$resql) {

-            $this->error = "Error " . $this->db->lasterror();

+            $this->error = "Error ".$this->db->lasterror();

             return -1;

         }

 

@@ -434,10 +434,10 @@ 
     function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

     {

         global $langs, $user, $conf; // To export to dol_eval function

-        global $mainmenu, $leftmenu;  // To export to dol_eval function

+        global $mainmenu, $leftmenu; // To export to dol_eval function

 

-        $mainmenu = $mymainmenu;  // To export to dol_eval function

-        $leftmenu = $myleftmenu;  // To export to dol_eval function

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

 

         $newTabMenu = array();

         foreach ($tabMenu as $val) {

@@ -463,11 +463,11 @@ 
      */

     function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

     {

-        global $langs, $user, $conf;  // To export to dol_eval function

-        global $mainmenu, $leftmenu;  // To export to dol_eval function

+        global $langs, $user, $conf; // To export to dol_eval function

+        global $mainmenu, $leftmenu; // To export to dol_eval function

 

-        $mainmenu = $mymainmenu;  // To export to dol_eval function

-        $leftmenu = $myleftmenu;  // To export to dol_eval function

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

         // Detect what is top mainmenu id

         $menutopid = '';

         foreach ($tabMenu as $key => $val) {

@@ -522,7 +522,7 @@ 
                     if ($found) {

                         $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);

                     } else {

-                        dol_syslog("Error. Modules " . $val['module'] . " has defined a menu entry with a parent='fk_mainmenu=" . $val['fk_leftmenu'] . ",fk_leftmenu=" . $val['fk_leftmenu'] . "' and position=" . $val['position'] . '. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

+                        dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

                         //print "Parent menu not found !!<br>";

                     }

                 }

@@ -548,13 +548,13 @@ 
         global $mainmenu, $leftmenu; // To export to dol_eval function

 

         $menutopid = 0;

-        $mainmenu = $mymainmenu;  // To export to dol_eval function

-        $leftmenu = $myleftmenu;  // To export to dol_eval function

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

 

         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "menu as m";

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

-        $sql .= " AND m.menu_handler IN ('" . $menu_handler . "','all')";

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

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

+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";

         if ($type_user == 0) {

             $sql .= " AND m.usertype IN (0,2)";

         }

@@ -565,7 +565,7 @@ 
         //print $sql;

         //$tmp1=microtime(true);

         //print '>>> 1 0<br>';

-        dol_syslog(get_class($this) . "::menuLoad mymainmenu=" . $mymainmenu . " myleftmenu=" . $myleftmenu . " type_user=" . $type_user . " menu_handler=" . $menu_handler . " tabMenu size=" . count($tabMenu) . "", LOG_DEBUG);

+        dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);

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

         if ($resql) {

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

@@ -599,7 +599,7 @@ 
 

                 // Define $title

                 if ($enabled) {

-                    $title = $langs->trans($menu['titre']);  // If $menu['titre'] start with $, a dol_eval is done.

+                    $title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.

                     //var_dump($title.'-'.$menu['titre']);

                     if ($title == $menu['titre']) {   // Translation not found

                         if (!empty($menu['langs'])) {    // If there is a dedicated translation file

@@ -612,7 +612,7 @@ 
 

                         if (preg_match("/\//", $menu['titre'])) { // To manage translation when title is string1/string2

                             $tab_titre = explode("/", $menu['titre']);

-                            $title = $langs->trans($tab_titre[0]) . "/" . $langs->trans($tab_titre[1]);

+                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);

                         } else if (preg_match('/\|\|/', $menu['titre'])) { // To manage different translation (Title||AltTitle@ConditionForAltTitle)

                             $tab_title = explode("||", $menu['titre']);

                             $alt_title = explode("@", $tab_title[1]);

@@ -631,9 +631,9 @@ 
                     $tabMenu[$b]['url'] = $menu['url'];

                     if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url'])) {

                         if (preg_match('/\?/', $tabMenu[$b]['url'])) {

-                            $tabMenu[$b]['url'] .= '&amp;idmenu=' . $menu['rowid'];

+                            $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];

                         } else {

-                            $tabMenu[$b]['url'] .= '?idmenu=' . $menu['rowid'];

+                            $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];

                         }

                     }

                     $tabMenu[$b]['titre'] = $title;

dolibarr/htdocs/core/modules/DolibarrModules.class.php

Spacing +220 added lines, -220 removed lines

@@ -224,7 +224,7 @@ 
     public $export_fields_array;

     public $export_TypeFields_array;

     public $export_entities_array;

-    public $export_special_array;           // special or computed field

+    public $export_special_array; // special or computed field

     public $export_dependencies_array;

     public $export_sql_start;

     public $export_sql_end;

@@ -398,7 +398,7 @@ 
 

         // Insert constant defined by modules (into llx_const)

         if (!$err && !preg_match('/newboxdefonly/', $options)) {

-            $err += $this->insert_const();    // Test on newboxdefonly to avoid to erase value during upgrade

+            $err += $this->insert_const(); // Test on newboxdefonly to avoid to erase value during upgrade

         }

 

         // Insert boxes def into llx_boxes_def and boxes setup (into llx_boxes)

@@ -440,14 +440,14 @@ 
                 // Add current entity id

                 $sql = str_replace('__ENTITY__', $conf->entity, $sql);

 

-                dol_syslog(get_class($this) . "::_init ignoreerror=" . $ignoreerror . "", LOG_DEBUG);

+                dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);

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

                 if (!$result) {

                     if (!$ignoreerror) {

                         $this->error = $this->db->lasterror();

                         $err++;

                     } else {

-                        dol_syslog(get_class($this) . "::_init Warning " . $this->db->lasterror(), LOG_WARNING);

+                        dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);

                     }

                 }

             }

@@ -499,7 +499,7 @@ 
 

         // Remove list of module's available boxes (entry in llx_boxes)

         if (!$err && !preg_match('/(newboxdefonly|noboxes)/', $options)) {

-            $err += $this->delete_boxes();    // We don't have to delete if option ask to keep boxes safe or ask to add new box def only

+            $err += $this->delete_boxes(); // We don't have to delete if option ask to keep boxes safe or ask to add new box def only

         }

 

         // Remove list of module's cron job entries (entry in llx_cronjobs)

@@ -526,7 +526,7 @@ 
         $num = count($array_sql);

         for ($i = 0; $i < $num; $i++) {

             if (!$err) {

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

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

                 $result = $this->db->query($array_sql[$i]);

                 if (!$result) {

                     $this->error = $this->db->error();

@@ -556,9 +556,9 @@ 
         global $langs;

         $langs->load("admin");

 

-        if ($langs->transnoentitiesnoconv("Module" . $this->numero . "Name") != ("Module" . $this->numero . "Name")) {

+        if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {

             // If module name translation exists

-            return $langs->transnoentitiesnoconv("Module" . $this->numero . "Name");

+            return $langs->transnoentitiesnoconv("Module".$this->numero."Name");

         } else {

             // If module name translation using it's unique id does not exist, we try to use its name to find translation

             if (is_array($this->langfiles)) {

@@ -569,9 +569,9 @@ 
                 }

             }

 

-            if ($langs->trans("Module" . $this->name . "Name") != ("Module" . $this->name . "Name")) {

+            if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name")) {

                 // If module name translation exists

-                return $langs->transnoentitiesnoconv("Module" . $this->name . "Name");

+                return $langs->transnoentitiesnoconv("Module".$this->name."Name");

             }

 

             // Last chance with simple label

@@ -589,9 +589,9 @@ 
         global $langs;

         $langs->load("admin");

 

-        if ($langs->transnoentitiesnoconv("Module" . $this->numero . "Desc") != ("Module" . $this->numero . "Desc")) {

+        if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {

             // If module description translation exists

-            return $langs->transnoentitiesnoconv("Module" . $this->numero . "Desc");

+            return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");

         } else {

             // If module description translation does not exist using its unique id, we can use its name to find translation

             if (is_array($this->langfiles)) {

@@ -602,9 +602,9 @@ 
                 }

             }

 

-            if ($langs->transnoentitiesnoconv("Module" . $this->name . "Desc") != ("Module" . $this->name . "Desc")) {

+            if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != ("Module".$this->name."Desc")) {

                 // If module name translation exists

-                return $langs->trans("Module" . $this->name . "Desc");

+                return $langs->trans("Module".$this->name."Desc");

             }

 

             // Last chance with simple label

@@ -623,8 +623,8 @@ 
         global $langs;

         $langs->load("admin");

 

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

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

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

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

 

         $pathoffile = $this->getDescLongReadmeFound();

 

@@ -632,13 +632,13 @@ 
             $content = file_get_contents($pathoffile);

 

             if ((float) DOL_VERSION >= 6.0) {

-                @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';

+                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';

 

                 $content = dolMd2Html(

                     $content, 'parsedown', array(

-                    'doc/' => dol_buildpath(strtolower($this->name) . '/doc/', 1),

-                    'img/' => dol_buildpath(strtolower($this->name) . '/img/', 1),

-                    'images/' => dol_buildpath(strtolower($this->name) . '/imgages/', 1),

+                    'doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1),

+                    'img/' => dol_buildpath(strtolower($this->name).'/img/', 1),

+                    'images/' => dol_buildpath(strtolower($this->name).'/imgages/', 1),

                     )

                 );

             } else {

@@ -674,19 +674,19 @@ 
 

         // Define path to file README.md.

         // First check README-la_LA.md then README-la.md then README.md

-        $pathoffile = dol_buildpath(strtolower($this->name) . '/README-' . $langs->defaultlang . '.md', 0);

+        $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);

         if (dol_is_file($pathoffile)) {

             $filefound = true;

         }

         if (!$filefound) {

             $tmp = explode('_', $langs->defaultlang);

-            $pathoffile = dol_buildpath(strtolower($this->name) . '/README-' . $tmp[0] . '.md', 0);

+            $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$tmp[0].'.md', 0);

             if (dol_is_file($pathoffile)) {

                 $filefound = true;

             }

         }

         if (!$filefound) {

-            $pathoffile = dol_buildpath(strtolower($this->name) . '/README.md', 0);

+            $pathoffile = dol_buildpath(strtolower($this->name).'/README.md', 0);

             if (dol_is_file($pathoffile)) {

                 $filefound = true;

             }

@@ -705,19 +705,19 @@ 
         global $langs;

         $langs->load("admin");

 

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

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

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

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

 

         $filefound = false;

 

         // Define path to file README.md.

         // First check README-la_LA.md then README.md

-        $pathoffile = dol_buildpath(strtolower($this->name) . '/ChangeLog-' . $langs->defaultlang . '.md', 0);

+        $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);

         if (dol_is_file($pathoffile)) {

             $filefound = true;

         }

         if (!$filefound) {

-            $pathoffile = dol_buildpath(strtolower($this->name) . '/ChangeLog.md', 0);

+            $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog.md', 0);

             if (dol_is_file($pathoffile)) {

                 $filefound = true;

             }

@@ -727,8 +727,8 @@ 
             $content = file_get_contents($pathoffile);

 

             if ((float) DOL_VERSION >= 6.0) {

-                @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';

-                $content = dolMd2Html($content, 'parsedown', array('doc/' => dol_buildpath(strtolower($this->name) . '/doc/', 1)));

+                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';

+                $content = dolMd2Html($content, 'parsedown', array('doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1)));

             } else {

                 $content = nl2br($content);

             }

@@ -786,7 +786,7 @@ 
         }

 

         if (preg_match('/_deprecated/', $this->version)) {

-            $ret .= ($translated ? ' (' . $langs->transnoentitiesnoconv("Deprecated") . ')' : $this->version);

+            $ret .= ($translated ? ' ('.$langs->transnoentitiesnoconv("Deprecated").')' : $this->version);

         }

         return $ret;

     }

@@ -834,7 +834,7 @@ 
     {

         global $langs;

 

-        $langstring = "ExportDataset_" . $this->export_code[$r];

+        $langstring = "ExportDataset_".$this->export_code[$r];

         if ($langs->trans($langstring) == $langstring) {

             // Translation not found

             return $langs->trans($this->export_label[$r]);

@@ -855,7 +855,7 @@ 
     {

         global $langs;

 

-        $langstring = "ImportDataset_" . $this->import_code[$r];

+        $langstring = "ImportDataset_".$this->import_code[$r];

         //print "x".$langstring;

         if ($langs->trans($langstring) == $langstring) {

             // Translation not found

@@ -875,11 +875,11 @@ 
     {

         global $conf;

 

-        $sql = "SELECT tms FROM " . MAIN_DB_PREFIX . "const";

-        $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";

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

+        $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";

+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";

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

 

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

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

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

         if (!$resql) {

             $err++;

@@ -902,11 +902,11 @@ 
     {

         global $conf;

 

-        $sql = "SELECT tms, note FROM " . MAIN_DB_PREFIX . "const";

-        $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";

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

+        $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";

+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";

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

 

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

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

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

         if (!$resql) {

             $err++;

@@ -938,11 +938,11 @@ 
         // Common module

         $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);

 

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

-        $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";

-        $sql .= " AND entity IN (0, " . $entity . ")";

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

+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";

+        $sql .= " AND entity IN (0, ".$entity.")";

 

-        dol_syslog(get_class($this) . "::_active delete activation constant", LOG_DEBUG);

+        dol_syslog(get_class($this)."::_active delete activation constant", LOG_DEBUG);

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

         if (!$resql) {

             $err++;

@@ -950,13 +950,13 @@ 
 

         $note = json_encode(array('authorid' => (is_object($user) ? $user->id : 0), 'ip' => (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])));

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (name, value, visible, entity, note) VALUES";

-        $sql .= " (" . $this->db->encrypt($this->const_name, 1);

-        $sql .= ", " . $this->db->encrypt('1', 1);

-        $sql .= ", 0, " . $entity;

-        $sql .= ", '" . $this->db->escape($note) . "')";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";

+        $sql .= " (".$this->db->encrypt($this->const_name, 1);

+        $sql .= ", ".$this->db->encrypt('1', 1);

+        $sql .= ", 0, ".$entity;

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

 

-        dol_syslog(get_class($this) . "::_active insert activation constant", LOG_DEBUG);

+        dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);

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

         if (!$resql) {

             $err++;

@@ -979,11 +979,11 @@ 
         // Common module

         $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);

 

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

-        $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";

-        $sql .= " AND entity IN (0, " . $entity . ")";

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

+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";

+        $sql .= " AND entity IN (0, ".$entity.")";

 

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

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

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

 

         return $err;

@@ -1011,15 +1011,15 @@ 
             return 1;

         }

 

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

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

 

         $ok = 1;

         foreach ($conf->file->dol_document_root as $dirroot) {

             if ($ok) {

-                $dir = $dirroot . $reldir;

+                $dir = $dirroot.$reldir;

                 $ok = 0;

 

-                $handle = @opendir($dir);         // Dir may not exists

+                $handle = @opendir($dir); // Dir may not exists

                 if (is_resource($handle)) {

                     $dirfound++;

 

@@ -1031,7 +1031,7 @@ 
                     sort($files);

                     foreach ($files as $file) {

                         if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {

-                            $result = run_sql($dir . $file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

                             if ($result <= 0) {

                                 $error++;

                             }

@@ -1048,7 +1048,7 @@ 
                     sort($files);

                     foreach ($files as $file) {

                         if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {

-                            $result = run_sql($dir . $file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

                             if ($result <= 0) {

                                 $error++;

                             }

@@ -1065,7 +1065,7 @@ 
                     sort($files);

                     foreach ($files as $file) {

                         if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {

-                            $result = run_sql($dir . $file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

                             if ($result <= 0) {

                                 $error++;

                             }

@@ -1082,7 +1082,7 @@ 
                     sort($files);

                     foreach ($files as $file) {

                         if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {

-                            $result = run_sql($dir . $file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);

                             if ($result <= 0) {

                                 $error++;

                             }

@@ -1099,7 +1099,7 @@ 
         }

 

         if (!$dirfound) {

-            dol_syslog("A module ask to load sql files into " . $reldir . " but this directory was not found.", LOG_WARNING);

+            dol_syslog("A module ask to load sql files into ".$reldir." but this directory was not found.", LOG_WARNING);

         }

         return $ok;

     }

@@ -1115,14 +1115,14 @@ 
     function insert_boxes($option = '')

     {

         // phpcs:enable

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

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

 

         global $conf;

 

         $err = 0;

 

         if (is_array($this->boxes)) {

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

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

 

             $pos_name = InfoBox::getListOfPagesForBoxes();

 

@@ -1132,18 +1132,18 @@ 
                 $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton']) ? $this->boxes[$key]['enabledbydefaulton'] : 'Home';

 

                 if (empty($file)) {

-                    $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : '';    // For backward compatibility

+                    $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility

                 }

                 if (empty($note)) {

-                    $note = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : '';    // For backward compatibility

+                    $note = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility

                 }

 

                 // Search if boxes def already present

-                $sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "boxes_def";

-                $sql .= " WHERE file = '" . $this->db->escape($file) . "'";

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

+                $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."boxes_def";

+                $sql .= " WHERE file = '".$this->db->escape($file)."'";

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

                 if ($note) {

-                    $sql .= " AND note ='" . $this->db->escape($note) . "'";

+                    $sql .= " AND note ='".$this->db->escape($note)."'";

                 }

 

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

@@ -1153,31 +1153,31 @@ 
                         $this->db->begin();

 

                         if (!$err) {

-                            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "boxes_def (file, entity, note)";

-                            $sql .= " VALUES ('" . $this->db->escape($file) . "', ";

-                            $sql .= $conf->entity . ", ";

-                            $sql .= $note ? "'" . $this->db->escape($note) . "'" : "null";

+                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, entity, note)";

+                            $sql .= " VALUES ('".$this->db->escape($file)."', ";

+                            $sql .= $conf->entity.", ";

+                            $sql .= $note ? "'".$this->db->escape($note)."'" : "null";

                             $sql .= ")";

 

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

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

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

                             if (!$resql) {

                                 $err++;

                             }

                         }

                         if (!$err && !preg_match('/newboxdefonly/', $option)) {

-                            $lastid = $this->db->last_insert_id(MAIN_DB_PREFIX . "boxes_def", "rowid");

+                            $lastid = $this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");

 

                             foreach ($pos_name as $key2 => $val2) {

                                 //print 'key2='.$key2.'-val2='.$val2."<br>\n";

                                 if ($enabledbydefaulton && $val2 != $enabledbydefaulton) {

-                                    continue;        // Not enabled by default onto this page.

+                                    continue; // Not enabled by default onto this page.

                                 }

 

-                                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "boxes (box_id,position,box_order,fk_user,entity)";

-                                $sql .= " VALUES (" . $lastid . ", " . $key2 . ", '0', 0, " . $conf->entity . ")";

+                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";

+                                $sql .= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";

 

-                                dol_syslog(get_class($this) . "::insert_boxes onto page " . $key2 . "=" . $val2 . "", LOG_DEBUG);

+                                dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);

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

                                 if (!$resql) {

                                     $err++;

@@ -1226,44 +1226,44 @@ 
                 //print "Remove box ".$file.'<br>';

                 if ($file == 'box_graph_product_distribution.php') {

                     if (!empty($conf->produit->enabled) || !empty($conf->service->enabled)) {

-                        dol_syslog("We discard disabling of module " . $file . " because another module still active require it.");

+                        dol_syslog("We discard disabling of module ".$file." because another module still active require it.");

                         continue;

                     }

                 }

 

                 if (empty($file)) {

-                    $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : '';    // For backward compatibility

+                    $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility

                 }

 

                 if ($this->db->type == 'sqlite3') {

                     // sqlite doesn't support "USING" syntax.

                     // TODO: remove this dependency.

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

-                    $sql .= "WHERE " . MAIN_DB_PREFIX . "boxes.box_id IN (";

-                    $sql .= "SELECT " . MAIN_DB_PREFIX . "boxes_def.rowid ";

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

-                    $sql .= "WHERE " . MAIN_DB_PREFIX . "boxes_def.file = '" . $this->db->escape($file) . "') ";

-                    $sql .= "AND " . MAIN_DB_PREFIX . "boxes.entity = " . $conf->entity;

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

+                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes.box_id IN (";

+                    $sql .= "SELECT ".MAIN_DB_PREFIX."boxes_def.rowid ";

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

+                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."') ";

+                    $sql .= "AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;

                 } else {

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

-                    $sql .= " USING " . MAIN_DB_PREFIX . "boxes, " . MAIN_DB_PREFIX . "boxes_def";

-                    $sql .= " WHERE " . MAIN_DB_PREFIX . "boxes.box_id = " . MAIN_DB_PREFIX . "boxes_def.rowid";

-                    $sql .= " AND " . MAIN_DB_PREFIX . "boxes_def.file = '" . $this->db->escape($file) . "'";

-                    $sql .= " AND " . MAIN_DB_PREFIX . "boxes.entity = " . $conf->entity;

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

+                    $sql .= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";

+                    $sql .= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";

+                    $sql .= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";

+                    $sql .= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;

                 }

 

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

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

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

                 if (!$resql) {

                     $this->error = $this->db->lasterror();

                     $err++;

                 }

 

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

-                $sql .= " WHERE file = '" . $this->db->escape($file) . "'";

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

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

+                $sql .= " WHERE file = '".$this->db->escape($file)."'";

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

 

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

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

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

                 if (!$resql) {

                     $this->error = $this->db->lasterror();

@@ -1284,14 +1284,14 @@ 
     function insert_cronjobs()

     {

         // phpcs:enable

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

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

 

         global $conf;

 

         $err = 0;

 

         if (is_array($this->cronjobs)) {

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

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

 

             foreach ($this->cronjobs as $key => $value) {

                 $entity = isset($this->cronjobs[$key]['entity']) ? $this->cronjobs[$key]['entity'] : $conf->entity;

@@ -1309,23 +1309,23 @@ 
                 $datestart = isset($this->cronjobs[$key]['datestart']) ? $this->cronjobs[$key]['datestart'] : '';

                 $dateend = isset($this->cronjobs[$key]['dateend']) ? $this->cronjobs[$key]['dateend'] : '';

                 $status = isset($this->cronjobs[$key]['status']) ? $this->cronjobs[$key]['status'] : '';

-                $test = isset($this->cronjobs[$key]['test']) ? $this->cronjobs[$key]['test'] : '';                    // Line must be enabled or not (so visible or not)

+                $test = isset($this->cronjobs[$key]['test']) ? $this->cronjobs[$key]['test'] : ''; // Line must be enabled or not (so visible or not)

                 // Search if cron entry already present

-                $sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";

-                $sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";

+                $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";

+                $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class)."'";

                 if ($class) {

-                    $sql .= " AND classesname = '" . $this->db->escape($class) . "'";

+                    $sql .= " AND classesname = '".$this->db->escape($class)."'";

                 }

                 if ($objectname) {

-                    $sql .= " AND objectname = '" . $this->db->escape($objectname) . "'";

+                    $sql .= " AND objectname = '".$this->db->escape($objectname)."'";

                 }

                 if ($method) {

-                    $sql .= " AND methodename = '" . $this->db->escape($method) . "'";

+                    $sql .= " AND methodename = '".$this->db->escape($method)."'";

                 }

                 if ($command) {

-                    $sql .= " AND command = '" . $this->db->escape($command) . "'";

+                    $sql .= " AND command = '".$this->db->escape($command)."'";

                 }

-                $sql .= " AND entity = " . $entity;    // Must be exact entity

+                $sql .= " AND entity = ".$entity; // Must be exact entity

 

                 $now = dol_now();

 

@@ -1336,7 +1336,7 @@ 
                         $this->db->begin();

 

                         if (!$err) {

-                            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";

+                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";

                             if (is_int($frequency)) {

                                 $sql .= ' frequency,';

                             }

@@ -1351,32 +1351,32 @@ 
                             }

                             $sql .= " entity, test)";

                             $sql .= " VALUES (";

-                            $sql .= "'" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "', ";

-                            $sql .= "'" . $this->db->idate($now) . "', ";

-                            $sql .= ($datestart ? "'" . $this->db->idate($datestart) . "'" : "'" . $this->db->idate($now) . "'") . ", ";

-                            $sql .= ($dateend ? "'" . $this->db->idate($dateend) . "'" : "NULL") . ", ";

-                            $sql .= "'" . $this->db->escape($label) . "', ";

-                            $sql .= "'" . $this->db->escape($jobtype) . "', ";

-                            $sql .= ($class ? "'" . $this->db->escape($class) . "'" : "null") . ",";

-                            $sql .= ($objectname ? "'" . $this->db->escape($objectname) . "'" : "null") . ",";

-                            $sql .= ($method ? "'" . $this->db->escape($method) . "'" : "null") . ",";

-                            $sql .= ($command ? "'" . $this->db->escape($command) . "'" : "null") . ",";

-                            $sql .= ($parameters ? "'" . $this->db->escape($parameters) . "'" : "null") . ",";

-                            $sql .= ($comment ? "'" . $this->db->escape($comment) . "'" : "null") . ",";

+                            $sql .= "'".$this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class)."', ";

+                            $sql .= "'".$this->db->idate($now)."', ";

+                            $sql .= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";

+                            $sql .= ($dateend ? "'".$this->db->idate($dateend)."'" : "NULL").", ";

+                            $sql .= "'".$this->db->escape($label)."', ";

+                            $sql .= "'".$this->db->escape($jobtype)."', ";

+                            $sql .= ($class ? "'".$this->db->escape($class)."'" : "null").",";

+                            $sql .= ($objectname ? "'".$this->db->escape($objectname)."'" : "null").",";

+                            $sql .= ($method ? "'".$this->db->escape($method)."'" : "null").",";

+                            $sql .= ($command ? "'".$this->db->escape($command)."'" : "null").",";

+                            $sql .= ($parameters ? "'".$this->db->escape($parameters)."'" : "null").",";

+                            $sql .= ($comment ? "'".$this->db->escape($comment)."'" : "null").",";

                             if (is_int($frequency)) {

-                                $sql .= "'" . $this->db->escape($frequency) . "', ";

+                                $sql .= "'".$this->db->escape($frequency)."', ";

                             }

                             if (is_int($unitfrequency)) {

-                                $sql .= "'" . $this->db->escape($unitfrequency) . "', ";

+                                $sql .= "'".$this->db->escape($unitfrequency)."', ";

                             }

                             if (is_int($priority)) {

-                                $sql .= "'" . $this->db->escape($priority) . "', ";

+                                $sql .= "'".$this->db->escape($priority)."', ";

                             }

                             if (is_int($status)) {

-                                $sql .= "'" . $this->db->escape($status) . "', ";

+                                $sql .= "'".$this->db->escape($status)."', ";

                             }

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

-                            $sql .= "'" . $this->db->escape($test) . "'";

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

+                            $sql .= "'".$this->db->escape($test)."'";

                             $sql .= ")";

 

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

@@ -1417,13 +1417,13 @@ 
         $err = 0;

 

         if (is_array($this->cronjobs)) {

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

-            $sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";

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

-            $sql .= " AND test = '1'";        // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.

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

+            $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class)."'";

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

+            $sql .= " AND test = '1'"; // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.

             // For crons declared with a '$conf->module->enabled', there is no need to delete the line, so we don't loose setup if we reenable module.

 

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

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

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

             if (!$resql) {

                 $this->error = $this->db->lasterror();

@@ -1447,11 +1447,11 @@ 
 

         $err = 0;

 

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

-        $sql .= " WHERE " . $this->db->decrypt('name') . " like '" . $this->db->escape($this->const_name) . "_TABS_%'";

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

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

+        $sql .= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";

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

 

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

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

         if (!$this->db->query($sql)) {

             $this->error = $this->db->lasterror();

             $err++;

@@ -1474,12 +1474,12 @@ 
         $err = 0;

 

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

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

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

 

             $i = 0;

             foreach ($this->tabs as $key => $value) {

                 if (is_array($value) && count($value) == 0) {

-                    continue;    // Discard empty arrays

+                    continue; // Discard empty arrays

                 }

 

                 $entity = $conf->entity;

@@ -1493,7 +1493,7 @@ 
                 }

 

                 if ($newvalue) {

-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (";

+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";

                     $sql .= "name";

                     $sql .= ", type";

                     $sql .= ", value";

@@ -1502,12 +1502,12 @@ 
                     $sql .= ", entity";

                     $sql .= ")";

                     $sql .= " VALUES (";

-                    $sql .= $this->db->encrypt($this->const_name . "_TABS_" . $i, 1);

+                    $sql .= $this->db->encrypt($this->const_name."_TABS_".$i, 1);

                     $sql .= ", 'chaine'";

-                    $sql .= ", " . $this->db->encrypt($newvalue, 1);

+                    $sql .= ", ".$this->db->encrypt($newvalue, 1);

                     $sql .= ", null";

                     $sql .= ", '0'";

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

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

                     $sql .= ")";

 

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

@@ -1544,7 +1544,7 @@ 
             return 0;

         }

 

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

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

 

         foreach ($this->const as $key => $value) {

             $name = $this->const[$key][0];

@@ -1563,30 +1563,30 @@ 
             }

 

             $sql = "SELECT count(*)";

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

-            $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($name) . "'";

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

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

+            $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";

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

 

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

             if ($result) {

                 $row = $this->db->fetch_row($result);

 

                 if ($row[0] == 0) {   // If not found

-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (name,type,value,note,visible,entity)";

+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";

                     $sql .= " VALUES (";

                     $sql .= $this->db->encrypt($name, 1);

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

-                    $sql .= "," . (($val != '') ? $this->db->encrypt($val, 1) : "''");

-                    $sql .= "," . ($note ? "'" . $this->db->escape($note) . "'" : "null");

-                    $sql .= ",'" . $visible . "'";

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

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

+                    $sql .= ",".(($val != '') ? $this->db->encrypt($val, 1) : "''");

+                    $sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");

+                    $sql .= ",'".$visible."'";

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

                     $sql .= ")";

 

                     if (!$this->db->query($sql)) {

                         $err++;

                     }

                 } else {

-                    dol_syslog(get_class($this) . "::insert_const constant '" . $name . "' already exists", LOG_WARNING);

+                    dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);

                 }

             } else {

                 $err++;

@@ -1618,10 +1618,10 @@ 
             $deleteonunactive = (!empty($this->const[$key][6])) ? 1 : 0;

 

             if ($deleteonunactive) {

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

-                $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $name . "'";

-                $sql .= " AND entity in (0, " . $conf->entity . ")";

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

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

+                $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";

+                $sql .= " AND entity in (0, ".$conf->entity.")";

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

                 if (!$this->db->query($sql)) {

                     $this->error = $this->db->lasterror();

                     $err++;

@@ -1649,13 +1649,13 @@ 
         $err = 0;

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

 

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

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

 

         // Test if module is activated

-        $sql_del = "SELECT " . $this->db->decrypt('value') . " as value";

-        $sql_del .= " FROM " . MAIN_DB_PREFIX . "const";

-        $sql_del .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";

-        $sql_del .= " AND entity IN (0," . $entity . ")";

+        $sql_del = "SELECT ".$this->db->decrypt('value')." as value";

+        $sql_del .= " FROM ".MAIN_DB_PREFIX."const";

+        $sql_del .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";

+        $sql_del .= " AND entity IN (0,".$entity.")";

 

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

 

@@ -1677,8 +1677,8 @@ 
                     }

 

                     // Search if perm already present

-                    $sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "rights_def";

-                    $sql .= " WHERE id = " . $r_id . " AND entity = " . $entity;

+                    $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";

+                    $sql .= " WHERE id = ".$r_id." AND entity = ".$entity;

 

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

                     if ($resqlselect) {

@@ -1686,21 +1686,21 @@ 
                         if ($objcount && $objcount->nb == 0) {

                             if (dol_strlen($r_perms)) {

                                 if (dol_strlen($r_subperms)) {

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

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

                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";

                                     $sql .= " VALUES ";

-                                    $sql .= "(" . $r_id . "," . $entity . ",'" . $this->db->escape($r_desc) . "','" . $r_modul . "','" . $r_type . "'," . $r_def . ",'" . $r_perms . "','" . $r_subperms . "')";

+                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";

                                 } else {

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

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

                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms)";

                                     $sql .= " VALUES ";

-                                    $sql .= "(" . $r_id . "," . $entity . ",'" . $this->db->escape($r_desc) . "','" . $r_modul . "','" . $r_type . "'," . $r_def . ",'" . $r_perms . "')";

+                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";

                                 }

                             } else {

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

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

                                 $sql .= " (id, entity, libelle, module, type, bydefault)";

                                 $sql .= " VALUES ";

-                                $sql .= "(" . $r_id . "," . $entity . ",'" . $this->db->escape($r_desc) . "','" . $r_modul . "','" . $r_type . "'," . $r_def . ")";

+                                $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";

                             }

 

                             $resqlinsert = $this->db->query($sql, 1);

@@ -1711,7 +1711,7 @@ 
                                     $err++;

                                     break;

                                 } else {

-                                    dol_syslog(get_class($this) . "::insert_permissions record already exists", LOG_INFO);

+                                    dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);

                                 }

                             }

 

@@ -1724,24 +1724,24 @@ 
                     // If we want to init permissions on admin users

                     if ($reinitadminperms) {

                         if (!class_exists('User')) {

-                            include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';

+                            include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';

                         }

-                        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user WHERE admin = 1";

-                        dol_syslog(get_class($this) . "::insert_permissions Search all admin users", LOG_DEBUG);

+                        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";

+                        dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);

                         $resqlseladmin = $this->db->query($sql, 1);

                         if ($resqlseladmin) {

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

                             $i = 0;

                             while ($i < $num) {

                                 $obj2 = $this->db->fetch_object($resqlseladmin);

-                                dol_syslog(get_class($this) . "::insert_permissions Add permission to user id=" . $obj2->rowid);

+                                dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);

 

                                 $tmpuser = new User($this->db);

                                 $result = $tmpuser->fetch($obj2->rowid);

                                 if ($result > 0) {

                                     $tmpuser->addrights($r_id, '', '', 0, 1);

                                 } else {

-                                    dol_syslog(get_class($this) . "::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);

+                                    dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);

                                 }

                                 $i++;

                             }

@@ -1779,10 +1779,10 @@ 
 

         $err = 0;

 

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

-        $sql .= " WHERE module = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";

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

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

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

+        $sql .= " WHERE module = '".$this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class)."'";

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

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

         if (!$this->db->query($sql)) {

             $this->error = $this->db->lasterror();

             $err++;

@@ -1806,9 +1806,9 @@ 
             return 0;

         }

 

-        include_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

 

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

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

 

         $err = 0;

 

@@ -1845,7 +1845,7 @@ 
                 }

                 if (!$foundparent) {

                     $this->error = "ErrorBadDefinitionOfMenuArrayInModuleDescriptor";

-                    dol_syslog(get_class($this) . "::insert_menus " . $this->error . " " . $this->menu[$key]['fk_menu'], LOG_ERR);

+                    dol_syslog(get_class($this)."::insert_menus ".$this->error." ".$this->menu[$key]['fk_menu'], LOG_ERR);

                     $err++;

                 }

             }

@@ -1863,12 +1863,12 @@ 
             $menu->position = $this->menu[$key]['position'];

 

             if (!$err) {

-                $result = $menu->create($user);    // Save menu entry into table llx_menu

+                $result = $menu->create($user); // Save menu entry into table llx_menu

                 if ($result > 0) {

                     $this->menu[$key]['rowid'] = $result;

                 } else {

                     $this->error = $menu->error;

-                    dol_syslog(get_class($this) . '::insert_menus result=' . $result . " " . $this->error, LOG_ERR);

+                    dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);

                     $err++;

                     break;

                 }

@@ -1878,7 +1878,7 @@ 
         if (!$err) {

             $this->db->commit();

         } else {

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

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

             $this->db->rollback();

         }

 

@@ -1901,11 +1901,11 @@ 
         //$module=strtolower($this->name);        TODO When right_class will be same than module name

         $module = empty($this->rights_class) ? strtolower($this->name) : $this->rights_class;

 

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

-        $sql .= " WHERE module = '" . $this->db->escape($module) . "'";

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

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

+        $sql .= " WHERE module = '".$this->db->escape($module)."'";

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

 

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

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

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

         if (!$resql) {

             $this->error = $this->db->lasterror();

@@ -1933,35 +1933,35 @@ 
                 $addtodatabase = 0;

 

                 if (!is_array($value)) {

-                    $dir = $value;    // Default simple mode

+                    $dir = $value; // Default simple mode

                 } else {

-                    $constname = $this->const_name . "_DIR_";

+                    $constname = $this->const_name."_DIR_";

                     $dir = $this->dirs[$key][1];

                     $addtodatabase = empty($this->dirs[$key][2]) ? '' : $this->dirs[$key][2]; // Create constante in llx_const

                     $subname = empty($this->dirs[$key][3]) ? '' : strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)

                     $forcename = empty($this->dirs[$key][4]) ? '' : strtoupper($this->dirs[$key][4]); // Change the module name if different

 

                     if (!empty($forcename)) {

-                        $constname = 'MAIN_MODULE_' . $forcename . "_DIR_";

+                        $constname = 'MAIN_MODULE_'.$forcename."_DIR_";

                     }

                     if (!empty($subname)) {

-                        $constname = $constname . $subname . "_";

+                        $constname = $constname.$subname."_";

                     }

 

-                    $name = $constname . strtoupper($this->dirs[$key][0]);

+                    $name = $constname.strtoupper($this->dirs[$key][0]);

                 }

 

                 // Define directory full path ($dir must start with "/")

                 if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) {

-                    $fulldir = DOL_DATA_ROOT . $dir;

+                    $fulldir = DOL_DATA_ROOT.$dir;

                 } else {

-                    $fulldir = DOL_DATA_ROOT . "/" . $conf->entity . $dir;

+                    $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;

                 }

                 // Create dir if it does not exists

                 if (!empty($fulldir) && !file_exists($fulldir)) {

                     if (dol_mkdir($fulldir, DOL_DATA_ROOT) < 0) {

                         $this->error = $langs->trans("ErrorCanNotCreateDir", $fulldir);

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

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

                         $err++;

                     }

                 }

@@ -1996,20 +1996,20 @@ 
         $err = 0;

 

         $sql = "SELECT count(*)";

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

-        $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $name . "'";

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

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

+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";

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

 

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

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

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

         if ($result) {

             $row = $this->db->fetch_row($result);

 

             if ($row[0] == 0) {

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (name,type,value,note,visible,entity)";

-                $sql .= " VALUES (" . $this->db->encrypt($name, 1) . ",'chaine'," . $this->db->encrypt($dir, 1) . ",'Directory for module " . $this->name . "','0'," . $conf->entity . ")";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";

+                $sql .= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";

 

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

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

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

             }

         } else {

@@ -2033,11 +2033,11 @@ 
 

         $err = 0;

 

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

-        $sql .= " WHERE " . $this->db->decrypt('name') . " LIKE '" . $this->db->escape($this->const_name) . "_DIR_%'";

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

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

+        $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_DIR_%'";

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

 

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

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

         if (!$this->db->query($sql)) {

             $this->error = $this->db->lasterror();

             $err++;

@@ -2062,7 +2062,7 @@ 
         if (is_array($this->module_parts) && !empty($this->module_parts)) {

             foreach ($this->module_parts as $key => $value) {

                 if (is_array($value) && count($value) == 0) {

-                    continue;    // Discard empty arrays

+                    continue; // Discard empty arrays

                 }

 

                 $entity = $conf->entity; // Reset the current entity

@@ -2087,7 +2087,7 @@ 
                     }

                 }

 

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";

                 $sql .= "name";

                 $sql .= ", type";

                 $sql .= ", value";

@@ -2096,15 +2096,15 @@ 
                 $sql .= ", entity";

                 $sql .= ")";

                 $sql .= " VALUES (";

-                $sql .= $this->db->encrypt($this->const_name . "_" . strtoupper($key), 1);

+                $sql .= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);

                 $sql .= ", 'chaine'";

-                $sql .= ", " . $this->db->encrypt($newvalue, 1);

+                $sql .= ", ".$this->db->encrypt($newvalue, 1);

                 $sql .= ", null";

                 $sql .= ", '0'";

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

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

                 $sql .= ")";

 

-                dol_syslog(get_class($this) . "::insert_module_parts for key=" . $this->const_name . "_" . strtoupper($key), LOG_DEBUG);

+                dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);

 

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

                 if (!$resql) {

@@ -2112,7 +2112,7 @@ 
                         $error++;

                         $this->error = $this->db->lasterror();

                     } else {

-                        dol_syslog(get_class($this) . "::insert_module_parts for " . $this->const_name . "_" . strtoupper($key) . " Record already exists.", LOG_WARNING);

+                        dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);

                     }

                 }

             }

@@ -2141,11 +2141,11 @@ 
                     $entity = $value['entity'];

                 }

 

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

-                $sql .= " WHERE " . $this->db->decrypt('name') . " LIKE '" . $this->db->escape($this->const_name) . "_" . strtoupper($key) . "'";

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

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

+                $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";

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

 

-                dol_syslog(get_class($this) . "::delete_const_" . $key . "", LOG_DEBUG);

+                dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);

                 if (!$this->db->query($sql)) {

                     $this->error = $this->db->lasterror();

                     $err++;

dolibarr/htdocs/main.inc.php

Spacing +293 added lines, -293 removed lines

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

Braces +341 added lines, -224 removed lines

@@ -214,16 +214,18 @@ 
     foreach ($tmplist as $tmpkey) {
         $postkey = $tmpautoset[0] . '_' . $tmpkey;
         //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-        if (!empty($_POST[$postkey]))
-            $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        if (!empty($_POST[$postkey])) {
+                    $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        }
     }
     $cookiename = $tmpautoset[0];
     $cookievalue = json_encode($cookiearrayvalue);
     //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
     setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
-    if (empty($cookievalue))
-        unset($_COOKIE[$cookiename]);
-}
+    if (empty($cookievalue)) {
+            unset($_COOKIE[$cookiename]);
+    }
+    }
 
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -232,8 +234,9 @@ 
 
 $sessionname = 'DOLSESSID_' . $prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]))
+if (!empty($_COOKIE[$sessiontimeout])) {
     ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
@@ -264,11 +267,13 @@ 
     $conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone')
-        $conf->dol_no_mouse_hover = 1;
-    if ($conf->browser->layout == 'phone')
-        $conf->global->MAIN_TESTMENUHIDER = 1;
-}
+    if ($conf->browser->layout == 'phone') {
+            $conf->dol_no_mouse_hover = 1;
+    }
+    if ($conf->browser->layout == 'phone') {
+            $conf->global->MAIN_TESTMENUHIDER = 1;
+    }
+    }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -313,10 +318,14 @@ 
 }
 
 // Loading of additional presentation includes
-if (!defined('NOREQUIREHTML'))
-    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax)
-    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREHTML')) {
+    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 
 
@@ -357,8 +366,9 @@ 
 // Creation of a token against CSRF vulnerabilities
 if (!defined('NOTOKENRENEWAL')) {
     // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken']))
-        $_SESSION['token'] = $_SESSION['newtoken'];
+    if (isset($_SESSION['newtoken'])) {
+            $_SESSION['token'] = $_SESSION['newtoken'];
+    }
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
@@ -380,14 +390,16 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules', 'alpha'))
+if (GETPOST('disablemodules', 'alpha')) {
     $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+}
 if (!empty($_SESSION["disablemodules"])) {
     $disabled_modules = explode(',', $_SESSION["disablemodules"]);
     foreach ($disabled_modules as $module) {
         if ($module) {
-            if (empty($conf->$module))
-                $conf->$module = new stdClass();
+            if (empty($conf->$module)) {
+                            $conf->$module = new stdClass();
+            }
             $conf->$module->enabled = false;
             if ($module == 'fournisseur') {  // Special case
                 $conf->supplier_order->enabled = 0;
@@ -409,11 +421,13 @@ 
         $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
     } else {
         // Authentication mode
-        if (empty($dolibarr_main_authentication))
-            $dolibarr_main_authentication = 'http,dolibarr';
+        if (empty($dolibarr_main_authentication)) {
+                    $dolibarr_main_authentication = 'http,dolibarr';
+        }
         // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user))
-            $dolibarr_auto_user = 'auto';
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+                    $dolibarr_auto_user = 'auto';
+        }
     }
     // Set authmode
     $authmode = explode(',', $dolibarr_main_authentication);
@@ -490,35 +504,41 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done later
             }
         }
 
         $allowedmethodtopostusername = 2;
-        if (defined('MAIN_AUTHENTICATION_POST_METHOD'))
-            $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+                    $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        }
         $usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
         $passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
         $entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Define if we received data to test the login.
         $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode))
-            $goontestloop = true;
-        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user))
-            $goontestloop = true;
-        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1))
-            $goontestloop = true;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
+                    $goontestloop = true;
+        }
+        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) {
+                    $goontestloop = true;
+        }
+        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) {
+                    $goontestloop = true;
+        }
 
         if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
             include_once DOL_BASE_PATH . '/core/class/translate.class.php';
             $langs = new Translate("", $conf);
             $langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-            if (defined('MAIN_LANG_DEFAULT'))
-                $langcode = constant('MAIN_LANG_DEFAULT');
+            if (defined('MAIN_LANG_DEFAULT')) {
+                            $langcode = constant('MAIN_LANG_DEFAULT');
+            }
             $langs->setDefaultLang($langcode);
         }
 
@@ -540,8 +560,9 @@ 
                     $datenow = dol_now();
                     $datefirst = dol_stringtotime($_POST["dst_first"]);
                     $datesecond = dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond)
-                        $dol_dst = 1;
+                    if ($datenow >= $datefirst && $datenow < $datesecond) {
+                                            $dol_dst = 1;
+                    }
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
@@ -553,8 +574,9 @@ 
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"]))
-                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) {
+                                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                }
 
                 // Call trigger for the "security events" log
                 $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword") . ' - login=' . GETPOST("username", "alpha", 2);
@@ -571,8 +593,9 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done in next chapter
             }
@@ -582,10 +605,11 @@ 
         if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
             // No data to test login, so we show the login page
             dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
-            if (defined('NOREDIRECTBYMAINTOLOGIN'))
-                return 'ERROR_NOT_LOGGED';
-            else
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+                            return 'ERROR_NOT_LOGGED';
+            } else {
+                            dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            }
             exit;
         }
 
@@ -624,21 +648,24 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
         }
-    }
-    else {
+    } else {
         // We are already into an authenticated session
         $login = $_SESSION["dol_login"];
         $entity = $_SESSION["dol_entity"];
@@ -680,20 +707,23 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
-        }
-        else {
+        } else {
             // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
 
@@ -702,8 +732,9 @@ 
                 $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
                 $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
                 // Clean $relativepathstring
-                if (constant('DOL_BASE_URI'))
-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                if (constant('DOL_BASE_URI')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                 //var_dump($relativepathstring);
@@ -754,16 +785,21 @@ 
         $_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
         $_SESSION["dol_entity"] = $conf->entity;
         // Store value into session (values stored only if defined)
-        if (!empty($dol_hide_topmenu))
-            $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
-        if (!empty($dol_hide_leftmenu))
-            $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
-        if (!empty($dol_optimize_smallscreen))
-            $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
-        if (!empty($dol_no_mouse_hover))
-            $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
-        if (!empty($dol_use_jmobile))
-            $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        if (!empty($dol_hide_topmenu)) {
+                    $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+        }
+        if (!empty($dol_hide_leftmenu)) {
+                    $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+        }
+        if (!empty($dol_optimize_smallscreen)) {
+                    $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+        }
+        if (!empty($dol_no_mouse_hover)) {
+                    $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+        }
+        if (!empty($dol_use_jmobile)) {
+                    $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        }
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
 
@@ -788,8 +824,9 @@ 
         $hookmanager->initHooks(array('login'));
         $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginfo' => $loginfo);
         $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0)
-            $error++;
+        if ($reshook < 0) {
+                    $error++;
+        }
 
         if ($error) {
             $db->rollback();
@@ -827,10 +864,14 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))
-        $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))
-        $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+            $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+    }
+    // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+            $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+    }
+    // Can be 0
 
 
 
@@ -869,8 +910,9 @@ 
     if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
         $conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
     }
-} else
+} else {
     $conf->use_javascript_ajax = 0;
+}
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {   // If we must enable text browser
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
@@ -879,25 +921,32 @@ 
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
     $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))
+}
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
     $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen']))
+}
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
     $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))
+}
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
     $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))
+}
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
     $conf->dol_use_jmobile = 1;
-if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic')
+}
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
     $conf->dol_no_mouse_hover = 1;
+}
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 ) {
     $conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile))
+if (!empty($conf->dol_use_jmobile)) {
     $conf->use_javascript_ajax = 1;
+}
 // Replace themes bugged with jmobile with eldy
 if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
     $conf->theme = 'eldy';
@@ -921,8 +970,9 @@ 
 if (!defined('NOLOGIN')) {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (!$user->login)
-        accessforbidden();
+    if (!$user->login) {
+            accessforbidden();
+    }
 
     // Check if user is active
     if ($user->statut < 1) {
@@ -997,15 +1047,18 @@ 
 
     // Load the menu manager (only if not already done)
     $file_menu = $conf->standard_menu;
-    if (GETPOST('menu', 'alpha'))
-        $file_menu = GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+    if (GETPOST('menu', 'alpha')) {
+            $file_menu = GETPOST('menu', 'alpha');
+    }
+    // example: menu=eldy_menu.php
     if (!class_exists('MenuManager')) {
         $menufound = 0;
         $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
-            if (class_exists('MenuManager'))
-                break;
+            if (class_exists('MenuManager')) {
+                            break;
+            }
         }
         if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
             dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
@@ -1155,18 +1208,20 @@ 
     }
     print '<!doctype html>' . "\n";
 
-    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST))
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
-    else
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
+    } else {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    }
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead)) {
         $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
 
         print "<head>\n";
 
-        if (GETPOST('dol_basehref', 'alpha'))
-            print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        if (GETPOST('dol_basehref', 'alpha')) {
+                    print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        }
 
         // Displays meta
         print '<meta charset="UTF-8">' . "\n";
@@ -1176,10 +1231,13 @@ 
 
         // Favicon
         $favicon = dol_buildpath('/theme/' . $conf->theme . '/img/favicon.ico', 1);
-        if (!empty($conf->global->MAIN_FAVICON_URL))
-            $favicon = $conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile))
-            print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n"; // Not required into an Android webview
+        if (!empty($conf->global->MAIN_FAVICON_URL)) {
+                    $favicon = $conf->global->MAIN_FAVICON_URL;
+        }
+        if (empty($conf->dol_use_jmobile)) {
+                    print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n";
+        }
+        // Not required into an Android webview
 
 
 
@@ -1201,32 +1259,40 @@ 
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
         // Auto refresh page
-        if (GETPOST('autorefresh', 'int') > 0)
-            print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        if (GETPOST('autorefresh', 'int') > 0) {
+                    print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        }
 
         // Displays title
         $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;
+        }
 
         print '<title>';
         $titletoshow = '';
-        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE))
-            $titletoshow = dol_htmlentities($title);
-        else if ($title)
-            $titletoshow = dol_htmlentities($appli . ' - ' . $title);
-        else
-            $titletoshow = dol_htmlentities($appli);
-
-        if (!is_object($hookmanager))
-            $hookmanager = new HookManager($db);
+        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+                    $titletoshow = dol_htmlentities($title);
+        } else if ($title) {
+                    $titletoshow = dol_htmlentities($appli . ' - ' . $title);
+        } else {
+                    $titletoshow = dol_htmlentities($appli);
+        }
+
+        if (!is_object($hookmanager)) {
+                    $hookmanager = new HookManager($db);
+        }
         $hookmanager->initHooks("main");
         $parameters = array('title' => $titletoshow);
         $result = $hookmanager->executeHooks('setHtmlTitle', $parameters);  // Note that $action and $object may have been modified by some hooks
-        if ($result > 0)
-            $titletoshow = $hookmanager->resPrint;    // Replace Title to show
-        else
-            $titletoshow .= $hookmanager->resPrint;      // Concat to Title to show
+        if ($result > 0) {
+                    $titletoshow = $hookmanager->resPrint;
+        }
+        // Replace Title to show
+        else {
+                    $titletoshow .= $hookmanager->resPrint;
+        }
+        // Concat to Title to show
 
         print $titletoshow;
         print '</title>';
@@ -1306,8 +1372,9 @@ 
 
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
-        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME))
-            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+                    print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        }
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
@@ -1315,13 +1382,15 @@ 
             foreach ($arraycss as $modcss => $filescss) {
                 $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
-                    if (empty($cssfile))
-                        dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    if (empty($cssfile)) {
+                                            dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    }
                     // cssfile is a relative path
                     print '<!-- Includes CSS added by module ' . $modcss . ' -->' . "\n" . '<link rel="stylesheet" type="text/css" href="' . dol_buildpath($cssfile, 1);
                     // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-                    if (!preg_match('/\.css$/i', $cssfile))
-                        print $themeparam;
+                    if (!preg_match('/\.css$/i', $cssfile)) {
+                                            print $themeparam;
+                    }
                     print '">' . "\n";
                 }
             }
@@ -1331,8 +1400,9 @@ 
             foreach ($arrayofcss as $cssfile) {
                 print '<!-- Includes CSS added by page -->' . "\n" . '<link rel="stylesheet" type="text/css" title="default" href="' . dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i', $cssfile))
-                    print $themeparam;
+                if (!preg_match('/\.css$/i', $cssfile)) {
+                                    print $themeparam;
+                }
                 print '">' . "\n";
             }
         }
@@ -1437,10 +1507,12 @@ 
             // Browser notifications
             if (!defined('DISABLE_BROWSER_NOTIF')) {
                 $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER))
-                    $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone')
-                    $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                                    $enablebrowsernotif = true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                                    $enablebrowsernotif = false;
+                }
                 if ($enablebrowsernotif) {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = ' . $conf->browser->layout . ')-->' . "\n";
                     //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_notification.js.php' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1477,10 +1549,12 @@ 
             }
         }
 
-        if (!empty($head))
-            print $head . "\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER))
-            print $conf->global->MAIN_HTML_HEADER . "\n";
+        if (!empty($head)) {
+                    print $head . "\n";
+        }
+        if (!empty($conf->global->MAIN_HTML_HEADER)) {
+                    print $conf->global->MAIN_HTML_HEADER . "\n";
+        }
 
         print "<!-- Alixar debugBar header -->";
         print Debug::getRenderHeader(); // Includes Alixar debugBar header
@@ -1545,15 +1619,20 @@ 
         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
-            } else
-                $appli .= " " . DOL_VERSION;
-        } else
-            $appli .= " " . DOL_VERSION;
+                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                    $appli .= " (" . DOL_VERSION . ")";
+                }
+                // If new title contains a version that is different than core
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
+        } else {
+                    $appli .= " " . DOL_VERSION;
+        }
 
-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        }
 
         $logouttext = '';
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -1591,12 +1670,15 @@ 
         $parameters = array();
         $result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (is_numeric($result)) {
-            if ($result == 0)
-                $toprightmenu .= $hookmanager->resPrint;  // add
-            else
-                $toprightmenu = $hookmanager->resPrint;      // replace
-        }
-        else {
+            if ($result == 0) {
+                            $toprightmenu .= $hookmanager->resPrint;
+            }
+            // add
+            else {
+                            $toprightmenu = $hookmanager->resPrint;
+            }
+            // replace
+        } else {
             $toprightmenu .= $result; // For backward compatibility
         }
 
@@ -1690,9 +1772,10 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-        print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
-}
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+    }
+    }
 
 /**
  *  Show left menu bar
@@ -1716,8 +1799,9 @@ 
     $searchform = '';
     $bookmarks = '';
 
-    if (!empty($menu_array_before))
-        dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (!empty($menu_array_before)) {
+            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    }
 
     if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
         // Instantiate hooks of thirdparty module
@@ -1725,8 +1809,10 @@ 
 
         print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-        if ($conf->browser->layout == 'phone')
-            $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') {
+                    $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+        }
+        // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
         print "\n";
 
@@ -1753,8 +1839,9 @@ 
         $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             $searchform .= $hookmanager->resPrint;
-        } else
-            $searchform = $hookmanager->resPrint;
+        } else {
+                    $searchform = $hookmanager->resPrint;
+        }
 
         // Force special value for $searchform
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
@@ -1798,38 +1885,49 @@ 
         if (empty($conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
             $doliurl = 'https://www.dolibarr.org';
             //local communities
-            if (preg_match('/fr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.fr';
-            if (preg_match('/es/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.es';
-            if (preg_match('/de/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.de';
-            if (preg_match('/it/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.it';
-            if (preg_match('/gr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.gr';
+            if (preg_match('/fr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.fr';
+            }
+            if (preg_match('/es/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.es';
+            }
+            if (preg_match('/de/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.de';
+            }
+            if (preg_match('/it/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.it';
+            }
+            if (preg_match('/gr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.gr';
+            }
 
             $appli = constant('DOL_APPLICATION_TITLE');
             if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = $conf->global->MAIN_APPLICATION_TITLE;
                 $doliurl = '';
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
             print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-            if ($doliurl)
-                print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-            else
-                print '<span class="help">';
+            if ($doliurl) {
+                            print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+            } else {
+                            print '<span class="help">';
+            }
             print $appli;
-            if ($doliurl)
-                print '</a>';
-            else
-                print '</span>';
+            if ($doliurl) {
+                            print '</a>';
+            } else {
+                            print '</span>';
+            }
             print '</div>' . "\n";
         }
 
@@ -1876,9 +1974,10 @@ 
     print "\n";
     print '<!-- Begin right area -->' . "\n";
 
-    if (empty($leftmenuwithoutmainarea))
-        main_area($title);
-}
+    if (empty($leftmenuwithoutmainarea)) {
+            main_area($title);
+    }
+    }
 
 /**
  *  Begin main area
@@ -1890,16 +1989,18 @@ 
 {
     global $conf, $langs;
 
-    if (empty($conf->dol_hide_leftmenu))
-        print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+    }
 
     print "\n";
 
     print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-        print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+            print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    }
+    }
 
 /**
  *  Return helpbaseurl, helppage and mode
@@ -1923,18 +2024,21 @@ 
         // If WIKI URL
         if (preg_match('/^es/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (preg_match('/^fr/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (empty($helppage)) { // If help page not already found
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         $mode = 'wiki';
     }
@@ -1965,8 +2069,9 @@ 
     $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
     $ret .= '<input type="hidden" name="mode" value="search">';
     $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag($user->login) . '">';
-    if ($showtitlebefore)
-        $ret .= $title . ' ';
+    if ($showtitlebefore) {
+            $ret .= $title . ' ';
+    }
     $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
     $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
     $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -2009,10 +2114,12 @@ 
             foreach ($user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -2023,8 +2130,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
         // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -2032,12 +2140,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != $conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != $conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -2064,20 +2175,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty($conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty($conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty($conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";

Helpers/AlixarDispatcher.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 

     public function __construct()

     {

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

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

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

 

         parent::__construct();

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

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

 

         /**

Base/AlixarView.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         parent::__construct();
 
         $this->defaultlang = 'ES';
-        $this->favicon = DOL_BASE_URI . '/theme/eldy/img/favicon.ico';
+        $this->favicon = DOL_BASE_URI.'/theme/eldy/img/favicon.ico';
         $this->title = 'Inicio - Alixar 0.0.0-alpha';
     }