alxarafe / alixar

Views/CategoriesIndexView.php

Spacing +14 added lines, -14 removed lines

@@ -109,7 +109,7 @@ 
 

         $this->llxHeader('', $this->title, '', '', 0, 0, $arrayofjs, $arrayofcss);

 

-        $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '/categories/card.php?action=create&type=' . $this->type . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . $this->type) . '"><span class="valignmiddle">' . Globals::$langs->trans("NewCategory") . '</span>';

+        $newcardbutton = '<a class="butActionNew" href="'.BASE_URI.'/categories/card.php?action=create&type='.$this->type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$this->type).'"><span class="valignmiddle">'.Globals::$langs->trans("NewCategory").'</span>';

         $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';

         $newcardbutton .= '</a>';

 

@@ -123,17 +123,17 @@ 
         /*

          * Zone recherche produit/service

          */

-        print '<form method="post" action="index.php?type=' . $this->type . '">';

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

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

+        print '<form method="post" action="index.php?type='.$this->type.'">';

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

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

 

 

         print '<table class="noborder nohover" width="100%">';

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

-        print '<td colspan="3">' . Globals::$langs->trans("Search") . '</td>';

+        print '<td colspan="3">'.Globals::$langs->trans("Search").'</td>';

         print '</tr>';

         print '<tr class="oddeven"><td>';

-        print Globals::$langs->trans("Name") . ':</td><td><input class="flat inputsearch" type="text" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="' . Globals::$langs->trans("Search") . '"></td></tr>';

+        print Globals::$langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.Globals::$langs->trans("Search").'"></td></tr>';

         /*

           // faire une rech dans une sous categorie uniquement

           print '<tr '.$bc[0].'><td>';

@@ -158,17 +158,17 @@ 
             $cats = $categstatic->rechercher($id, $catname, $this->typetext);

 

             print '<table class="noborder" width="100%">';

-            print '<tr class="liste_titre"><td colspan="2">' . Globals::$langs->trans("FoundCats") . '</td></tr>';

+            print '<tr class="liste_titre"><td colspan="2">'.Globals::$langs->trans("FoundCats").'</td></tr>';

 

             foreach ($cats as $cat) {

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

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

                 print "\t\t<td>";

                 $categstatic->id = $cat->id;

                 $categstatic->ref = $cat->label;

                 $categstatic->label = $cat->label;

                 $categstatic->type = $cat->type;

                 $categstatic->color = $cat->color;

-                print '<span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>';

+                print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';

                 print $categstatic->getNomUrl(1, '');

                 print '</span>';

                 print "</td>\n";

@@ -208,9 +208,9 @@ 
             $data[] = array(

                 'rowid' => $val['rowid'],

                 'fk_menu' => $val['fk_parent'],

-                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>' . $li . '</span></td>' .

+                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.

                 //'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.

-                '<td align="right" width="20px;"><a href="' . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $val['id'] . '&type=' . $this->type . '">' . img_view() . '</a></td>' .

+                '<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$this->type.'">'.img_view().'</a></td>'.

                 '</tr></table>'

             );

         }

@@ -219,9 +219,9 @@ 
 //print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1);

 

         print '<table class="liste nohover" width="100%">';

-        print '<tr class="liste_titre"><td>' . Globals::$langs->trans("Categories") . '</td><td></td><td align="right">';

+        print '<tr class="liste_titre"><td>'.Globals::$langs->trans("Categories").'</td><td></td><td align="right">';

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

-            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">' . img_picto('', 'object_category') . ' ' . Globals::$langs->trans("UndoExpandAll") . '</a> | <a class="notasortlink" href="#">' . img_picto('', 'object_category-expanded') . ' ' . Globals::$langs->trans("ExpandAll") . '</a></div>';

+            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'object_category').' '.Globals::$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'object_category-expanded').' '.Globals::$langs->trans("ExpandAll").'</a></div>';

         }

         print '</td></tr>';

 

@@ -233,7 +233,7 @@ 
             print '</td></tr>';

         } else {

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

-            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>' . img_picto_common('', 'treemenu/branchbottom.gif') . '</td>';

+            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';

             print '<td valign="middle">';

             print Globals::$langs->trans("NoCategoryYet");

             print '</td>';

Views/LoginView.php

Spacing +9 added lines, -9 removed lines

@@ -61,7 +61,7 @@ 
     public function draw()

     {

         header('Cache-Control: Public, must-revalidate');

-        header("Content-type: text/html; charset=" . Globals::$conf->file->character_set_client);

+        header("Content-type: text/html; charset=".Globals::$conf->file->character_set_client);

 

 // Need global variable $title to be defined by caller (like dol_loginfunction)

 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);

@@ -94,9 +94,9 @@ 
         }

 

         $php_self = DolUtils::dol_escape_htmltag($_SERVER['PHP_SELF']);

-        $php_self .= DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?' . DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

+        $php_self .= DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

         if (!preg_match('/mainmenu=/', $php_self)) {

-            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?') . 'mainmenu=home';

+            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';

         }

 

         $this->url = $php_self;

@@ -110,28 +110,28 @@ 
           );

          */

         $arrayofjs = array(

-            DOL_BASE_URI . '/includes/jstz/jstz.min.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION)),

-        DOL_BASE_URI . '/core/js/dst.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION))

+            DOL_BASE_URI.'/includes/jstz/jstz.min.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),

+        DOL_BASE_URI.'/core/js/dst.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))

         );

 

         // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php.

         // We must keep the @, some tools use it to know it is login page and find true dolibarr version.

         // $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . $titletruedolibarrversion;

-        $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . DOL_VERSION;

+        $titleofloginpage = Globals::$langs->trans('Login').' @ '.DOL_VERSION;

 

         $disablenofollow = 1;

-        if (!preg_match('/' . constant('DOL_APPLICATION_TITLE') . '/', $this->title)) {

+        if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $this->title)) {

             $disablenofollow = 0;

         }

 

         print $this->top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);

 

 

-        $colorbackhmenu1 = '60,70,100';      // topmenu

+        $colorbackhmenu1 = '60,70,100'; // topmenu

         if (!isset(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1)) {

             Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;

         }

         $colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);

-        $colorbackhmenu1 = join(',', DolUtils2::colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'

+        $colorbackhmenu1 = join(',', DolUtils2::colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'

     }

 }

Views/CategoriesView.php

Spacing +15 added lines, -15 removed lines

@@ -70,21 +70,21 @@ 
             if ($action == 'create' || filter_input(INPUT_POST, "addcat") == 'addcat') {

                 DolUtils::dol_set_focus('#label');

 

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

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

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

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

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

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

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

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

-                print '<input type="hidden" name="id" value="' . DolUtils::GETPOST('origin', 'alpha') . '">';

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

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

+                print '<input type="hidden" name="id" value="'.DolUtils::GETPOST('origin', 'alpha').'">';

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

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

                 if ($origin)

                 {

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

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

                 }

                 if ($catorigin)

                 {

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

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

                 }

 

                 print load_fiche_titre($langs->trans("CreateCat"));

@@ -95,29 +95,29 @@ 
 

                 // Ref

                 print '<tr>';

-                print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td><input id="label" class="minwidth100" name="label" value="' . $label . '">';

+                print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';

                 print'</td></tr>';

 

                 // Description

-                print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

+                print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

                 //require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

                 $doleditor = new DolEditor('description', $description, '', 200, 'dolibarr_notes', '', false, true, Globals::$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_6, '90%');

                 $doleditor->Create();

                 print '</td></tr>';

 

                 // Color

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

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

                 print $formother->selectColor($color, 'color');

                 print '</td></tr>';

 

                 // Parent category

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

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

                 print $form->select_all_categories($type, $catorigin, 'parent');

                 print ajax_combobox('parent');

                 print '</td></tr>';

 

                 $parameters = array();

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

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

                 print Globals::$hookManager->resPrint;

                 if (empty($reshook)) {

                     print $object->showOptionals($extrafields, 'edit');

@@ -128,9 +128,9 @@ 
                 DolUtils::dol_fiche_end('');

 

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

-                print '<input type="submit" class="button" value="' . $langs->trans("CreateThisCat") . '" name="creation" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';

                 print '&nbsp; &nbsp; &nbsp;';

-                print '<input type="submit" class="button" value="' . $langs->trans("Cancel") . '" name="cancel" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';

                 print '</div>';

 

                 print '</form>';

Controllers/Categories.php

Spacing +17 added lines, -17 removed lines

@@ -144,34 +144,34 @@ 
             // Action ajout d'une categorie

             if ($this->cancel) {

                 if ($this->urlfrom) {

-                    header("Location: " . $urlfrom);

+                    header("Location: ".$urlfrom);

                     exit;

                 }

                 if ($idProdOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$this->type);

                     exit;

                 }

                 if ($idCompanyOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$this->type);

                     exit;

                 }

                 if ($idSupplierOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$this->type);

                     exit;

                 }

                 if ($idMemberOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$this->type);

                     exit;

                 }

                 if ($idContactOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$this->type);

                     exit;

                 }

                 if ($idProjectOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $this->type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$this->type);

                     exit;

                 }

-                header("Location: " . DOL_URL_ROOT . '/categories/index.php?leftmenu=cat&type=' . $this->type);

+                header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$this->type);

                 exit;

             }

 

@@ -214,39 +214,39 @@ 
             // Action confirmation de creation categorie

             if ($this->action == 'confirmed') {

                 if ($urlfrom) {

-                    header("Location: " . $urlfrom);

+                    header("Location: ".$urlfrom);

                     exit;

                 }

                 if ($backtopage) {

-                    header("Location: " . $backtopage);

+                    header("Location: ".$backtopage);

                     exit;

                 }

                 if ($idProdOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

                 if ($idCompanyOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

                 if ($idSupplierOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

                 if ($idMemberOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

                 if ($idContactOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

                 if ($idProjectOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $this->type . '&mesg=' . urlencode(Globals::$langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$this->type.'&mesg='.urlencode(Globals::$langs->trans("CatCreated")));

                     exit;

                 }

 

-                header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $result . '&type=' . $this->type);

+                header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$this->type);

                 exit;

             }

         }

Base/ExtraFields.php

Spacing +207 added lines, -207 removed lines

@@ -227,7 +227,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -272,10 +272,10 @@ 
                 'default' => $default_value

             );

 

-            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);

+            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

             if ($result > 0) {

                 if ($unique) {

-                    $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";

+                    $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

                     $resql = Config::$dbEngine->query($sql, 1, 'dml');

                 }

                 return 1;

@@ -344,7 +344,7 @@ 
                 $params = '';

             }

 

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

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

             $sql .= " name,";

             $sql .= " label,";

             $sql .= " type,";

@@ -367,30 +367,30 @@ 
             $sql .= " enabled,";

             $sql .= " help";

             $sql .= " )";

-            $sql .= " VALUES('" . $attrname . "',";

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

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

-            $sql .= " " . $pos . ",";

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

-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";

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

-            $sql .= " " . $unique . ",";

-            $sql .= " " . $required . ",";

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

-            $sql .= " " . $alwayseditable . ",";

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

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

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

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

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

-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";

-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";

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

-            $sql .= " " . ($enabled ? "'" . Config::$dbEngine->escape($enabled) . "'" : "1") . ",";

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

+            $sql .= " VALUES('".$attrname."',";

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

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

+            $sql .= " ".$pos.",";

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

+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";

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

+            $sql .= " ".$unique.",";

+            $sql .= " ".$required.",";

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

+            $sql .= " ".$alwayseditable.",";

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

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

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

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

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

+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";

+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";

+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";

+            $sql .= " ".($enabled ? "'".Config::$dbEngine->escape($enabled)."'" : "1").",";

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

             $sql .= ')';

 

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

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

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

                 return 1;

             } else {

@@ -415,7 +415,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -430,15 +430,15 @@ 
 

             if (!$error) {

                 $sql = "SELECT COUNT(rowid) as nb";

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

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

-                $sql .= " AND name = '" . $attrname . "'";

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

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

+                $sql .= " AND name = '".$attrname."'";

                 //$sql.= " AND entity IN (0,".Globals::$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table

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

                 if ($resql) {

                     $obj = Config::$dbEngine->fetch_object($resql);

                     if ($obj->nb <= 0) {

-                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX . $table, $attrname); // This also drop the unique key

+                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key

                         if ($result < 0) {

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

                             $error++;

@@ -472,12 +472,12 @@ 
             $elementtype = 'socpeople';

 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

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

-            $sql .= " WHERE name = '" . $attrname . "'";

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

-            $sql .= " AND elementtype = '" . $elementtype . "'";

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

+            $sql .= " WHERE name = '".$attrname."'";

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

+            $sql .= " AND elementtype = '".$elementtype."'";

 

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

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

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

             if ($resql) {

                 return 1;

@@ -521,7 +521,7 @@ 
         if ($elementtype == 'contact')

             $elementtype = 'socpeople';

 

-        $table = $elementtype . '_extrafields';

+        $table = $elementtype.'_extrafields';

         if ($elementtype == 'categorie')

             $table = 'categories_extrafields';

 

@@ -559,7 +559,7 @@ 
             $field_desc = array('type' => $typedb, 'value' => $lengthdb, 'null' => ($required ? 'NOT NULL' : 'NULL'), 'default' => $default);

 

             if ($type != 'separate') { // No table update when separate type

-                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);

+                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

             }

             if ($result > 0 || $type == 'separate') {

                 if ($label) {

@@ -568,11 +568,11 @@ 
                 if ($result > 0) {

                     $sql = '';

                     if ($unique) {

-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";

+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

                     } else {

-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " DROP INDEX uk_" . $table . "_" . $attrname;

+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;

                     }

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

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

                     $resql = Config::$dbEngine->query($sql, 1, 'dml');

                     return 1;

                 } else {

@@ -617,7 +617,7 @@ 
     {

         // phpcs:enable

         // global $conf, $user;

-        DolUtils::dol_syslog(get_class($this) . "::update_label " . $attrname . ", " . $label . ", " . $type . ", " . $size . ", " . $elementtype . ", " . $unique . ", " . $required . ", " . $pos . ", " . $alwayseditable . ", " . $perms . ", " . $list . ", " . $default . ", " . $computed . ", " . $entity . ", " . $langfile . ", " . $enabled . ", " . $totalizable);

+        DolUtils::dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);

 

         // Clean parameters

         if ($elementtype == 'thirdparty')

@@ -652,21 +652,21 @@ 
 

             if ($entity === '' || $entity != '0') {

                 // We dont want on all entities, we delete all and current

-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

-                $sql_del .= " WHERE name = '" . $attrname . "'";

-                $sql_del .= " AND entity IN (0, " . ($entity === '' ? Globals::$conf->entity : $entity) . ")";

-                $sql_del .= " AND elementtype = '" . $elementtype . "'";

+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+                $sql_del .= " WHERE name = '".$attrname."'";

+                $sql_del .= " AND entity IN (0, ".($entity === '' ? Globals::$conf->entity : $entity).")";

+                $sql_del .= " AND elementtype = '".$elementtype."'";

             } else {

                 // We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)

-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

-                $sql_del .= " WHERE name = '" . $attrname . "'";

+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+                $sql_del .= " WHERE name = '".$attrname."'";

                 $sql_del .= " AND entity = 0";

-                $sql_del .= " AND elementtype = '" . $elementtype . "'";

+                $sql_del .= " AND elementtype = '".$elementtype."'";

             }

             $resql1 = Config::$dbEngine->query($sql_del);

 

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

-            $sql .= " name,";  // This is code

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

+            $sql .= " name,"; // This is code

             $sql .= " entity,";

             $sql .= " label,";

             $sql .= " type,";

@@ -689,28 +689,28 @@ 
             $sql .= " enabled,";

             $sql .= " help";

             $sql .= ") VALUES (";

-            $sql .= "'" . $attrname . "',";

-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";

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

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

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

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

-            $sql .= " " . $unique . ",";

-            $sql .= " " . $required . ",";

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

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

-            $sql .= " " . $pos . ",";

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

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

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

-            $sql .= " " . $totalizable . ",";

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

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

-            $sql .= " " . Globals::$user->id . ",";

-            $sql .= " " . Globals::$user->id . ",";

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

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

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

+            $sql .= "'".$attrname."',";

+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";

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

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

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

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

+            $sql .= " ".$unique.",";

+            $sql .= " ".$required.",";

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

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

+            $sql .= " ".$pos.",";

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

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

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

+            $sql .= " ".$totalizable.",";

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

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

+            $sql .= " ".Globals::$user->id.",";

+            $sql .= " ".Globals::$user->id.",";

+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";

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

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

             $sql .= ")";

 

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

@@ -754,14 +754,14 @@ 
         $array_name_label = array();

 

         // To avoid conflicts with external modules. TODO Remove this.

-        if (!$forceload &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

+        if (!$forceload && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

         return $array_name_label;

 

         // Set array of label of entity

         // TODO Remove completely loading of label. This should be done by presentation.

         $labelmulticompany = array();

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

-            $sql_entity_name = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'entity WHERE rowid in (0,' . Globals::$conf->entity . ')';

+            $sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.Globals::$conf->entity.')';

             $resql_entity_name = Config::$dbEngine->query($sql_entity_name);

             if ($resql_entity_name) {

                 while ($obj = Config::$dbEngine->fetch_object($resql_entity_name)) {

@@ -771,13 +771,13 @@ 
         }

 

         // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.

-        DolUtils::dol_syslog("fetch_name_optionals_label elementtype=" . $elementtype);

+        DolUtils::dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);

 

         $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";

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

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

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

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

         if ($elementtype)

-            $sql .= " AND elementtype = '" . $elementtype . "'"; // Filed with object->table_element

+            $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element

         $sql .= " ORDER BY pos";

 

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

@@ -809,7 +809,7 @@ 
                 $this->attribute_list[$tab->name] = $tab->list;

                 $this->attribute_totalizable[$tab->name] = $tab->totalizable;

                 $this->attribute_entityid[$tab->name] = $tab->entity;

-                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);

+                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);

 

                 // New usage

                 $this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;

@@ -828,7 +828,7 @@ 
                 $this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;

                 $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;

                 $this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;

-                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);

+                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);

                 $this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;

                 $this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;

             }

@@ -861,13 +861,13 @@ 
         // global $conf, $langs, $form;

 

         if (!is_object($form)) {

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

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

             $form = new Form(Config::$dbEngine);

         }

 

         $out = '';

 

-        $keyprefix = $keyprefix . 'options_';  // Because we work on extrafields

+        $keyprefix = $keyprefix.'options_'; // Because we work on extrafields

 

         if (!empty($extrafieldsobjectkey)) {

             $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

@@ -883,7 +883,7 @@ 
             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

             $totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];

             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         } else { // Old usage

             $label = $this->attribute_label[$key];

             $type = $this->attribute_type[$key];

@@ -897,12 +897,12 @@ 
             $langfile = $this->attribute_langfile[$key];

             $list = $this->attribute_list[$key];

             $totalizable = $this->attribute_totalizable[$key];

-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         }

 

         if ($computed) {

             if (!preg_match('/^search_/', $keyprefix))

-                return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';

+                return '<span class="opacitymedium">'.Globals::$langs->trans("AutomaticallyCalculated").'</span>';

             else

                 return '';

         }

@@ -942,31 +942,31 @@ 
                 $value = '-1';

 

             // TODO Must also support $moreparam

-            $out = $form->selectDate($value, $keyprefix . $key . $keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

         }

         elseif (in_array($type, array('int', 'integer'))) {

             $tmp = explode(',', $size);

             $newsize = $tmp[0];

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $newsize . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

         } elseif (preg_match('/varchar/', $type)) {

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $size . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

         } elseif (in_array($type, array('mail', 'phone', 'url'))) {

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

         } elseif ($type == 'text') {

             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field

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

-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

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

+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

                 $out = $doleditor->Create(1);

             } else {

-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

             }

         } elseif ($type == 'html') {

             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field

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

-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

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

+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

                 $out = $doleditor->Create(1);

             } else {

-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';

+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

             }

         } elseif ($type == 'boolean') {

             $checked = '';

@@ -975,33 +975,33 @@ 
             } else {

                 $checked = ' value="1" ';

             }

-            $out = '<input type="checkbox" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . '>';

+            $out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

         } elseif ($type == 'price') {

             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.

                 $value = price($value);

             }

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . Globals::$langs->getCurrencySymbol(Globals::$conf->currency);

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.Globals::$langs->getCurrencySymbol(Globals::$conf->currency);

         } elseif ($type == 'double') {

             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.

                 $value = price($value);

             }

-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ';

+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';

         } elseif ($type == 'select') {

             $out = '';

-            if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

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

-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

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

+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

             }

 

-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

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

             foreach ($param['options'] as $key => $val) {

                 if ((string) $key == '')

                     continue;

                 list($val, $parent) = explode('|', $val);

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

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

                 $out .= (((string) $value == (string) $key) ? ' selected' : '');

-                $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

+                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

                 $out .= '>';

                 if ($langfile && $val)

                     $out .= Globals::$langs->trans($val);

@@ -1013,12 +1013,12 @@ 
         }

         elseif ($type == 'sellist') {

             $out = '';

-            if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

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

-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);

+            if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

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

+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

             }

 

-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

             if (is_array($param['options'])) {

                 $param_list = array_keys($param['options']);

                 $InfoFieldList = explode(":", $param_list[0]);

@@ -1029,19 +1029,19 @@ 
                 // 2 : key fields name (if differ of rowid)

                 // 3 : key field parent (for dependent lists)

                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

 

                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

                     if (strpos($InfoFieldList[4], 'extra.') !== false) {

-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';

                     } else {

-                        $keyList = $InfoFieldList[2] . ' as rowid';

+                        $keyList = $InfoFieldList[2].' as rowid';

                     }

                 }

                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

                     list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-                    $keyList .= ', ' . $parentField;

+                    $keyList .= ', '.$parentField;

                 }

 

                 $fields_label = explode('|', $InfoFieldList[1]);

@@ -1051,8 +1051,8 @@ 
                 }

 

                 $sqlwhere = '';

-                $sql = 'SELECT ' . $keyList;

-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+                $sql = 'SELECT '.$keyList;

+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

                 if (!empty($InfoFieldList[4])) {

                     // can use curent entity filter

                     if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {

@@ -1071,24 +1071,24 @@ 
                     }

                     //We have to join on extrafield table

                     if (strpos($InfoFieldList[4], 'extra') !== false) {

-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

                     } else {

-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];

                     }

                 } else {

                     $sqlwhere .= ' WHERE 1=1';

                 }

                 // Some tables may have field, some other not. For the moment we disable it.

                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {

-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

                 $sql .= $sqlwhere;

                 //print $sql;

 

-                $sql .= ' ORDER BY ' . implode(', ', $fields_label);

+                $sql .= ' ORDER BY '.implode(', ', $fields_label);

 

-                DolUtils::dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);

+                DolUtils::dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

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

                 if ($resql) {

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

@@ -1104,7 +1104,7 @@ 
                         if (is_array($fields_label)) {

                             $notrans = true;

                             foreach ($fields_label as $field_toshow) {

-                                $labeltoshow .= $obj->$field_toshow . ' ';

+                                $labeltoshow .= $obj->$field_toshow.' ';

                             }

                         } else {

                             $labeltoshow = $obj->{$InfoFieldList[1]};

@@ -1115,12 +1115,12 @@ 
                             foreach ($fields_label as $field_toshow) {

                                 $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 if ($translabel != $obj->$field_toshow) {

-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';

+                                    $labeltoshow = dol_trunc($translabel, 18).' ';

                                 } else {

-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

                                 }

                             }

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

                         } else {

                             if (!$notrans) {

                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});

@@ -1133,38 +1133,38 @@ 
                             if (empty($labeltoshow))

                                 $labeltoshow = '(not defined)';

                             if ($value == $obj->rowid) {

-                                $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

+                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

                             }

 

                             if (!empty($InfoFieldList[3]) && $parentField) {

-                                $parent = $parentName . ':' . $obj->{$parentField};

+                                $parent = $parentName.':'.$obj->{$parentField};

                             }

 

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

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

                             $out .= ($value == $obj->rowid ? ' selected' : '');

-                            $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

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

+                            $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

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

                         }

 

                         $i++;

                     }

                     Config::$dbEngine->free($resql);

                 } else {

-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';

+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';

                 }

             }

             $out .= '</select>';

         } elseif ($type == 'checkbox') {

             $value_arr = explode(',', $value);

-            $out = $form->multiselectarray($keyprefix . $key . $keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');

+            $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');

         } elseif ($type == 'radio') {

             $out = '';

             foreach ($param['options'] as $keyopt => $val) {

-                $out .= '<input class="flat ' . $morecss . '" type="radio" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '');

-                $out .= ' value="' . $keyopt . '"';

-                $out .= ' id="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '"';

+                $out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

+                $out .= ' value="'.$keyopt.'"';

+                $out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

                 $out .= ($value == $keyopt ? 'checked' : '');

-                $out .= '/><label for="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '">' . $val . '</label><br>';

+                $out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

             }

         } elseif ($type == 'chkbxlst') {

             if (is_array($value)) {

@@ -1183,17 +1183,17 @@ 
                 // 2 : key fields name (if differ of rowid)

                 // 3 : key field parent (for dependent lists)

                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

-                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

-                    $keyList .= ', ' . $parentField;

+                    list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+                    $keyList .= ', '.$parentField;

                 }

                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

                     if (strpos($InfoFieldList[4], 'extra.') !== false) {

-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';

                     } else {

-                        $keyList = $InfoFieldList[2] . ' as rowid';

+                        $keyList = $InfoFieldList[2].' as rowid';

                     }

                 }

 

@@ -1204,8 +1204,8 @@ 
                 }

 

                 $sqlwhere = '';

-                $sql = 'SELECT ' . $keyList;

-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+                $sql = 'SELECT '.$keyList;

+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

                 if (!empty($InfoFieldList[4])) {

 

                     // can use SELECT request

@@ -1229,11 +1229,11 @@ 
                             // Init des compteurs

                             $nbPregRepl = $nbPregSel = 0;

                             // On retire toutes les parenthèses sans = avant

-                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*(' . $word . ')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

+                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

                             // On retire les espaces autour des = et parenthèses

                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

                             // On retire toutes les parenthèses avec = avant

-                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word . ')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

+                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

                             // On retire les espaces autour des = et parenthèses

                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

 

@@ -1242,7 +1242,7 @@ 
                         }

 

                         // Si l'on a un AND ou un OR, avant ou après

-                        preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                        preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

                         while (!empty($matchCondition[0])) {

                             // If the two sides differ but are not empty

                             if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {

@@ -1250,10 +1250,10 @@ 
                                 $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

                             } else {

                                 if (!empty($matchCondition[1])) {

-                                    $boolCond = (( $matchCondition[1] == "AND" ) ? ' AND 1 ' : ' OR 0 ');

-                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond . $matchCondition[3], $InfoFieldList[4]);

+                                    $boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');

+                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);

                                 } else if (!empty($matchCondition[3])) {

-                                    $boolCond = (( $matchCondition[3] == "AND" ) ? ' 1 AND ' : ' 0 OR');

+                                    $boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');

                                     $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);

                                 } else {

                                     $InfoFieldList[4] = 1;

@@ -1261,7 +1261,7 @@ 
                             }

 

                             // Si l'on a un AND ou un OR, avant ou après

-                            preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

                         }

                     } else {

                         $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

@@ -1269,23 +1269,23 @@ 
 

                     // We have to join on extrafield table

                     if (strpos($InfoFieldList[4], 'extra') !== false) {

-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

                     } else {

-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];

                     }

                 } else {

                     $sqlwhere .= ' WHERE 1=1';

                 }

                 // Some tables may have field, some other not. For the moment we disable it.

                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {

-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

                 // $sql.=preg_replace('/^ AND /','',$sqlwhere);

                 // print $sql;

 

                 $sql .= $sqlwhere;

-                DolUtils::dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);

+                DolUtils::dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

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

                 if ($resql) {

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

@@ -1303,7 +1303,7 @@ 
                         if (is_array($fields_label)) {

                             $notrans = true;

                             foreach ($fields_label as $field_toshow) {

-                                $labeltoshow .= $obj->$field_toshow . ' ';

+                                $labeltoshow .= $obj->$field_toshow.' ';

                             }

                         } else {

                             $labeltoshow = $obj->{$InfoFieldList[1]};

@@ -1314,9 +1314,9 @@ 
                             foreach ($fields_label as $field_toshow) {

                                 $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 if ($translabel != $obj->$field_toshow) {

-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';

+                                    $labeltoshow = dol_trunc($translabel, 18).' ';

                                 } else {

-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

                                 }

                             }

 

@@ -1338,32 +1338,32 @@ 
                             }

 

                             if (!empty($InfoFieldList[3]) && $parentField) {

-                                $parent = $parentName . ':' . $obj->{$parentField};

+                                $parent = $parentName.':'.$obj->{$parentField};

                             }

 

                             $data[$obj->rowid] = $labeltoshow;

                         }

 

-                        $i ++;

+                        $i++;

                     }

                     Config::$dbEngine->free($resql);

 

-                    $out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

                 } else {

-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';

+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';

                 }

             }

         } elseif ($type == 'link') {

-            $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'

+            $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

             $showempty = (($required && $default != '') ? 0 : 1);

-            $out = $form->selectForForms($param_list[0], $keyprefix . $key . $keysuffix, $value, $showempty);

+            $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

         } elseif ($type == 'password') {

             // If prefix is 'search_', field is used as a filter, we use a common text field.

             $out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.

-            $out .= '<input autocomplete="new-password" type="' . ($keyprefix == 'search_' ? 'text' : 'password') . '" class="flat ' . $morecss . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '>';

+            $out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

         }

         if (!empty($hidden)) {

-            $out = '<input type="hidden" value="' . $value . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '"/>';

+            $out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

         }

         /* Add comments

           if ($type == 'date') $out.=' (YYYY-MM-DD)';

@@ -1398,7 +1398,7 @@ 
             $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         } else { // Old usage

             $label = $this->attribute_label[$key];

             $type = $this->attribute_type[$key];

@@ -1412,11 +1412,11 @@ 
             $langfile = $this->attribute_langfile[$key];

             $list = dol_eval($this->attribute_list[$key], 1);

             $help = ''; // Not supported with old syntax

-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

         }

 

         if ($hidden)

-            return '';  // This is a protection. If field is hidden, we should just not call this method.

+            return ''; // This is a protection. If field is hidden, we should just not call this method.

 

 

 

@@ -1447,7 +1447,7 @@ 
             if (!empty($value)) {

                 $checked = ' checked ';

             }

-            $value = '<input type="checkbox" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . ' readonly disabled>';

+            $value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';

         } elseif ($type == 'mail') {

             $value = dol_print_email($value, 0, 0, 0, 64, 1, 1);

         } elseif ($type == 'url') {

@@ -1471,7 +1471,7 @@ 
 

             if (count($InfoFieldList) >= 3) {

                 $selectkey = $InfoFieldList[2];

-                $keyList = $InfoFieldList[2] . ' as rowid';

+                $keyList = $InfoFieldList[2].' as rowid';

             }

 

             $fields_label = explode('|', $InfoFieldList[1]);

@@ -1480,22 +1480,22 @@ 
                 $keyList .= implode(', ', $fields_label);

             }

 

-            $sql = 'SELECT ' . $keyList;

-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+            $sql = 'SELECT '.$keyList;

+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

             if (strpos($InfoFieldList[4], 'extra') !== false) {

                 $sql .= ' as main';

             }

             if ($selectkey == 'rowid' && empty($value)) {

-                $sql .= " WHERE " . $selectkey . "=0";

+                $sql .= " WHERE ".$selectkey."=0";

             } elseif ($selectkey == 'rowid') {

-                $sql .= " WHERE " . $selectkey . "=" . Config::$dbEngine->escape($value);

+                $sql .= " WHERE ".$selectkey."=".Config::$dbEngine->escape($value);

             } else {

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

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

             }

 

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

 

-            DolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=sellist', LOG_DEBUG);

+            DolUtils::dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

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

             if ($resql) {

                 $value = ''; // value was used, so now we reste it to use it to build final output

@@ -1512,9 +1512,9 @@ 
                             $translabel = Globals::$langs->trans($obj->$field_toshow);

                         }

                         if ($translabel != $field_toshow) {

-                            $value .= dol_trunc($translabel, 18) . ' ';

+                            $value .= dol_trunc($translabel, 18).' ';

                         } else {

-                            $value .= $obj->$field_toshow . ' ';

+                            $value .= $obj->$field_toshow.' ';

                         }

                     }

                 } else {

@@ -1529,7 +1529,7 @@ 
                     }

                 }

             } else

-                DolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

+                DolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);

         }

         elseif ($type == 'radio') {

             $value = $param['options'][$value];

@@ -1539,10 +1539,10 @@ 
             $toprint = array();

             if (is_array($value_arr)) {

                 foreach ($value_arr as $keyval => $valueval) {

-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $param['options'][$valueval] . '</li>';

+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

                 }

             }

-            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

         } elseif ($type == 'chkbxlst') {

             $value_arr = explode(',', $value);

 

@@ -1554,7 +1554,7 @@ 
 

             if (count($InfoFieldList) >= 3) {

                 $selectkey = $InfoFieldList[2];

-                $keyList = $InfoFieldList[2] . ' as rowid';

+                $keyList = $InfoFieldList[2].' as rowid';

             }

 

             $fields_label = explode('|', $InfoFieldList[1]);

@@ -1563,15 +1563,15 @@ 
                 $keyList .= implode(', ', $fields_label);

             }

 

-            $sql = 'SELECT ' . $keyList;

-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+            $sql = 'SELECT '.$keyList;

+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

             if (strpos($InfoFieldList[4], 'extra') !== false) {

                 $sql .= ' as main';

             }

             // $sql.= " WHERE ".$selectkey."='".Config::$dbEngine->escape($value)."'";

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

 

-            DolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);

+            DolUtils::dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

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

             if ($resql) {

                 $value = ''; // value was used, so now we reste it to use it to build final output

@@ -1588,9 +1588,9 @@ 
                                     $translabel = Globals::$langs->trans($obj->$field_toshow);

                                 }

                                 if ($translabel != $field_toshow) {

-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';

+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

                                 } else {

-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->$field_toshow . '</li>';

+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

                                 }

                             }

                         } else {

@@ -1599,23 +1599,23 @@ 
                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});

                             }

                             if ($translabel != $obj->{$InfoFieldList[1]}) {

-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';

+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

                             } else {

-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->{$InfoFieldList[1]} . '</li>';

+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

                             }

                         }

                     }

                 }

-                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

             } else {

-                DolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

+                DolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);

             }

         } elseif ($type == 'link') {

             $out = '';

 

             // Only if something to display (perf)

             if ($value) {  // If we have -1 here, pb is into sert, not into ouptu

-                $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'

+                $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

 

                 $InfoFieldList = explode(":", $param_list[0]);

                 $classname = $InfoFieldList[0];

@@ -1700,7 +1700,7 @@ 
     {

         // global $langs;

 

-        $out = '<tr class="trextrafieldseparator trextrafieldseparator' . $key . '"><td colspan="2"><strong>';

+        $out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';

         $out .= Globals::$langs->trans($this->attributes[$object->table_element]['label'][$key]);

         $out .= '</strong></td></tr>';

         return $out;

@@ -1748,7 +1748,7 @@ 
 

                 if ($this->attributes[$object->table_element]['required'][$key]) { // Value is required

                     // Check if empty without using GETPOST, value can be alpha, int, array, etc...

-                    if ((!is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]) && $_POST["options_" . $key] != '0') || (is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]))) {

+                    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0') || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key]))) {

                         //print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];

                         $nofillrequired++;

                         $error_field_required[] = Globals::$langs->transnoentitiesnoconv($value);

@@ -1758,31 +1758,31 @@ 
                 if (in_array($key_type, array('date'))) {

                     // Clean parameters

                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters

-                    $value_key = dol_mktime(0, 0, 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);

+                    $value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

                 } elseif (in_array($key_type, array('datetime'))) {

                     // Clean parameters

                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters

-                    $value_key = dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);

+                    $value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {

-                    $value_arr = GETPOST("options_" . $key, 'array'); // check if an array

+                    $value_arr = GETPOST("options_".$key, 'array'); // check if an array

                     if (!empty($value_arr)) {

                         $value_key = implode($value_arr, ',');

                     } else {

                         $value_key = '';

                     }

                 } else if (in_array($key_type, array('price', 'double'))) {

-                    $value_arr = GETPOST("options_" . $key, 'alpha');

+                    $value_arr = GETPOST("options_".$key, 'alpha');

                     $value_key = price2num($value_arr);

                 } else {

-                    $value_key = GETPOST("options_" . $key);

+                    $value_key = GETPOST("options_".$key);

                 }

 

-                $object->array_options["options_" . $key] = $value_key;

+                $object->array_options["options_".$key] = $value_key;

             }

 

             if ($nofillrequired) {

                 Globals::$langs->load('errors');

-                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired') . ' : ' . implode(', ', $error_field_required), null, 'errors');

+                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');

                 return -1;

             } else {

                 return 1;

@@ -1822,20 +1822,20 @@ 
 

                 if (in_array($key_type, array('date', 'datetime'))) {

                     // Clean parameters

-                    $value_key = dol_mktime($_POST[$keysuffix . "options_" . $key . $keyprefix . "hour"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "min"], 0, $_POST[$keysuffix . "options_" . $key . $keyprefix . "month"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "day"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "year"]);

+                    $value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);

                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {

-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);

                     // Make sure we get an array even if there's only one checkbox

                     $value_arr = (array) $value_arr;

                     $value_key = implode(',', $value_arr);

                 } else if (in_array($key_type, array('price', 'double'))) {

-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);

                     $value_key = price2num($value_arr);

                 } else {

-                    $value_key = GETPOST($keysuffix . "options_" . $key . $keyprefix);

+                    $value_key = GETPOST($keysuffix."options_".$key.$keyprefix);

                 }

 

-                $array_options[$keysuffix . "options_" . $key] = $value_key; // No keyprefix here. keyprefix is used only for read.

+                $array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.

             }

 

             return $array_options;

Base/User.php

Spacing +337 added lines, -337 removed lines

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

     public $twitter;

     public $facebook;

-    public $job;   // job position

+    public $job; // job position

     public $signature;

 

     /**

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

     public $zip;

     public $town;

-    public $state_id;  // The state/department

+    public $state_id; // The state/department

     public $state_code;

     public $state;

     public $office_phone;

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

     public $photo;

     public $lang;

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

-    public $all_permissions_are_loaded;    // All permission are loaded

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

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

-    public $conf;             // To store personal config

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

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

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

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

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

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

+    public $all_permissions_are_loaded; // All permission are loaded

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

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

+    public $conf; // To store personal config

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

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

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

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

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

     private $cache_childids;

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

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

-    public $tjm;     // Average cost of employee

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

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

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

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

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

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

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

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

+    public $tjm; // Average cost of employee

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

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

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

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

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

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

     public $default_c_exp_tax_cat;

     public $default_range;

     public $fields = array(

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

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

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

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

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

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

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

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

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

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

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

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

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

 

         if ($entity < 0) {

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

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

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

             } else {

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

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

             }

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

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

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

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

             } else {

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

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

             }

         }

 

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

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

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

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

         } else if ($login) {

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

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

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

         } else {

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

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

         }

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

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

 

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

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

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

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

 

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

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

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

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

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

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

             } else {

                 $this->error = "USERNOTFOUND";

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

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

                 return 0;

             }

         } else {

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

         if ($loadpersonalconf) {

 // Load user->conf for user

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

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

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

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

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

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

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

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

             if (is_array($resql)) {

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

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

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

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

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

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

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

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

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

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

         if (is_array($resql)) {

             foreach ($resql as $array) {

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

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

 

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

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

         $error = 0;

         $whereforadd = '';

 

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

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

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

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

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

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

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

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

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

 

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

             if ($result) {

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

 

 // Where pour la liste des droits a ajouter

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

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

 // Ajout des droits induits

             if (!empty($subperms)) {

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

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

                     $whereforadd = 'allmodules';

                 } else {

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

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

                     if (!empty($allperms)) {

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

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

                     }

                 }

             }

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

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

             $sql = "SELECT id";

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

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

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

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

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

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

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

             }

 

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

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

                     $nid = $obj->id;

 

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

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

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

                         $error++;

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

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

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

                         $error++;

 

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

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

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

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

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

 

 // Call trigger

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

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

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

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

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

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

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

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

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

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

 

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

             if ($result) {

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

 

 // Where pour la liste des droits a supprimer

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

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

 // Suppression des droits induits

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

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

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

                     $wherefordel = 'allmodules';

                 } else {

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

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

                     if (!empty($allperms)) {

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

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

                     }

                 }

             }

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

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

             $sql = "SELECT id";

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

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

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

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

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

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

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

             }

 

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

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

                     $nid = $obj->id;

 

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

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

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

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

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

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

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

                         $error++;

                     }

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

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

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

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

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

 

 // Call trigger

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

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

     function clearrights()

     {

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

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

         $this->rights = '';

         $this->all_permissions_are_loaded = false;

         $this->_tab_loaded = array();

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

 // D'abord les droits utilisateurs

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

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

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

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

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

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

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

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

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

         } else {

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

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

         }

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

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

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

         if ($moduletag) {

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

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

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

         }

 

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

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

 // Maintenant les droits groupes

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

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

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

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

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

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

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

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

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

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

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

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

             } else {

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

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

             }

         } else {

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

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

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

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

         }

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

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

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

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

         if ($moduletag) {

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

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

         }

 

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

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

 

 // Deactivate user

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

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

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

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

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

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

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

 

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

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

         if ($result) {

 // Call trigger

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

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

 

 // Get current categories

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

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

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

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

 

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

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

 

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

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

 

 // Remove rights

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

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

 

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

             $error++;

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

 

 // Remove group

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

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

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

             $error++;

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

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

 // If contact, remove link

         if ($this->contact_id) {

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

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

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

                 $error++;

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

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

             if ($result < 0) {

                 $error++;

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

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

             }

         }

 

 // Remove user

         if (!$error) {

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

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

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

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

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

                 $error++;

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

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

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

         }

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

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

 

 // Check parameters

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

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

         Config::$dbEngine->begin();

 

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

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

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

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

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

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

 

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

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

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

         if ($resql) {

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

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

             if ($num) {

                 $this->error = 'ErrorLoginAlreadyExists';

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

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

                 Config::$dbEngine->rollback();

                 return -6;

             } else {

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

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

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

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

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

 

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

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

                 if ($result) {

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

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

 

 // Set default rights

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

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

 

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

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

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

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

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

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

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

                     } else {

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

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

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

                         Config::$dbEngine->rollback();

                         return -3;

                     }

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

 

         if (empty($login)) {

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

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

         }

         $this->login = $login;

 

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

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

         if ($result > 0) {

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

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

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

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

             if ($contact->socid) {

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

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

             }

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

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

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

 

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

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

             if ($resql) {

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

 

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

         } else {

 // $this->error deja positionne

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

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

 

             Config::$dbEngine->rollback();

             return $result;

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

 

         if (empty($login)) {

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

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

         }

         $this->login = $login;

 

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

 

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

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

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

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

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

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

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

 

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

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

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

                 if ($resql) {

                     Config::$dbEngine->commit();

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

         global $conf;

 

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

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

         $sql .= " WHERE bydefault = 1";

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

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

 

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

         if ($resql) {

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

         while ($i < $num) {

 

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

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

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

 

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

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

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

             if (!$result) {

                 return -1;

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

         $error = 0;

 

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

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

 

 // Clean parameters

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

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

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

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

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

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

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

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

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

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

 

 // Update datas

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-        }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+        }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         }

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

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

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

         }

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

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

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

         }

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

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

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

         }

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

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

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

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

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

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

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

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

 

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

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

 

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

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

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

         if ($resql) {

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

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

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

             if ($this->fk_member > 0) {

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

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

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

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

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

                 if (!$resql) {

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

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

             }

 // Set link to user

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

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

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

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

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

             if (!$resql) {

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

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

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

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

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

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

 

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

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

 

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

 // if this is an update.

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

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

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

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

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

                             $error++;

                         }

                     } else {

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

 

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

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

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

 

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

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

 

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

 // if this is an update.

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

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

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

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

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

                             $error++;

                         }

                     } else {

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

                 return $nbrowsaffected;

             } else {

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

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

                 Config::$dbEngine->rollback();

                 return -1;

             }

@@ -1639,20 +1639,20 @@ 
 // phpcs:enable

         $now = dol_now();

 

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

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

         $sql .= " datepreviouslogin = datelastlogin,";

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

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

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

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

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

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

 

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

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

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

         if ($resql) {

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

             $this->datelastlogin = $now;

             return 1;

         } else {

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

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

             return -1;

         }

     }

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

     {

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

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

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

 

         $error = 0;

 

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

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

 

 // If new password not provided, we generate one

         if (!$password) {

@@ -1692,17 +1692,17 @@ 
 

             Config::$dbEngine->begin();

 

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

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

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

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

             $sql .= " pass_temp = null";

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

                 $sql .= ", pass = null";

             } else {

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

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

             }

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

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

 

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

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

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

             if ($result) {

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

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

 

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

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

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

 

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

 // if this is an update.

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

                             if ($result < 0) {

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

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

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

                                 $error++;

                             }

                         } else {

@@ -1731,7 +1731,7 @@ 
                         }

                     }

 

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

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

 

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

 // Call trigger

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

 // We store clear password in password temporary field.

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

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

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

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

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

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

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

 

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

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

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

             if ($result) {

                 return $password;

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

 //global $dolibarr_main_url_root;

 

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

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

 

         $msgishtml = 0;

 

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

 

 // Define $urlwithroot

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

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

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

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

 

         if (!$changelater) {

-            $url = $urlwithroot . '/';

+            $url = $urlwithroot.'/';

 

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

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

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

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

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

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

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

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

             $mesg .= "\n";

 

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

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

             $mesg .= "--\n";

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

 

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

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

         } else {

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

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

 

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

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

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

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

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

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

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

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

             $mesg .= "\n";

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

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

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

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

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

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

 

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

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

         }

 

         $mailfile = new CMailFile(

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

         } else {

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

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

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

             return -1;

         }

     }

@@ -1878,8 +1878,8 @@ 
     {

 // phpcs:enable

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

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

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

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

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

 

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

         if ($resql) {

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

         Config::$dbEngine->begin();

 

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

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

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

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

 

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

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

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

 

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

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

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

         if ($result) {

             Config::$dbEngine->commit();

@@ -1957,20 +1957,20 @@ 
 

         Config::$dbEngine->begin();

 

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

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

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

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

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

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

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

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

 

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

 

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

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

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

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

 

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

         if ($result) {

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

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

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

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

 

 // Call trigger

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

                 return 1;

             } else {

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

+                DolUtils::dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2014,15 +2014,15 @@ 
 

         Config::$dbEngine->begin();

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "usergroup_user";

-        $sql .= " WHERE fk_user  = " . $this->id;

-        $sql .= " AND fk_usergroup = " . $group;

-        $sql .= " AND entity = " . $entity;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";

+        $sql .= " WHERE fk_user  = ".$this->id;

+        $sql .= " AND fk_usergroup = ".$group;

+        $sql .= " AND entity = ".$entity;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

             if (!$error && !$notrigger) {

-                $this->oldgroupid = $group;    // deprecated. Remove this.

+                $this->oldgroupid = $group; // deprecated. Remove this.

                 $this->context = array('audit' => Globals::$langs->trans("UserRemovedFromGroup"), 'oldgroupid' => $group);

 

 // Call trigger

@@ -2038,7 +2038,7 @@ 
                 return 1;

             } else {

                 $this->error = $interface->error;

-                DolUtils::dol_syslog(get_class($this) . "::RemoveFromGroup " . $this->error, LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);

                 Config::$dbEngine->rollback();

                 return -2;

             }

@@ -2062,7 +2062,7 @@ 
     function getPhotoUrl($width, $height, $cssclass = '', $imagesize = '')

     {

 // $result = '<a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $this->id . '">';

-        $result = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $result = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $result .= Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize);

         $result .= '</a>';

 

@@ -2112,49 +2112,49 @@ 
 

 // Info Login

         $label .= '<div class="centpercent">';

-        $label .= '<u>' . Globals::$langs->trans("User") . '</u><br>';

-        $label .= '<b>' . Globals::$langs->trans('Name') . ':</b> ' . $this->getFullName(Globals::$langs, '');

+        $label .= '<u>'.Globals::$langs->trans("User").'</u><br>';

+        $label .= '<b>'.Globals::$langs->trans('Name').':</b> '.$this->getFullName(Globals::$langs, '');

         if (!empty($this->login)) {

-            $label .= '<br><b>' . Globals::$langs->trans('Login') . ':</b> ' . $this->login;

+            $label .= '<br><b>'.Globals::$langs->trans('Login').':</b> '.$this->login;

         }

-        $label .= '<br><b>' . Globals::$langs->trans("EMail") . ':</b> ' . $this->email;

+        $label .= '<br><b>'.Globals::$langs->trans("EMail").':</b> '.$this->email;

         if (!empty($this->admin)) {

-            $label .= '<br><b>' . Globals::$langs->trans("Administrator") . '</b>: ' . DolUtils::yn($this->admin);

+            $label .= '<br><b>'.Globals::$langs->trans("Administrator").'</b>: '.DolUtils::yn($this->admin);

         }

         if (!empty($this->socid)) { // Add thirdparty for external users

             $thirdpartystatic = new Societe($db);

             $thirdpartystatic->fetch($this->socid);

             if (empty($hidethirdpartylogo)) {

-                $companylink = ' ' . $thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

+                $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company

             }

-            $company = ' (' . Globals::$langs->trans("Company") . ': ' . $thirdpartystatic->name . ')';

+            $company = ' ('.Globals::$langs->trans("Company").': '.$thirdpartystatic->name.')';

         }

-        $type = ($this->socid ? Globals::$langs->trans("External") . $company : Globals::$langs->trans("Internal"));

-        $label .= '<br><b>' . Globals::$langs->trans("Type") . ':</b> ' . $type;

-        $label .= '<br><b>' . Globals::$langs->trans("Status") . '</b>: ' . $this->getLibStatut(0);

+        $type = ($this->socid ? Globals::$langs->trans("External").$company : Globals::$langs->trans("Internal"));

+        $label .= '<br><b>'.Globals::$langs->trans("Type").':</b> '.$type;

+        $label .= '<br><b>'.Globals::$langs->trans("Status").'</b>: '.$this->getLibStatut(0);

         $label .= '</div>';

         if ($infologin > 0) {

             $label .= '<br>';

-            $label .= '<br><u>' . Globals::$langs->trans("Connection") . '</u>';

-            $label .= '<br><b>' . Globals::$langs->trans("IPAddress") . '</b>: ' . $_SERVER["REMOTE_ADDR"];

+            $label .= '<br><u>'.Globals::$langs->trans("Connection").'</u>';

+            $label .= '<br><b>'.Globals::$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];

             if (!empty(Globals::$conf->global->MAIN_MODULE_MULTICOMPANY)) {

-                $label .= '<br><b>' . Globals::$langs->trans("ConnectedOnMultiCompany") . ':</b> ' . Globals::$conf->entity . ' (user entity ' . $this->entity . ')';

+                $label .= '<br><b>'.Globals::$langs->trans("ConnectedOnMultiCompany").':</b> '.Globals::$conf->entity.' (user entity '.$this->entity.')';

             }

-            $label .= '<br><b>' . Globals::$langs->trans("AuthenticationMode") . ':</b> ' . $_SESSION["dol_authmode"] . (empty($dolibarr_main_demo) ? '' : ' (demo)');

-            $label .= '<br><b>' . Globals::$langs->trans("ConnectedSince") . ':</b> ' . DolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("PreviousConnexion") . ':</b> ' . DolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentTheme") . ':</b> ' . Globals::$conf->theme;

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentMenuManager") . ':</b> ' . Globals::$menuManager->name;

+            $label .= '<br><b>'.Globals::$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');

+            $label .= '<br><b>'.Globals::$langs->trans("ConnectedSince").':</b> '.DolUtils::dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("PreviousConnexion").':</b> '.DolUtils::dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentTheme").':</b> '.Globals::$conf->theme;

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentMenuManager").':</b> '.Globals::$menuManager->name;

             $s = DolUtils::picto_from_langcode(Globals::$langs->getDefaultLang());

-            $label .= '<br><b>' . Globals::$langs->trans("CurrentUserLanguage") . ':</b> ' . ($s ? $s . ' ' : '') . Globals::$langs->getDefaultLang();

-            $label .= '<br><b>' . Globals::$langs->trans("Browser") . ':</b> ' . Globals::$conf->browser->name . (Globals::$conf->browser->version ? ' ' . Globals::$conf->browser->version : '') . ' (' . $_SERVER['HTTP_USER_AGENT'] . ')';

-            $label .= '<br><b>' . Globals::$langs->trans("Layout") . ':</b> ' . Globals::$conf->browser->layout;

-            $label .= '<br><b>' . Globals::$langs->trans("Screen") . ':</b> ' . $_SESSION['dol_screenwidth'] . ' x ' . $_SESSION['dol_screenheight'];

+            $label .= '<br><b>'.Globals::$langs->trans("CurrentUserLanguage").':</b> '.($s ? $s.' ' : '').Globals::$langs->getDefaultLang();

+            $label .= '<br><b>'.Globals::$langs->trans("Browser").':</b> '.Globals::$conf->browser->name.(Globals::$conf->browser->version ? ' '.Globals::$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';

+            $label .= '<br><b>'.Globals::$langs->trans("Layout").':</b> '.Globals::$conf->browser->layout;

+            $label .= '<br><b>'.Globals::$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];

             if (Globals::$conf->browser->layout == 'phone') {

-                $label .= '<br><b>' . Globals::$langs->trans("Phone") . ':</b> ' . Globals::$langs->trans("Yes");

+                $label .= '<br><b>'.Globals::$langs->trans("Phone").':</b> '.Globals::$langs->trans("Yes");

             }

             if (!empty($_SESSION["disablemodules"])) {

-                $label .= '<br><b>' . Globals::$langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));

+                $label .= '<br><b>'.Globals::$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));

             }

         }

         if ($infologin < 0) {

@@ -2162,10 +2162,10 @@ 
         }

 

 // $url = DOL_URL_ROOT . '/user/card.php?id=' . $this->id;

-        $url = BASE_URI . '?controller=user&method=card&id=' . $this->id;

+        $url = BASE_URI.'?controller=user&method=card&id='.$this->id;

         if ($option == 'leave') {

 //$url = DOL_URL_ROOT . '/holiday/list.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=holiday&method=list&id=' . $this->id;

+            $url = BASE_URI.'?controller=holiday&method=list&id='.$this->id;

         }

         if ($option != 'nolink') {

 // Add param to save lastsearch_values or not

@@ -2178,16 +2178,16 @@ 
             }

         }

 

-        $linkstart = '<a href="' . $url . '"';

+        $linkstart = '<a href="'.$url.'"';

         $linkclose = "";

         if (empty($notooltip)) {

             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 Globals::$langs->load("users");

                 $label = Globals::$langs->trans("ShowUser");

-                $linkclose .= ' alt="' . DolUtils::dol_escape_htmltag($label, 1) . '"';

+                $linkclose .= ' alt="'.DolUtils::dol_escape_htmltag($label, 1).'"';

             }

-            $linkclose .= ' title="' . DolUtils::dol_escape_htmltag($label, 1) . '"';

-            $linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';

+            $linkclose .= ' title="'.DolUtils::dol_escape_htmltag($label, 1).'"';

+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';

 

             /*

               Globals::$hookManager->initHooks(array('userdao'));

@@ -2197,7 +2197,7 @@ 
              */

         }

 

-        $linkstart .= $linkclose . '>';

+        $linkstart .= $linkclose.'>';

         $linkend = '</a>';

 

 //if ($withpictoimg == -1) $result.='<div class="nowrap">';

@@ -2209,15 +2209,15 @@ 
             }

 // Only picto

             if ($withpictoimg > 0) {

-                $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';

+                $picto = '<!-- picto user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</div>';

             } else { // Picto must be a photo

-                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';

+                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg'.($morecss ? ' '.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</div>';

             }

             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-                $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';

+                $result .= '<div class="inline-block nopadding valignmiddle usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';

             }

             if ($mode == 'login') {

                 $result .= dol_trunc($this->login, $maxlen);

@@ -2237,7 +2237,7 @@ 
         global $action;

         Globals::$hookManager->initHooks(array('userdao'));

         $parameters = array('id' => $this->id, 'getnomurl' => $result);

-        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+        $reshook = Globals::$hookManager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

         if ($reshook > 0) {

             $result = Globals::$hookManager->resPrint;

         } else {

@@ -2261,7 +2261,7 @@ 
         $result = '';

 

 // $linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-        $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card&id=' . $this->id . '">';

+        $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card&id='.$this->id.'">';

         $linkend = '</a>';

 

 //Check user's rights to see an other user

@@ -2271,7 +2271,7 @@ 
 

         if ($option == 'xxx') {

 //$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

-            $linkstart = '<a href="' . BASE_URI . '?controller=user&method=card.php&id=' . $this->id . '">';

+            $linkstart = '<a href="'.BASE_URI.'?controller=user&method=card.php&id='.$this->id.'">';

             $linkend = '</a>';

         }

 

@@ -2328,9 +2328,9 @@ 
             }

         } elseif ($mode == 2) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 3) {

             if ($statut == 1) {

@@ -2340,15 +2340,15 @@ 
             }

         } elseif ($mode == 4) {

             if ($statut == 1) {

-                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Enabled');

+                return img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.Globals::$langs->trans('Enabled');

             } elseif ($statut == 0) {

-                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . Globals::$langs->trans('Disabled');

+                return img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.Globals::$langs->trans('Disabled');

             }

         } elseif ($mode == 5) {

             if ($statut == 1) {

-                return Globals::$langs->trans('Enabled') . ' ' . img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

+                return Globals::$langs->trans('Enabled').' '.img_picto(Globals::$langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

             } elseif ($statut == 0) {

-                return Globals::$langs->trans('Disabled') . ' ' . img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+                return Globals::$langs->trans('Disabled').' '.img_picto(Globals::$langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

             }

         }

     }

@@ -2369,11 +2369,11 @@ 
         global $conf;

         $dn = '';

         if ($mode == 0) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS] . "," . Globals::$conf->global->LDAP_USER_DN;

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS].",".Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 1) {

             $dn = Globals::$conf->global->LDAP_USER_DN;

         } elseif ($mode == 2) {

-            $dn = Globals::$conf->global->LDAP_KEY_USERS . "=" . $info[Globals::$conf->global->LDAP_KEY_USERS];

+            $dn = Globals::$conf->global->LDAP_KEY_USERS."=".$info[Globals::$conf->global->LDAP_KEY_USERS];

         }

         return $dn;

     }

@@ -2571,8 +2571,8 @@ 
     {

         $sql = "SELECT u.rowid, u.login as ref, u.datec,";

         $sql .= " u.tms as date_modification, u.entity";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

-        $sql .= " WHERE u.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql .= " WHERE u.rowid = ".$id;

 

         $result = Config::$dbEngine->query($sql);

         if ($result) {

@@ -2601,9 +2601,9 @@ 
     function getNbOfEMailings()

     {

         $sql = "SELECT count(mc.email) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";

-        $sql .= " WHERE mc.email = '" . Config::$dbEngine->escape($this->email) . "'";

-        $sql .= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes

+        $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";

+        $sql .= " WHERE mc.email = '".Config::$dbEngine->escape($this->email)."'";

+        $sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -2631,19 +2631,19 @@ 
         global $conf;

 

         $sql = "SELECT count(rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         } else {

-            $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

+            $sql .= " WHERE entity IN (".getEntity('user', 0).")";

             if ($limitTo == 'active') {

                 $sql .= " AND statut = 1";

             }

             if ($admin >= 0) {

-                $sql .= " AND admin = " . $admin;

+                $sql .= " AND admin = ".$admin;

             }

         }

 

@@ -2694,7 +2694,7 @@ 
 

         $result = $this->update(Globals::$user);

 

-        DolUtils::dol_syslog(get_class($this) . "::update_ldap2dolibarr result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);

 

         return $result;

     }

@@ -2709,10 +2709,10 @@ 
     function get_children()

     {

 // phpcs:enable

-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE fk_user = " . $this->id;

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE fk_user = ".$this->id;

 

-        DolUtils::dol_syslog(get_class($this) . "::get_children result=" . $result, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);

         $res = Config::$dbEngine->query($sql);

         if ($res) {

             $this->users = array();

@@ -2741,11 +2741,11 @@ 
 

 // Load array[child]=parent

         $sql = "SELECT fk_user as id_parent, rowid as id_son";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

         $sql .= " WHERE fk_user <> 0";

-        $sql .= " AND entity IN (" . getEntity('user') . ")";

+        $sql .= " AND entity IN (".getEntity('user').")";

 

-        DolUtils::dol_syslog(get_class($this) . "::loadParentOf", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::loadParentOf", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             while ($obj = Config::$dbEngine->fetch_object($resql)) {

@@ -2787,20 +2787,20 @@ 
 

 // Init $this->users array

         $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

 // Add fields from hooks

         $parameters = array();

-        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = Globals::$hookManager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook

         if ($reshook > 0) {

             $sql .= Globals::$hookManager->resPrint;

         } else {

-            $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

+            $sql .= " WHERE u.entity IN (".getEntity('user').")";

         }

         if ($filter) {

-            $sql .= " AND " . $filter;

+            $sql .= " AND ".$filter;

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

             $i = 0;

@@ -2826,7 +2826,7 @@ 
         }

 

 // We add the fullpath property to each elements of first level (no parent exists)

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);

         foreach ($this->users as $key => $val) {

             $result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)

             if ($result < 0) {

@@ -2838,18 +2838,18 @@ 
 // Exclude leaf including $deleteafterid from tree

         if ($deleteafterid) {

 //print "Look to discard user ".$deleteafterid."\n";

-            $keyfilter1 = '^' . $deleteafterid . '$';

-            $keyfilter2 = '_' . $deleteafterid . '$';

-            $keyfilter3 = '^' . $deleteafterid . '_';

-            $keyfilter4 = '_' . $deleteafterid . '_';

+            $keyfilter1 = '^'.$deleteafterid.'$';

+            $keyfilter2 = '_'.$deleteafterid.'$';

+            $keyfilter3 = '^'.$deleteafterid.'_';

+            $keyfilter4 = '_'.$deleteafterid.'_';

             foreach ($this->users as $key => $val) {

-                if (preg_match('/' . $keyfilter1 . '/', $val['fullpath']) || preg_match('/' . $keyfilter2 . '/', $val['fullpath']) || preg_match('/' . $keyfilter3 . '/', $val['fullpath']) || preg_match('/' . $keyfilter4 . '/', $val['fullpath'])) {

+                if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath']) || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {

                     unset($this->users[$key]);

                 }

             }

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_tree dol_sort_array", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);

         $this->users = dol_sort_array($this->users, 'fullname', 'asc', true, false);

 

 //var_dump($this->users);

@@ -2877,10 +2877,10 @@ 
 

             $idtoscan = $this->id;

 

-            DolUtils::dol_syslog("Build childid for id = " . $idtoscan);

+            DolUtils::dol_syslog("Build childid for id = ".$idtoscan);

             foreach ($this->users as $id => $val) {

 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath'])) {

+                if (preg_match('/_'.$idtoscan.'_/', $val['fullpath'])) {

                     $childids[$val['id']] = $val['id'];

                 }

             }

@@ -2906,16 +2906,16 @@ 
     function build_path_from_id_user($id_user, $protection = 0)

     {

 // phpcs:enable

-        DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user id_user=" . $id_user . " protection=" . $protection, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);

 

         if (!empty($this->users[$id_user]['fullpath'])) {

 // Already defined

-            DolUtils::dol_syslog(get_class($this) . "::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

+            DolUtils::dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);

             return 0;

         }

 

 // Define fullpath and fullname

-        $this->users[$id_user]['fullpath'] = '_' . $id_user;

+        $this->users[$id_user]['fullpath'] = '_'.$id_user;

         $this->users[$id_user]['fullname'] = $this->users[$id_user]['lastname'];

         $i = 0;

         $cursor_user = $id_user;

@@ -2924,11 +2924,11 @@ 
         while (!empty($this->parentof[$cursor_user])) {

             if (in_array($this->parentof[$cursor_user], Globals::$useridfound)) {

                 DolUtils::dol_syslog("The hierarchy of user has a recursive loop", LOG_WARNING);

-                return -1;     // Should not happen. Protection against looping hierarchy

+                return -1; // Should not happen. Protection against looping hierarchy

             }

             Globals::$useridfound[] = $this->parentof[$cursor_user];

-            $this->users[$id_user]['fullpath'] = '_' . $this->parentof[$cursor_user] . $this->users[$id_user]['fullpath'];

-            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'] . ' >> ' . $this->users[$id_user]['fullname'];

+            $this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];

+            $this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'].' >> '.$this->users[$id_user]['fullname'];

             $i++;

             $cursor_user = $this->parentof[$cursor_user];

         }

@@ -2970,10 +2970,10 @@ 
         $this->nb = array();

 

         $sql = "SELECT count(u.rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

         $sql .= " WHERE u.statut > 0";

 //$sql.= " AND employee != 0";

-        $sql .= " AND u.entity IN (" . getEntity('user') . ")";

+        $sql .= " AND u.entity IN (".getEntity('user').")";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3038,8 +3038,8 @@ 
         }

 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user";

-        $sql .= " WHERE rowid = '" . $rowid . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user";

+        $sql .= " WHERE rowid = '".$rowid."'";

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

@@ -3049,7 +3049,7 @@ 
                 $obj = Config::$dbEngine->fetch_object($resql);

 

                 if ($mode == 'email') {

-                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

+                    $this->user_property = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";

                 } else if ($mode == 'mobile') {

                     $this->user_property = $obj->user_mobile;

                 }

@@ -3076,7 +3076,7 @@ 
         global $conf;

 

         $sql = "SELECT t.rowid";

-        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t ';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';

         $sql .= " WHERE 1";

 

 // Manage filter

@@ -3084,25 +3084,25 @@ 
         if (!empty($filter)) {

             foreach ($filter as $key => $value) {

                 if ($key == 't.rowid') {

-                    $sqlwhere[] = $key . '=' . $value;

+                    $sqlwhere[] = $key.'='.$value;

                 } elseif (strpos($key, 'date') !== false) {

-                    $sqlwhere[] = $key . ' = \'' . Config::$dbEngine->idate($value) . '\'';

+                    $sqlwhere[] = $key.' = \''.Config::$dbEngine->idate($value).'\'';

                 } elseif ($key == 'customsql') {

                     $sqlwhere[] = $value;

                 } else {

-                    $sqlwhere[] = $key . ' LIKE \'%' . Config::$dbEngine->escape($value) . '%\'';

+                    $sqlwhere[] = $key.' LIKE \'%'.Config::$dbEngine->escape($value).'%\'';

                 }

             }

         }

         if (count($sqlwhere) > 0) {

-            $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

+            $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';

         }

         $sql .= Config::$dbEngine->order($sortfield, $sortorder);

         if ($limit) {

             $sql .= Config::$dbEngine->plimit($limit + 1, $offset);

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);

 

         $resql = Config::$dbEngine->query($sql);

         if ($resql) {

Base/Interfaces.php

Spacing +34 added lines, -34 removed lines

@@ -24,7 +24,7 @@ 
 class Interfaces

 {

 

-    var $dir;    // Directory with all core and external triggers files

+    var $dir; // Directory with all core and external triggers files

 

     /**

      * @var string[] Error codes (or messages)

@@ -62,13 +62,13 @@ 
         // phpcs:enable

         // Check parameters

         if (!is_object($object) || !is_object($conf)) { // Error

-            $this->error = 'function run_triggers called with wrong parameters action=' . $action . ' object=' . is_object($object) . ' user=' . is_object($user) . ' langs=' . is_object($langs) . ' conf=' . is_object($conf);

-            DolUtils::dol_syslog(get_class($this) . '::run_triggers ' . $this->error, LOG_ERR);

+            $this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);

+            DolUtils::dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);

             $this->errors[] = $this->error;

             return -1;

         }

         if (!is_object($langs)) { // Warning

-            DolUtils::dol_syslog(get_class($this) . '::run_triggers was called with wrong parameters action=' . $action . ' object=' . is_object($object) . ' user=' . is_object($user) . ' langs=' . is_object($langs) . ' conf=' . is_object($conf), LOG_WARNING);

+            DolUtils::dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

         }

         /*

           if (!is_object($user)) {     // Warning

@@ -86,7 +86,7 @@ 
         $i = 0;

 

         // $dirtriggers = array_merge(array('/core/triggers'), Globals::$conf->modules_parts['triggers']);

-        $dirtriggers = array_merge(array(BASE_PATH . '/Helpers/triggers'), Globals::$conf->modules_parts['triggers']);

+        $dirtriggers = array_merge(array(BASE_PATH.'/Helpers/triggers'), Globals::$conf->modules_parts['triggers']);

         foreach ($dirtriggers as $reldir) {

             //$dir = DolUtils::dol_buildpath($reldir, 0);

             //$newdir = DolUtils::dol_osencode($dir);

@@ -99,7 +99,7 @@ 
             $handle = opendir($newdir);

             if (is_resource($handle)) {

                 while (($file = readdir($handle)) !== false) {

-                    if (is_readable($newdir . "/" . $file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {

+                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {

                         $part1 = $reg[1];

                         $part2 = $reg[2];

                         $part3 = $reg[3];

@@ -113,7 +113,7 @@ 
                         $qualified = true;

                         if (strtolower($reg[2]) != 'all') {

                             $module = preg_replace('/^mod/i', '', $reg[2]);

-                            $constparam = 'MAIN_MODULE_' . strtoupper($module);

+                            $constparam = 'MAIN_MODULE_'.strtoupper($module);

                             if (empty(Globals::$conf->global->$constparam))

                                 $qualified = false;

                         }

@@ -123,26 +123,26 @@ 
                             continue;

                         }

 

-                        $modName = "Interface" . ucfirst($reg[3]);

+                        $modName = "Interface".ucfirst($reg[3]);

                         //print "file=$file - modName=$modName\n";

                         if (in_array($modName, $modules)) {    // $modules = list of modName already loaded

                             $langs->load("errors");

-                            DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " " . $langs->trans("ErrorDuplicateTrigger", $newdir . "/" . $file, $fullpathfiles[$modName]), LOG_WARNING);

+                            DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);

                             continue;

                         }

 

                         try {

                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";

-                            include_once $newdir . '/' . $file;

+                            include_once $newdir.'/'.$file;

                             //print 'Done for '.$modName."\n";

                         } catch (Exception $e) {

-                            DolUtils::dol_syslog('ko for ' . $modName . " " . $e->getMessage() . "\n", LOG_ERR);

+                            DolUtils::dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);

                         }

 

                         $modules[$i] = $modName;

                         $files[$i] = $file;

-                        $fullpathfiles[$modName] = $newdir . '/' . $file;

-                        $orders[$i] = $part1 . '_' . $part2 . '_' . $part3;   // Set sort criteria value

+                        $fullpathfiles[$modName] = $newdir.'/'.$file;

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

 

                         $i++;

                     }

@@ -166,10 +166,10 @@ 
                     //DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);

                     $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);

                 } elseif (method_exists($objMod, 'run_trigger')) { // Deprecated method

-                    DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Launch old method run_trigger (rename your trigger into runTrigger) for file '" . $files[$key] . "'", LOG_WARNING);

+                    DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);

                     $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);

                 } else {

-                    DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " A trigger was declared for class " . get_class($objMod) . " but method runTrigger was not found", LOG_ERR);

+                    DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);

                 }

 

                 if ($result > 0) {

@@ -194,12 +194,12 @@ 
                 }

             }

             else {

-                DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Failed to instantiate trigger for file '" . $files[$key] . "'", LOG_ERR);

+                DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);

             }

         }

 

         if ($nbko) {

-            DolUtils::dol_syslog(get_class($this) . "::run_triggers action=" . $action . " Files found: " . $nbfile . ", Files launched: " . $nbtotal . ", Done: " . $nbok . ", Failed: " . $nbko . " - Nb of error string returned in this->errors = " . count($this->errors), LOG_ERR);

+            DolUtils::dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);

             return -$nbko;

         } else {

             //DolUtils::dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);

@@ -245,7 +245,7 @@ 
             $handle = opendir($newdir);

             if (is_resource($handle)) {

                 while (($file = readdir($handle)) !== false) {

-                    if (is_readable($newdir . '/' . $file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {

+                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {

                         if (preg_match('/\.back$/', $file))

                             continue;

 

@@ -253,21 +253,21 @@ 
                         $part2 = $reg[2];

                         $part3 = $reg[3];

 

-                        $modName = 'Interface' . ucfirst($reg[3]);

+                        $modName = 'Interface'.ucfirst($reg[3]);

                         //print "file=$file"; print "modName=$modName"; exit;

                         if (in_array($modName, $modules)) {

                             $langs->load("errors");

-                            print '<div class="error">' . $langs->trans("Error") . ' : ' . $langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/") . '</div>';

+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';

                         } else {

-                            include_once $newdir . '/' . $file;

+                            include_once $newdir.'/'.$file;

                         }

 

                         $files[$i] = $file;

-                        $fullpath[$i] = $dir . '/' . $file;

-                        $relpath[$i] = preg_replace('/^\//', '', $reldir) . '/' . $file;

+                        $fullpath[$i] = $dir.'/'.$file;

+                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;

                         $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');

                         $modules[$i] = $modName;

-                        $orders[$i] = $part1 . '_' . $part2 . '_' . $part3;   // Set sort criteria value

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

 

                         $i++;

                     }

@@ -288,7 +288,7 @@ 
                 continue;

 

             if (!class_exists($modName)) {

-                print 'Error: A trigger file was found but its class "' . $modName . '" was not found.' . "<br>\n";

+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";

                 continue;

             }

 

@@ -305,7 +305,7 @@ 
             // Check if trigger file is for a particular module

             if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg)) {

                 $module = preg_replace('/^mod/i', '', $reg[2]);

-                $constparam = 'MAIN_MODULE_' . strtoupper($module);

+                $constparam = 'MAIN_MODULE_'.strtoupper($module);

                 if (strtolower($module) == 'all')

                     $disabledbymodule = 0;

                 else if (empty(Globals::$conf->global->$constparam))

@@ -324,21 +324,21 @@ 
             if ($disabledbyname > 0 || $disabledbymodule > 1)

                 $triggers[$j]['status'] = '';

 

-            $text = '<b>' . $langs->trans("Description") . ':</b><br>';

-            $text .= $objMod->getDesc() . '<br>';

-            $text .= '<br><b>' . $langs->trans("Status") . ':</b><br>';

+            $text = '<b>'.$langs->trans("Description").':</b><br>';

+            $text .= $objMod->getDesc().'<br>';

+            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';

             if ($disabledbyname == 1) {

-                $text .= $langs->trans("TriggerDisabledByName") . '<br>';

+                $text .= $langs->trans("TriggerDisabledByName").'<br>';

                 if ($disabledbymodule == 2)

-                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module) . '<br>';

+                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

             }

             else {

                 if ($disabledbymodule == 0)

-                    $text .= $langs->trans("TriggerAlwaysActive") . '<br>';

+                    $text .= $langs->trans("TriggerAlwaysActive").'<br>';

                 if ($disabledbymodule == 1)

-                    $text .= $langs->trans("TriggerActiveAsModuleActive", $module) . '<br>';

+                    $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';

                 if ($disabledbymodule == 2)

-                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module) . '<br>';

+                    $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

             }

 

             $triggers[$j]['info'] = $text;

Base/Form.php

Spacing +898 added lines, -898 removed lines

@@ -112,13 +112,13 @@ 
         if (!empty(Globals::$conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata)) {

             if (!empty($perm)) {

                 $tmp = explode(':', $typeofdata);

-                $ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

+                $ret .= '<div class="editkey_'.$tmp[0].(!empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';

                 if ($fieldrequired)

                     $ret .= '<span class="fieldrequired">';

                 $ret .= $langs->trans($text);

                 if ($fieldrequired)

                     $ret .= '</span>';

-                $ret .= '</div>' . "\n";

+                $ret .= '</div>'."\n";

             }

             else {

                 if ($fieldrequired)

@@ -129,7 +129,7 @@ 
             }

         }

         else {

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

                 $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';

             }

             if ($fieldrequired) {

@@ -142,14 +142,14 @@ 
             if (!empty($notabletag)) {

                 $ret .= ' ';

             }

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

                 $ret .= '</td>';

             }

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

                 $ret .= '<td align="right">';

             }

-            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

-                $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';

+            if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

+                $ret .= '<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';

             }

             if (!empty($notabletag) && $notabletag == 1) {

                 $ret .= ' : ';

@@ -157,10 +157,10 @@ 
             if (!empty($notabletag) && $notabletag == 3) {

                 $ret .= ' ';

             }

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

                 $ret .= '</td>';

             }

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {

                 $ret .= '</tr></table>';

             }

         }

@@ -200,41 +200,41 @@ 
         if (!empty(Globals::$conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker

             $ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);

         } else {

-            if (GETPOST('action', 'aZ09') == 'edit' . $htmlname) {

+            if (GETPOST('action', 'aZ09') == 'edit'.$htmlname) {

                 $ret .= "\n";

-                $ret .= '<form method="post" action="' . $_SERVER["PHP_SELF"] . ($moreparam ? '?' . $moreparam : '') . '">';

-                $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

-                $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-                $ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

+                $ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';

+                $ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

+                $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+                $ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';

                 if (empty($notabletag))

                     $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

                 if (empty($notabletag))

                     $ret .= '<tr><td>';

                 if (preg_match('/^(string|email)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

-                    $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

+                    $ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

                 } else if (preg_match('/^(numeric|amount)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $valuetoshow = price2num($editvalue ? $editvalue : $value);

-                    $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($valuetoshow != '' ? price($valuetoshow) : '') . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

+                    $ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ? price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

                 } else if (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $cols = $tmp[2];

                     $morealt = '';

                     if (preg_match('/%/', $cols)) {

-                        $morealt = ' style="width: ' . $cols . '"';

+                        $morealt = ' style="width: '.$cols.'"';

                         $cols = '';

                     }

 

                     $valuetoshow = ($editvalue ? $editvalue : $value);

 

-                    $ret .= '<textarea id="' . $htmlname . '" name="' . $htmlname . '" wrap="soft" rows="' . ($tmp[1] ? $tmp[1] : '20') . '"' . ($cols ? ' cols="' . $cols . '"' : 'class="quatrevingtpercent"') . $morealt . '">';

+                    $ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'">';

                     $ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));

                     $ret .= '</textarea>';

                 } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') {

-                    $ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form' . $htmlname, 1, 0);

+                    $ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);

                 } else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {

-                    $ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form' . $htmlname, 1, 0);

+                    $ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);

                 } else if (preg_match('/^select;/', $typeofdata)) {

                     $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));

                     foreach ($arraydata as $val) {

@@ -243,8 +243,8 @@ 
                     }

                     $ret .= $this->selectarray($htmlname, $arraylist, $value);

                 } else if (preg_match('/^ckeditor/', $typeofdata)) {

-                    $tmp = explode(':', $typeofdata);  // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols

-                    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+                    $tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols

+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

                     $doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), true, true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

                     $ret .= $doleditor->Create(1);

                 }

@@ -254,16 +254,16 @@ 
                 if (empty($notabletag))

                     $ret .= '<td align="left">';

                 //else $ret.='<div class="clearboth"></div>';

-                $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

+                $ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';

                 if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag))

-                    $ret .= '<br>' . "\n";

-                $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

+                    $ret .= '<br>'."\n";

+                $ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';

                 if (empty($notabletag))

                     $ret .= '</td>';

 

                 if (empty($notabletag))

-                    $ret .= '</tr></table>' . "\n";

-                $ret .= '</form>' . "\n";

+                    $ret .= '</tr></table>'."\n";

+                $ret .= '</form>'."\n";

             }

             else {

                 if (preg_match('/^(email)/', $typeofdata))

@@ -288,7 +288,7 @@ 
                     if (!empty(Globals::$conf->global->MAIN_DISABLE_NOTES_TAB)) {

                         $firstline = preg_replace('/<br>.*/', '', $tmpcontent);

                         $firstline = preg_replace('/[\n\r].*/', '', $firstline);

-                        $tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

+                        $tmpcontent = $firstline.((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

                     }

                     $ret .= $tmpcontent;

                 } else

@@ -356,7 +356,7 @@ 
                     $inputOption = $tmp[1];

                 if (!empty($tmp[2]))

                     $savemethod = $tmp[2];

-                $out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

+                $out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";

             }

             else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

                 $tmp = explode(':', $inputType);

@@ -366,7 +366,7 @@ 
                 if (!empty($tmp[2]))

                     $savemethod = $tmp[2];

 

-                $out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

+                $out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format

             }

             else if (preg_match('/^(select|autocomplete)/', $inputType)) {

                 $tmp = explode(':', $inputType);

@@ -394,35 +394,35 @@ 
                     $savemethod = $tmp[4];

 

                 if (!empty(Globals::$conf->fckeditor->enabled)) {

-                    $out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

+                    $out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";

                 } else {

                     $inputType = 'textarea';

                 }

             }

 

-            $out .= '<input id="element_' . $htmlname . '" value="' . $element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

+            $out .= '<input id="element_'.$htmlname.'" value="'.$element.'" type="hidden"/>'."\n";

+            $out .= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";

+            $out .= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";

+            $out .= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";

             if (!empty($savemethod))

-                $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

+                $out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";

             if (!empty($ext_element))

-                $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

+                $out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";

             if (!empty($custommsg)) {

                 if (is_array($custommsg)) {

                     if (!empty($custommsg['success']))

-                        $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

+                        $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";

                     if (!empty($custommsg['error']))

-                        $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

+                        $out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";

                 } else

-                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

+                    $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";

             }

             if ($inputType == 'textarea') {

-                $out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

-                $out .= '<input id="textarea_' . $htmlname . '_cols" value="' . $cols . '" type="hidden"/>' . "\n";

+                $out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";

+                $out .= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";

             }

-            $out .= '<span id="viewval_' . $htmlname . '" class="viewval_' . $inputType . ($button_only ? ' inactive' : ' active') . '">' . $value . '</span>' . "\n";

-            $out .= '<span id="editval_' . $htmlname . '" class="editval_' . $inputType . ($button_only ? ' inactive' : ' active') . ' hideobject">' . (!empty($editvalue) ? $editvalue : $value) . '</span>' . "\n";

+            $out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";

+            $out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";

         } else {

             $out = $value;

         }

@@ -454,7 +454,7 @@ 
         global $conf;

 

         if ($incbefore) {

-            $text = $incbefore . $text;

+            $text = $incbefore.$text;

         }

         if (!$htmltext) {

             return $text;

@@ -474,11 +474,11 @@ 
 

         $extrastyle = '';

         if ($direction < 0) {

-            $extracss = ($extracss ? $extracss . ' ' : '') . 'inline-block';

+            $extracss = ($extracss ? $extracss.' ' : '').'inline-block';

             $extrastyle = 'padding: 0px; padding-left: 3px !important;';

         }

         if ($direction > 0) {

-            $extracss = ($extracss ? $extracss . ' ' : '') . 'inline-block';

+            $extracss = ($extracss ? $extracss.' ' : '').'inline-block';

             $extrastyle = 'padding: 0px; padding-right: 3px !important;';

         }

 

@@ -491,53 +491,53 @@ 
             $htmltext = str_replace('"', "&quot;", $htmltext);

         } else {

             $classfortooltip = 'classfortooltiponclick';

-            $textfordialog .= '<div style="display: none;" id="idfortooltiponclick_' . $tooltiptrigger . '" class="classfortooltiponclicktext">' . $htmltext . '</div>';

+            $textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';

         }

         if ($tooltipon == 2 || $tooltipon == 3) {

-            $paramfortooltipimg = ' class="' . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';

+            $paramfortooltipimg = ' class="'.$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';

             if ($tooltiptrigger == '') {

-                $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : DolUtils::dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip

+                $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : DolUtils::dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip

             } else {

-                $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';

+                $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';

             }

         } else {

-            $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

         }

         if ($tooltipon == 1 || $tooltipon == 3) {

-            $paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';

+            $paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';

             if ($tooltiptrigger == '') {

-                $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : DolUtils::dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip

+                $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : DolUtils::dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip

             } else {

-                $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';

+                $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';

             }

         } else {

-            $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

         }

         if (empty($notabs)) {

             $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';

         } elseif ($notabs == 2) {

-            $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';

+            $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';

         }

         // Define value if value is before

         if ($direction < 0) {

-            $s .= '<' . $tag . $paramfortooltipimg;

+            $s .= '<'.$tag.$paramfortooltipimg;

             if ($tag == 'td') {

                 $s .= ' valign="top" width="14"';

             }

-            $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

+            $s .= '>'.$textfordialog.$img.'</'.$tag.'>';

         }

         // Use another method to help avoid having a space in value in order to use this value with jquery

         // Define label

         if ((string) $text != '') {

-            $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';

+            $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';

         }

         // Define value if value is after

         if ($direction > 0) {

-            $s .= '<' . $tag . $paramfortooltipimg;

+            $s .= '<'.$tag.$paramfortooltipimg;

             if ($tag == 'td') {

                 $s .= ' valign="middle" width="14"';

             }

-            $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

+            $s .= '>'.$textfordialog.$img.'</'.$tag.'>';

         }

         if (empty($notabs)) {

             $s .= '</tr></table>';

@@ -630,15 +630,15 @@ 
 

         $disabled = 0;

         $ret = '<div class="centpercent center">';

-        $ret .= '<select class="flat' . (empty(Globals::$conf->use_javascript_ajax) ? '' : ' hideobject') . ' massaction massactionselect" name="massaction"' . ($disabled ? ' disabled="disabled"' : '') . '>';

+        $ret .= '<select class="flat'.(empty(Globals::$conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionselect" name="massaction"'.($disabled ? ' disabled="disabled"' : '').'>';

 

         // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters); // Note that $action and $object may have been modified by hook

         if (empty($reshook)) {

-            $ret .= '<option value="0"' . ($disabled ? ' disabled="disabled"' : '') . '>-- ' . $langs->trans("SelectAction") . ' --</option>';

+            $ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';

             foreach ($arrayofaction as $code => $label) {

-                $ret .= '<option value="' . $code . '"' . ($disabled ? ' disabled="disabled"' : '') . '>' . $label . '</option>';

+                $ret .= '<option value="'.$code.'"'.($disabled ? ' disabled="disabled"' : '').'>'.$label.'</option>';

             }

         }

         $ret .= $hookmanager->resPrint;

@@ -646,7 +646,7 @@ 
         $ret .= '</select>';

         // Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button

         $ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.

-        $ret .= '<input type="submit" disabled name="confirmmassaction" class="button' . (empty(Globals::$conf->use_javascript_ajax) ? '' : ' hideobject') . ' massaction massactionconfirmed" value="' . DolUtils::dol_escape_htmltag($langs->trans("Confirm")) . '">';

+        $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty(Globals::$conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionconfirmed" value="'.DolUtils::dol_escape_htmltag($langs->trans("Confirm")).'">';

         $ret .= '</div>';

 

         if (!empty(Globals::$conf->use_javascript_ajax)) {

@@ -660,11 +660,11 @@ 
     	  				if ($(this).is(\':checked\')) atleastoneselected++;

     	  			});

 					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);

-    	  			if (atleastoneselected || ' . $alwaysvisible . ')

+    	  			if (atleastoneselected || ' . $alwaysvisible.')

     	  			{

     	  				jQuery(".massaction").show();

-        			    ' . ($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("' . $selected . '"); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '') . '

-        			    ' . ($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0"); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '') . '

+        			    ' . ($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'"); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'

+        			    ' . ($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0"); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'

     	  			}

     	  			else

     	  			{

@@ -733,14 +733,14 @@ 
         $atleastonefavorite = 0;

 

         $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_country";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country";

         $sql .= " WHERE active > 0";

         //$sql.= " ORDER BY code ASC";

 

-        dol_syslog(get_class($this) . "::select_country", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_country", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            $out .= '<select id="select' . $htmlname . '" class="flat maxwidth200onsmartphone selectcountry' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" ' . $htmloption . '>';

+            $out .= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" '.$htmloption.'>';

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -751,7 +751,7 @@ 
                     $countryArray[$i]['rowid'] = $obj->rowid;

                     $countryArray[$i]['code_iso'] = $obj->code_iso;

                     $countryArray[$i]['code_iso3'] = $obj->code_iso3;

-                    $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

+                    $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

                     $countryArray[$i]['favorite'] = $obj->favorite;

                     $favorite[$i] = $obj->favorite;

                     $label[$i] = dol_string_unaccent($countryArray[$i]['label']);

@@ -764,16 +764,16 @@ 
                     $countryArray = dol_sort_array($countryArray, 'label');

 

                 if ($showempty) {

-                    $out .= '<option value="">&nbsp;</option>' . "\n";

+                    $out .= '<option value="">&nbsp;</option>'."\n";

                 }

 

                 if ($addspecialentries) { // Add dedicated entries for groups of countries

                     //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

-                    $out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-                    $out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

+                    $out .= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+                    $out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';

                     if ($mysoc->isInEEC())

-                        $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-                    $out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

+                        $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+                    $out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';

                     $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                 }

 

@@ -791,16 +791,16 @@ 
                     }

                     if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {

                         $foundselected = true;

-                        $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '" selected>';

+                        $out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';

                     } else {

-                        $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '">';

+                        $out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';

                     }

                     if ($row['label'])

                         $out .= dol_trunc($row['label'], $maxlength, 'middle');

                     else

                         $out .= '&nbsp;';

                     if ($row['code_iso'])

-                        $out .= ' (' . $row['code_iso'] . ')';

+                        $out .= ' ('.$row['code_iso'].')';

                     $out .= '</option>';

                 }

             }

@@ -811,8 +811,8 @@ 
         }

 

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-        $out .= ajax_combobox('select' . $htmlname);

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+        $out .= ajax_combobox('select'.$htmlname);

 

         return $out;

     }

@@ -841,25 +841,25 @@ 
         $incotermArray = array();

 

         $sql = "SELECT rowid, code";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_incoterms";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_incoterms";

         $sql .= " WHERE active > 0";

         $sql .= " ORDER BY code ASC";

 

-        dol_syslog(get_class($this) . "::select_incoterm", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             if (Globals::$conf->use_javascript_ajax && !$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events);

             }

 

             if (!empty($page)) {

-                $out .= '<form method="post" action="' . $page . '">';

+                $out .= '<form method="post" action="'.$page.'">';

                 $out .= '<input type="hidden" name="action" value="set_incoterms">';

-                $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+                $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             }

 

-            $out .= '<select id="' . $htmlname . '" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="' . $htmlname . '" ' . $htmloption . '>';

+            $out .= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';

             $out .= '<option value="0">&nbsp;</option>';

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -875,9 +875,9 @@ 
 

                 foreach ($incotermArray as $row) {

                     if ($selected && ($selected == $row['rowid'] || $selected == $row['code'])) {

-                        $out .= '<option value="' . $row['rowid'] . '" selected>';

+                        $out .= '<option value="'.$row['rowid'].'" selected>';

                     } else {

-                        $out .= '<option value="' . $row['rowid'] . '">';

+                        $out .= '<option value="'.$row['rowid'].'">';

                     }

 

                     if ($row['code'])

@@ -888,10 +888,10 @@ 
             }

             $out .= '</select>';

 

-            $out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="' . $location_incoterms . '">';

+            $out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';

 

             if (!empty($page)) {

-                $out .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '"></form>';

+                $out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';

             }

         } else {

             DolUtils::dol_print_error($this->db);

@@ -920,8 +920,8 @@ 
         // If product & services are enabled or both disabled.

         if ($forceall == 1 || (empty($forceall) && !empty(Globals::$conf->product->enabled) && !empty(Globals::$conf->service->enabled)) || (empty($forceall) && empty(Globals::$conf->product->enabled) && empty(Globals::$conf->service->enabled))) {

             if (empty($hidetext))

-                print $langs->trans("Type") . ': ';

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+                print $langs->trans("Type").': ';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($showempty) {

                 print '<option value="-1"';

                 if ($selected == -1)

@@ -932,26 +932,26 @@ 
             print '<option value="0"';

             if (0 == $selected)

                 print ' selected';

-            print '>' . $langs->trans("Product");

+            print '>'.$langs->trans("Product");

 

             print '<option value="1"';

             if (1 == $selected)

                 print ' selected';

-            print '>' . $langs->trans("Service");

+            print '>'.$langs->trans("Service");

 

             print '</select>';

             //if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

         }

         if ((empty($forceall) && empty(Globals::$conf->product->enabled) && !empty(Globals::$conf->service->enabled)) || $forceall == 3) {

             print $langs->trans("Service");

-            print '<input type="hidden" name="' . $htmlname . '" value="1">';

+            print '<input type="hidden" name="'.$htmlname.'" value="1">';

         }

         if ((empty($forceall) && !empty(Globals::$conf->product->enabled) && empty(Globals::$conf->service->enabled)) || $forceall == 2) {

             print $langs->trans("Product");

-            print '<input type="hidden" name="' . $htmlname . '" value="0">';

+            print '<input type="hidden" name="'.$htmlname.'" value="0">';

         }

         if ($forceall < 0) { // This should happened only for contracts when both predefined product and service are disabled.

-            print '<input type="hidden" name="' . $htmlname . '" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

+            print '<input type="hidden" name="'.$htmlname.'" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

         }

     }

 

@@ -968,14 +968,14 @@ 
 

         $num = count($this->cache_types_fees);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $langs->load("trips");

 

         $sql = "SELECT c.code, c.label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_fees as c";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -1015,11 +1015,11 @@ 
         // phpcs:enable

         global $user, $langs;

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

         $this->load_cache_types_fees();

 

-        print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

+        print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';

         if ($showempty) {

             print '<option value="-1"';

             if ($selected == -1)

@@ -1028,7 +1028,7 @@ 
         }

 

         foreach ($this->cache_types_fees as $key => $value) {

-            print '<option value="' . $key . '"';

+            print '<option value="'.$key.'"';

             if ($key == $selected)

                 print ' selected';

             print '>';

@@ -1091,25 +1091,25 @@ 
             // No immediate load of all database

             $placeholder = '';

             if ($selected && empty($selected_input_value)) {

-                require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

                 $societetmp = new Societe($this->db);

                 $societetmp->fetch($selected);

                 $selected_input_value = $societetmp->name;

                 unset($societetmp);

             }

             // mode 1

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&filter=' . $filter . ($showtype ? '&showtype=' . $showtype : '');

-            $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, Globals::$conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype ? '&showtype='.$showtype : '');

+            $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, Globals::$conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

             if (empty($hidelabel))

-                print $langs->trans("RefOrLabel") . ' : ';

+                print $langs->trans("RefOrLabel").' : ';

             else if ($hidelabel > 1) {

-                $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

+                $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

                 if ($hidelabel == 2) {

                     $out .= img_picto($langs->trans("Search"), 'search');

                 }

             }

-            $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (!empty(Globals::$conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';

+            $out .= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty(Globals::$conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

             if ($hidelabel == 3) {

                 $out .= img_picto($langs->trans("Search"), 'search');

             }

@@ -1170,20 +1170,20 @@ 
             $sql .= " , dictp.code as country_code";

         }

 

-        $sql .= " FROM (" . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM (".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         $sql .= " )";

         if (Globals::$conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

-            $sql .= " LEFT OUTER JOIN " . MAIN_DB_PREFIX . "c_country as dictp ON dictp.rowid=s.fk_pays";

+            $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";

         }

-        $sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";

         if (!empty($user->socid))

-            $sql .= " AND s.rowid = " . $user->socid;

+            $sql .= " AND s.rowid = ".$user->socid;

         if ($filter)

-            $sql .= " AND (" . $filter . ")";

+            $sql .= " AND (".$filter.")";

         if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

         if (!empty(Globals::$conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX))

             $sql .= " AND s.status <> 0";

         // Add criteria

@@ -1198,31 +1198,31 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

+                $sql .= "(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty(Globals::$conf->barcode->enabled)) {

-                $sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             }

-            $sql .= " OR s.code_client LIKE '" . $this->db->escape($prefix . $filterkey) . "%' OR s.code_fournisseur LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+            $sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             $sql .= ")";

         }

         $sql .= $this->db->order("nom", "ASC");

         $sql .= $this->db->plimit($limit, 0);

 

         // Build output string

-        dol_syslog(get_class($this) . "::select_thirdparty_list", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events, Globals::$conf->global->COMPANY_USE_SEARCH_TO_SELECT);

             }

 

             // Construct $out and $outarray

-            $out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparam ? ' ' . $moreparam : '') . ' name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . '>' . "\n";

+            $out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";

 

             $textifempty = '';

             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

@@ -1234,7 +1234,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+                $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -1244,18 +1244,18 @@ 
                     $label = '';

                     if (Globals::$conf->global->SOCIETE_ADD_REF_IN_LIST) {

                         if (($obj->client) && (!empty($obj->code_client))) {

-                            $label = $obj->code_client . ' - ';

+                            $label = $obj->code_client.' - ';

                         }

                         if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {

-                            $label .= $obj->code_fournisseur . ' - ';

+                            $label .= $obj->code_fournisseur.' - ';

                         }

-                        $label .= ' ' . $obj->name;

+                        $label .= ' '.$obj->name;

                     } else {

                         $label = $obj->name;

                     }

 

                     if (!empty($obj->name_alias)) {

-                        $label .= ' (' . $obj->name_alias . ')';

+                        $label .= ' ('.$obj->name_alias.')';

                     }

 

                     if ($showtype) {

@@ -1264,25 +1264,25 @@ 
                         if ($obj->client == 1 || $obj->client == 3)

                             $label .= $langs->trans("Customer");

                         if ($obj->client == 2 || $obj->client == 3)

-                            $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

+                            $label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");

                         if ($obj->fournisseur)

-                            $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

+                            $label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");

                         if ($obj->client || $obj->fournisseur)

                             $label .= ')';

                     }

 

                     if (Globals::$conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

-                        $label .= '-' . $obj->address . '-' . $obj->zip . ' ' . $obj->town;

+                        $label .= '-'.$obj->address.'-'.$obj->zip.' '.$obj->town;

                         if (!empty($obj->country_code)) {

-                            $label .= ' ' . $langs->trans('Country' . $obj->country_code);

+                            $label .= ' '.$langs->trans('Country'.$obj->country_code);

                         }

                     }

 

                     if (empty($outputmode)) {

                         if (in_array($obj->rowid, $selected)) {

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

                         } else {

-                            $out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

                         }

                     } else {

                         array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label));

@@ -1293,7 +1293,7 @@ 
                         $out .= "\n";

                 }

             }

-            $out .= '</select>' . "\n";

+            $out .= '</select>'."\n";

         }

         else {

             DolUtils::dol_print_error($this->db);

@@ -1325,17 +1325,17 @@ 
         // On recherche les remises

         $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";

         $sql .= " re.description, re.fk_facture_source";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";

-        $sql .= " WHERE re.fk_soc = " . (int) $socid;

-        $sql .= " AND re.entity = " . Globals::$conf->entity;

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";

+        $sql .= " WHERE re.fk_soc = ".(int) $socid;

+        $sql .= " AND re.entity = ".Globals::$conf->entity;

         if ($filter)

-            $sql .= " AND " . $filter;

+            $sql .= " AND ".$filter;

         $sql .= " ORDER BY re.description ASC";

 

-        dol_syslog(get_class($this) . "::select_remises", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            print '<select id="select_' . $htmlname . '" class="flat maxwidthonsmartphone" name="' . $htmlname . '">';

+            print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';

             $num = $this->db->num_rows($resql);

 

             $qualifiedlines = $num;

@@ -1368,10 +1368,10 @@ 
                     if (!empty(Globals::$conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {

                         $tmpfac = new Facture($this->db);

                         if ($tmpfac->fetch($obj->fk_facture_source) > 0)

-                            $desc = $desc . ' - ' . $tmpfac->ref;

+                            $desc = $desc.' - '.$tmpfac->ref;

                     }

 

-                    print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

+                    print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';

                     $i++;

                 }

             }

@@ -1451,7 +1451,7 @@ 
         $out = '';

 

         if (!is_object($hookmanager)) {

-            include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

             $hookmanager = new HookManager($this->db);

         }

 

@@ -1459,36 +1459,36 @@ 
         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

         if ($showsoc > 0)

             $sql .= " , s.nom as company";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp";

+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";

         if ($showsoc > 0)

-            $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";

-        $sql .= " WHERE sp.entity IN (" . getEntity('socpeople') . ")";

+            $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";

+        $sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";

         if ($socid > 0 || $socid == -1)

-            $sql .= " AND sp.fk_soc=" . $socid;

+            $sql .= " AND sp.fk_soc=".$socid;

         if (!empty(Globals::$conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX))

             $sql .= " AND sp.statut <> 0";

         $sql .= " ORDER BY sp.lastname ASC";

 

-        dol_syslog(get_class($this) . "::select_contacts", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $num = $this->db->num_rows($resql);

 

             if (Globals::$conf->use_javascript_ajax && !$forcecombo && !$options_only) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlid, $events, Globals::$conf->global->CONTACT_USE_SEARCH_TO_SELECT);

             }

 

             if ($htmlname != 'none' || $options_only)

-                $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

+                $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';

             if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

+                $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';

             if ($showempty == 2)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';

+                $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>'.$langs->trans("Internal").'</option>';

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

-                include_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

                 $contactstatic = new Contact($this->db);

 

                 while ($i < $num) {

@@ -1505,27 +1505,27 @@ 
                             if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto))

                                 $disabled = 1;

                             if (!empty($selected) && in_array($obj->rowid, $selected)) {

-                                $out .= '<option value="' . $obj->rowid . '"';

+                                $out .= '<option value="'.$obj->rowid.'"';

                                 if ($disabled)

                                     $out .= ' disabled';

                                 $out .= ' selected>';

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                                 $out .= '</option>';

                             }

                             else {

-                                $out .= '<option value="' . $obj->rowid . '"';

+                                $out .= '<option value="'.$obj->rowid.'"';

                                 if ($disabled)

                                     $out .= ' disabled';

                                 $out .= '>';

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                                 $out .= '</option>';

                             }

                         }

@@ -1533,9 +1533,9 @@ 
                             if (in_array($obj->rowid, $selected)) {

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                             }

                         }

                     }

@@ -1543,7 +1543,7 @@ 
                 }

             }

             else {

-                $out .= '<option value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled>';

+                $out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';

                 $out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

                 $out .= '</option>';

             }

@@ -1557,7 +1557,7 @@ 
                 'showsoc' => $showsoc,

             );

 

-            $reshook = $hookmanager->executeHooks('afterSelectContactOptions', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+            $reshook = $hookmanager->executeHooks('afterSelectContactOptions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 

             if ($htmlname != 'none' || $options_only) {

                 $out .= '</select>';

@@ -1656,33 +1656,33 @@ 
         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= ", e.label";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=u.entity";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";

             if ($force_entity)

-                $sql .= " WHERE u.entity IN (0," . $force_entity . ")";

+                $sql .= " WHERE u.entity IN (0,".$force_entity.")";

             else

                 $sql .= " WHERE u.entity IS NOT NULL";

         }

         else {

             if (!empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ug";

+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";

                 $sql .= " ON ug.fk_user = u.rowid";

-                $sql .= " WHERE ug.entity = " . Globals::$conf->entity;

+                $sql .= " WHERE ug.entity = ".Globals::$conf->entity;

             } else {

-                $sql .= " WHERE u.entity IN (0," . Globals::$conf->entity . ")";

+                $sql .= " WHERE u.entity IN (0,".Globals::$conf->entity.")";

             }

         }

         if (!empty($user->societe_id))

-            $sql .= " AND u.fk_soc = " . $user->societe_id;

+            $sql .= " AND u.fk_soc = ".$user->societe_id;

         if (is_array($exclude) && $excludeUsers)

-            $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";

+            $sql .= " AND u.rowid NOT IN (".$excludeUsers.")";

         if ($includeUsers)

-            $sql .= " AND u.rowid IN (" . $includeUsers . ")";

+            $sql .= " AND u.rowid IN (".$includeUsers.")";

         if (!empty(Globals::$conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive)

             $sql .= " AND u.statut <> 0";

         if (!empty($morefilter))

-            $sql .= " " . $morefilter;

+            $sql .= " ".$morefilter;

 

         if (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

             $sql .= " ORDER BY u.firstname ASC";

@@ -1690,22 +1690,22 @@ 
             $sql .= " ORDER BY u.lastname ASC";

         }

 

-        dol_syslog(get_class($this) . "::select_dolusers", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

                 // Enhance with select2

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname);

 

                 // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined

-                $out .= '<select class="flat' . ($morecss ? ' minwidth100 ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

+                $out .= '<select class="flat'.($morecss ? ' minwidth100 '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

                 if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                    $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";

                 if ($show_every)

-                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

+                    $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";

 

                 $userstatic = new User($this->db);

 

@@ -1720,14 +1720,14 @@ 
                     if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

                         $disableline = ($enableonlytext ? $enableonlytext : '1');

 

-                    if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected) )) {

-                        $out .= '<option value="' . $obj->rowid . '"';

+                    if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {

+                        $out .= '<option value="'.$obj->rowid.'"';

                         if ($disableline)

                             $out .= ' disabled';

                         $out .= ' selected>';

                     }

                     else {

-                        $out .= '<option value="' . $obj->rowid . '"';

+                        $out .= '<option value="'.$obj->rowid.'"';

                         if ($disableline)

                             $out .= ' disabled';

                         $out .= '>';

@@ -1743,31 +1743,31 @@ 
                     // Complete name with more info

                     $moreinfo = 0;

                     if (!empty(Globals::$conf->global->MAIN_SHOW_LOGIN)) {

-                        $out .= ($moreinfo ? ' - ' : ' (') . $obj->login;

+                        $out .= ($moreinfo ? ' - ' : ' (').$obj->login;

                         $moreinfo++;

                     }

                     if ($showstatus >= 0) {

                         if ($obj->statut == 1 && $showstatus == 1) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Enabled');

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

                             $moreinfo++;

                         }

                         if ($obj->statut == 0) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Disabled');

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');

                             $moreinfo++;

                         }

                     }

                     if (!empty(Globals::$conf->multicompany->enabled) && empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

                         if (!$obj->entity) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans("AllEntities");

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");

                             $moreinfo++;

                         } else {

-                            $out .= ($moreinfo ? ' - ' : ' (') . ($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

+                            $out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

                             $moreinfo++;

                         }

                     }

                     $out .= ($moreinfo ? ')' : '');

                     if ($disableline && $disableline != '1') {

-                        $out .= ' - ' . $disableline; // This is text from $enableonlytext parameter

+                        $out .= ' - '.$disableline; // This is text from $enableonlytext parameter

                     }

                     $out .= '</option>';

                     $outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

@@ -1775,8 +1775,8 @@ 
                     $i++;

                 }

             } else {

-                $out .= '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '" disabled>';

-                $out .= '<option value="">' . $langs->trans("None") . '</option>';

+                $out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';

+                $out .= '<option value="">'.$langs->trans("None").'</option>';

             }

             $out .= '</select>';

         } else {

@@ -1827,7 +1827,7 @@ 
             $out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';

             $out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';

             $out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);

-            $out .= ' <input type="submit" class="button valignmiddle" name="' . $action . 'assignedtouser" value="' . DolUtils::dol_escape_htmltag($langs->trans("Add")) . '">';

+            $out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.DolUtils::dol_escape_htmltag($langs->trans("Add")).'">';

             $out .= '<br>';

         }

         $assignedtouser = array();

@@ -1851,16 +1851,16 @@ 
             $out .= $userstatic->getNomUrl(-1);

             if ($i == 0) {

                 $ownerid = $value['id'];

-                $out .= ' (' . $langs->trans("Owner") . ')';

+                $out .= ' ('.$langs->trans("Owner").')';

             }

             if ($nbassignetouser > 1 && $action != 'view') {

-                $out .= ' <input type="image" style="border: 0px;" src="' . img_picto($langs->trans("Remove"), 'delete', '', 0, 1) . '" value="' . $userstatic->id . '" class="removedassigned" id="removedassigned_' . $userstatic->id . '" name="removedassigned_' . $userstatic->id . '">';

+                $out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';

             }

             // Show my availability

             if ($showproperties) {

                 if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {

                     $out .= '<div class="myavailability inline-block">';

-                    $out .= '&nbsp;-&nbsp;<span class="opacitymedium">' . $langs->trans("Availability") . ':</span>  <input id="transparency" class="marginleftonly marginrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofuserid[$ownerid]['transparency'] ? ' checked' : '') . '>' . $langs->trans("Busy");

+                    $out .= '&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'>'.$langs->trans("Busy");

                     $out .= '</div>';

                 }

             }

@@ -1914,19 +1914,19 @@ 
             $placeholder = '';

 

             if ($selected && empty($selected_input_value)) {

-                require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

                 $producttmpselect = new Product($this->db);

                 $producttmpselect->fetch($selected);

                 $selected_input_value = $producttmpselect->ref;

                 unset($producttmpselect);

             }

             // mode=1 means customers products

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=1&status=' . $status . '&finished=' . $finished . '&hidepriceinlabel=' . $hidepriceinlabel . '&warehousestatus=' . $warehouseStatus;

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;

             //Price by customer

             if (!empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

-                $urloption .= '&socid=' . $socid;

+                $urloption .= '&socid='.$socid;

             }

-            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

 

             if (!empty(Globals::$conf->variants->enabled)) {

 

@@ -2003,14 +2003,14 @@ 
                                 <?php

                             }

                             if (empty($hidelabel))

-                                print $langs->trans("RefOrLabel") . ' : ';

+                                print $langs->trans("RefOrLabel").' : ';

                             else if ($hidelabel > 1) {

-                                $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

+                                $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

                                 if ($hidelabel == 2) {

                                     print img_picto($langs->trans("Search"), 'search');

                                 }

                             }

-                            print '<input type="text" class="minwidth100" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (!empty(Globals::$conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';

+                            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty(Globals::$conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

                             if ($hidelabel == 3) {

                                 print img_picto($langs->trans("Search"), 'search');

                             }

@@ -2053,7 +2053,7 @@ 
 

         $warehouseStatusArray = array();

         if (!empty($warehouseStatus)) {

-            require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

             if (preg_match('/warehouseclosed/', $warehouseStatus)) {

                 $warehouseStatusArray[] = Entrepot::STATUS_CLOSED;

             }

@@ -2069,13 +2069,13 @@ 
         (count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";

 

         $sql = "SELECT ";

-        $sql .= $selectFields . $selectFieldsGrouped;

+        $sql .= $selectFields.$selectFieldsGrouped;

 

         if (!empty(Globals::$conf->global->PRODUCT_SORT_BY_CATEGORY)) {

             //Product category

-            $sql .= ", (SELECT " . MAIN_DB_PREFIX . "categorie_product.fk_categorie

-						FROM " . MAIN_DB_PREFIX . "categorie_product

-						WHERE " . MAIN_DB_PREFIX . "categorie_product.fk_product=p.rowid

+            $sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie

+						FROM " . MAIN_DB_PREFIX."categorie_product

+						WHERE " . MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid

 						LIMIT 1

 				) AS categorie_product_id ";

         }

@@ -2094,45 +2094,45 @@ 
         }

         // Price by quantity

         if (!empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {

-            $sql .= ", (SELECT pp.rowid FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid";

+            $sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";

             if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+                $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_rowid";

-            $sql .= ", (SELECT pp.price_by_qty FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

+            $sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

             if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+                $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_by_qty";

             $selectFields .= ", price_rowid, price_by_qty";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

         if (count($warehouseStatusArray)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.fk_product = p.rowid";

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on ps.fk_entrepot = e.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";

         }

 

         // include search in supplier ref

         if (!empty(Globals::$conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

         }

 

         //Price by customer

         if (!empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

-            $sql .= " LEFT JOIN  " . MAIN_DB_PREFIX . "product_customer_price as pcp ON pcp.fk_soc=" . $socid . " AND pcp.fk_product=p.rowid";

+            $sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";

         }

         // Multilang : we add translation

         if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='" . $langs->getDefaultLang() . "'";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$langs->getDefaultLang()."'";

         }

 

         if (!empty(Globals::$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination pac ON pac.fk_product_child = p.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";

         }

 

-        $sql .= ' WHERE p.entity IN (' . getEntity('product') . ')';

+        $sql .= ' WHERE p.entity IN ('.getEntity('product').')';

         if (count($warehouseStatusArray)) {

-            $sql .= ' AND (p.fk_product_type = 1 OR e.statut IN (' . $this->db->escape(implode(',', $warehouseStatusArray)) . '))';

+            $sql .= ' AND (p.fk_product_type = 1 OR e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).'))';

         }

 

         if (!empty(Globals::$conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {

@@ -2140,17 +2140,17 @@ 
         }

 

         if ($finished == 0) {

-            $sql .= " AND p.finished = " . $finished;

+            $sql .= " AND p.finished = ".$finished;

         } elseif ($finished == 1) {

-            $sql .= " AND p.finished = " . $finished;

+            $sql .= " AND p.finished = ".$finished;

             if ($status >= 0)

-                $sql .= " AND p.tosell = " . $status;

+                $sql .= " AND p.tosell = ".$status;

         }

         elseif ($status >= 0) {

-            $sql .= " AND p.tosell = " . $status;

+            $sql .= " AND p.tosell = ".$status;

         }

         if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $filtertype;

+            $sql .= " AND p.fk_product_type=".$filtertype;

         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2163,27 +2163,27 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(p.ref LIKE '" . $db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                $sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";

                 if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

-                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";

                 if (!empty(Globals::$conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {

-                    $sql .= " OR p.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";

                     if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

-                        $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                        $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";

                 }

                 if (!empty(Globals::$conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))

-                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";

                 $sql .= ")";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty(Globals::$conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";

             $sql .= ')';

         }

         if (count($warehouseStatusArray)) {

-            $sql .= ' GROUP BY' . $selectFields;

+            $sql .= ' GROUP BY'.$selectFields;

         }

 

         //Sort by category

@@ -2198,21 +2198,21 @@ 
         $sql .= $db->plimit($limit, 0);

 

         // Build output string

-        dol_syslog(get_class($this) . "::select_produits_list search product", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

-            require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-            require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

             $num = $this->db->num_rows($result);

 

             $events = null;

 

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events, Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT);

             }

 

-            $out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

+            $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

 

             $textifempty = '';

             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

@@ -2224,7 +2224,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="0" selected>' . $textifempty . '</option>';

+                $out .= '<option value="0" selected>'.$textifempty.'</option>';

 

             $i = 0;

             while ($num && $i < $num) {

@@ -2234,11 +2234,11 @@ 
 

                 if ((!empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product

                     $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty";

-                    $sql .= " WHERE fk_product_price=" . $objp->price_rowid;

+                    $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";

+                    $sql .= " WHERE fk_product_price=".$objp->price_rowid;

                     $sql .= " ORDER BY quantity ASC";

 

-                    dol_syslog(get_class($this) . "::select_produits_list search price by qty", LOG_DEBUG);

+                    dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);

                     $result2 = $this->db->query($sql);

                     if ($result2) {

                         $nb_prices = $this->db->num_rows($result2);

@@ -2342,7 +2342,7 @@ 
         if (!empty($objp->label_translated))

             $label = $objp->label_translated;

         if (!empty($filterkey) && $filterkey != '')

-            $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+            $label = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $label, 1);

 

         $outkey = $objp->rowid;

         $outref = $objp->ref;

@@ -2354,10 +2354,10 @@ 
         $outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

         $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

-        $opt = '<option value="' . $objp->rowid . '"';

+        $opt = '<option value="'.$objp->rowid.'"';

         $opt .= ($objp->rowid == $selected) ? ' selected' : '';

         if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0) {

-            $opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

+            $opt .= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';

         }

         if (!empty(Globals::$conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) {

             if ($objp->stock > 0)

@@ -2368,16 +2368,16 @@ 
         $opt .= '>';

         $opt .= $objp->ref;

         if ($outbarcode)

-            $opt .= ' (' . $outbarcode . ')';

-        $opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

+            $opt .= ' ('.$outbarcode.')';

+        $opt .= ' - '.dol_trunc($label, $maxlengtharticle);

 

         $objRef = $objp->ref;

         if (!empty($filterkey) && $filterkey != '')

-            $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+            $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);

         $outval .= $objRef;

         if ($outbarcode)

-            $outval .= ' (' . $outbarcode . ')';

-        $outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

+            $outval .= ' ('.$outbarcode.')';

+        $outval .= ' - '.dol_trunc($label, $maxlengtharticle);

 

         $found = 0;

 

@@ -2385,25 +2385,25 @@ 
         // If we need a particular price level (from 1 to 6)

         if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty(Globals::$conf->global->PRODUIT_MULTIPRICES) || !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {

             $sql = "SELECT price, price_ttc, price_base_type, tva_tx";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "product_price";

-            $sql .= " WHERE fk_product='" . $objp->rowid . "'";

-            $sql .= " AND entity IN (" . getEntity('productprice') . ")";

-            $sql .= " AND price_level=" . $price_level;

+            $sql .= " FROM ".MAIN_DB_PREFIX."product_price";

+            $sql .= " WHERE fk_product='".$objp->rowid."'";

+            $sql .= " AND entity IN (".getEntity('productprice').")";

+            $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.

             $sql .= " LIMIT 1";

 

-            dol_syslog(get_class($this) . '::constructProductListOption search price for level ' . $price_level . '', LOG_DEBUG);

+            dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);

             $result2 = $this->db->query($sql);

             if ($result2) {

                 $objp2 = $this->db->fetch_object($result2);

                 if ($objp2) {

                     $found = 1;

                     if ($objp2->price_base_type == 'HT') {

-                        $opt .= ' - ' . price($objp2->price, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("HT");

-                        $outval .= ' - ' . price($objp2->price, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("HT");

+                        $opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("HT");

+                        $outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("HT");

                     } else {

-                        $opt .= ' - ' . price($objp2->price_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("TTC");

-                        $outval .= ' - ' . price($objp2->price_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("TTC");

+                        $opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("TTC");

+                        $outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("TTC");

                     }

                     $outprice_ht = price($objp2->price);

                     $outprice_ttc = price($objp2->price_ttc);

@@ -2421,13 +2421,13 @@ 
             $outqty = $objp->quantity;

             $outdiscount = $objp->remise_percent;

             if ($objp->quantity == 1) {

-                $opt .= ' - ' . price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/";

-                $outval .= ' - ' . price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/";

+                $opt .= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/";

+                $outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/";

                 $opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding

                 $outval .= $langs->transnoentities("Unit");

             } else {

-                $opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $objp->quantity;

-                $outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $objp->quantity;

+                $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/".$objp->quantity;

+                $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/".$objp->quantity;

                 $opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

                 $outval .= $langs->transnoentities("Units");

             }

@@ -2438,12 +2438,12 @@ 
             $outtva_tx = $objp->tva_tx;

         }

         if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1) {

-            $opt .= " (" . price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-            $outval .= " (" . price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

+            $opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+            $outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

         }

         if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1) {

-            $opt .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-            $outval .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

+            $opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+            $outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

         }

 

         // Price by customer

@@ -2452,11 +2452,11 @@ 
                 $found = 1;

 

                 if ($objp->custprice_base_type == 'HT') {

-                    $opt .= ' - ' . price($objp->custprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("HT");

-                    $outval .= ' - ' . price($objp->custprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("HT");

+                    $opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("HT");

+                    $outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("HT");

                 } else {

-                    $opt .= ' - ' . price($objp->custprice_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("TTC");

-                    $outval .= ' - ' . price($objp->custprice_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("TTC");

+                    $opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("TTC");

+                    $outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("TTC");

                 }

 

                 $outprice_ht = price($objp->custprice);

@@ -2469,11 +2469,11 @@ 
         // If level no defined or multiprice not found, we used the default price

         if (empty($hidepriceinlabel) && !$found) {

             if ($objp->price_base_type == 'HT') {

-                $opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("HT");

-                $outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("HT");

+                $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("HT");

+                $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("HT");

             } else {

-                $opt .= ' - ' . price($objp->price_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->trans("TTC");

-                $outval .= ' - ' . price($objp->price_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency) . ' ' . $langs->transnoentities("TTC");

+                $opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->trans("TTC");

+                $outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, Globals::$conf->currency).' '.$langs->transnoentities("TTC");

             }

             $outprice_ht = price($objp->price);

             $outprice_ttc = price($objp->price_ttc);

@@ -2482,21 +2482,21 @@ 
         }

 

         if (!empty(Globals::$conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0) {

-            $opt .= ' - ' . $langs->trans("Stock") . ':' . $objp->stock;

+            $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;

 

             if ($objp->stock > 0) {

-                $outval .= ' - <span class="product_line_stock_ok">' . $langs->transnoentities("Stock") . ':' . $objp->stock . '</span>';

+                $outval .= ' - <span class="product_line_stock_ok">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';

             } elseif ($objp->stock <= 0) {

-                $outval .= ' - <span class="product_line_stock_too_low">' . $langs->transnoentities("Stock") . ':' . $objp->stock . '</span>';

+                $outval .= ' - <span class="product_line_stock_too_low">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';

             }

         }

 

         if ($outdurationvalue && $outdurationunit) {

             $da = array("h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));

             if (isset($da[$outdurationunit])) {

-                $key = $da[$outdurationunit] . ($outdurationvalue > 1 ? 's' : '');

-                $opt .= ' - ' . $outdurationvalue . ' ' . $langs->trans($key);

-                $outval .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($key);

+                $key = $da[$outdurationunit].($outdurationvalue > 1 ? 's' : '');

+                $opt .= ' - '.$outdurationvalue.' '.$langs->trans($key);

+                $outval .= ' - '.$outdurationvalue.' '.$langs->transnoentities($key);

             }

         }

 

@@ -2527,7 +2527,7 @@ 
         $selected_input_value = '';

         if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {

             if ($selected > 0) {

-                require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

                 $producttmpselect = new Product($this->db);

                 $producttmpselect->fetch($selected);

                 $selected_input_value = $producttmpselect->ref;

@@ -2535,9 +2535,9 @@ 
             }

 

             // mode=2 means suppliers products

-            $urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=2&status=' . $status . '&finished=' . $finished . '&alsoproductwithnosupplierprice=' . $alsoproductwithnosupplierprice;

-            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

-            print ($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . '<input type="text" size="20" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '">';

+            $urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;

+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';

         } else {

             print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice);

         }

@@ -2573,17 +2573,17 @@ 
         $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";

         $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";

         $sql .= " pfp.supplier_reputation";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

         if ($socid)

-            $sql .= " AND pfp.fk_soc = " . $socid;

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

-        $sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

+            $sql .= " AND pfp.fk_soc = ".$socid;

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+        $sql .= " WHERE p.entity IN (".getEntity('product').")";

         $sql .= " AND p.tobuy = 1";

         if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);

+            $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);

         if (!empty($filtre))

-            $sql .= " " . $filtre;

+            $sql .= " ".$filtre;

         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2596,13 +2596,13 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%')";

+                $sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty(Globals::$conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             $sql .= ')';

         }

         $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

@@ -2610,15 +2610,15 @@ 
 

         // Build output string

 

-        dol_syslog(get_class($this) . "::select_produits_fournisseurs_list", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

-            require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

 

             $num = $this->db->num_rows($result);

 

             //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax

-            $out .= '<select class="flat maxwidthonsmartphone" id="' . $htmlname . '" name="' . $htmlname . '">';

+            $out .= '<select class="flat maxwidthonsmartphone" id="'.$htmlname.'" name="'.$htmlname.'">';

             if (!$selected)

                 $out .= '<option value="0" selected>&nbsp;</option>';

             else

@@ -2628,9 +2628,9 @@ 
             while ($i < $num) {

                 $objp = $this->db->fetch_object($result);

 

-                $outkey = $objp->idprodfournprice;                                                    // id in table of price

+                $outkey = $objp->idprodfournprice; // id in table of price

                 if (!$outkey && $alsoproductwithnosupplierprice)

-                    $outkey = 'idprod_' . $objp->rowid;   // id of product

+                    $outkey = 'idprod_'.$objp->rowid; // id of product

 

                 $outref = $objp->ref;

                 $outval = '';

@@ -2640,36 +2640,36 @@ 
                 $outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

                 $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

-                $opt = '<option value="' . $outkey . '"';

+                $opt = '<option value="'.$outkey.'"';

                 if ($selected && $selected == $objp->idprodfournprice)

                     $opt .= ' selected';

                 if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice))

                     $opt .= ' disabled';

                 if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

-                    $opt .= ' pbq="' . $objp->idprodfournprice . '" data-pbq="' . $objp->idprodfournprice . '" data-pbqqty="' . $objp->quantity . '" data-pbqpercent="' . $objp->remise_percent . '"';

+                    $opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';

                 }

                 $opt .= '>';

 

                 $objRef = $objp->ref;

                 if ($filterkey && $filterkey != '')

-                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+                    $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);

                 $objRefFourn = $objp->ref_fourn;

                 if ($filterkey && $filterkey != '')

-                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

+                    $objRefFourn = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRefFourn, 1);

                 $label = $objp->label;

                 if ($filterkey && $filterkey != '')

-                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+                    $label = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $label, 1);

 

                 $opt .= $objp->ref;

                 if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $opt .= ' (' . $objp->ref_fourn . ')';

+                    $opt .= ' ('.$objp->ref_fourn.')';

                 $opt .= ' - ';

                 $outval .= $objRef;

                 if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $outval .= ' (' . $objRefFourn . ')';

+                    $outval .= ' ('.$objRefFourn.')';

                 $outval .= ' - ';

-                $opt .= dol_trunc($label, 72) . ' - ';

-                $outval .= dol_trunc($label, 72) . ' - ';

+                $opt .= dol_trunc($label, 72).' - ';

+                $outval .= dol_trunc($label, 72).' - ';

 

                 if (!empty($objp->idprodfournprice)) {

                     $outqty = $objp->quantity;

@@ -2691,39 +2691,39 @@ 
                         }

                     }

                     if ($objp->quantity == 1) {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/";

-                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/";

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/";

+                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/";

                         $opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding

                         $outval .= $langs->transnoentities("Unit");

                     } else {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $objp->quantity;

-                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $objp->quantity;

-                        $opt .= ' ' . $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

-                        $outval .= ' ' . $langs->transnoentities("Units");

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/".$objp->quantity;

+                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/".$objp->quantity;

+                        $opt .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

+                        $outval .= ' '.$langs->transnoentities("Units");

                     }

 

                     if ($objp->quantity >= 1) {

-                        $opt .= " (" . price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-                        $outval .= " (" . price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

+                        $opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+                        $outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, Globals::$conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

                     }

                     if ($objp->remise_percent >= 1) {

-                        $opt .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-                        $outval .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

+                        $opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+                        $outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

                     }

                     if ($objp->duration) {

-                        $opt .= " - " . $objp->duration;

-                        $outval .= " - " . $objp->duration;

+                        $opt .= " - ".$objp->duration;

+                        $outval .= " - ".$objp->duration;

                     }

                     if (!$socid) {

-                        $opt .= " - " . dol_trunc($objp->name, 8);

-                        $outval .= " - " . dol_trunc($objp->name, 8);

+                        $opt .= " - ".dol_trunc($objp->name, 8);

+                        $outval .= " - ".dol_trunc($objp->name, 8);

                     }

                     if ($objp->supplier_reputation) {

                         //TODO dictionary

                         $reputations = array('' => $langs->trans('Standard'), 'FAVORITE' => $langs->trans('Favorite'), 'NOTTHGOOD' => $langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER' => $langs->trans('DoNotOrderThisProductToThisSupplier'));

 

-                        $opt .= " - " . $reputations[$objp->supplier_reputation];

-                        $outval .= " - " . $reputations[$objp->supplier_reputation];

+                        $opt .= " - ".$reputations[$objp->supplier_reputation];

+                        $outval .= " - ".$reputations[$objp->supplier_reputation];

                     }

                 } else {

                     if (empty($alsoproductwithnosupplierprice)) {     // No supplier price defined for couple product/supplier

@@ -2757,7 +2757,7 @@ 
 

             $this->db->free($result);

 

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

             if (empty($outputmode))

@@ -2788,39 +2788,39 @@ 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, pfp.fk_soc,";

         $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";

         $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

-        $sql .= " WHERE pfp.entity IN (" . getEntity('productsupplierprice') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+        $sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";

         $sql .= " AND p.tobuy = 1";

         $sql .= " AND s.fournisseur = 1";

-        $sql .= " AND p.rowid = " . $productid;

+        $sql .= " AND p.rowid = ".$productid;

         $sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";

 

-        dol_syslog(get_class($this) . "::select_product_fourn_price", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);

         $result = $this->db->query($sql);

 

         if ($result) {

             $num = $this->db->num_rows($result);

 

-            $form = '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            $form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

 

             if (!$num) {

-                $form .= '<option value="0">-- ' . $langs->trans("NoSupplierPriceDefinedForThisProduct") . ' --</option>';

+                $form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';

             } else {

-                require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

                 $form .= '<option value="0">&nbsp;</option>';

 

                 $i = 0;

                 while ($i < $num) {

                     $objp = $this->db->fetch_object($result);

 

-                    $opt = '<option value="' . $objp->idprodfournprice . '"';

+                    $opt = '<option value="'.$objp->idprodfournprice.'"';

                     //if there is only one supplier, preselect it

                     if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {

                         $opt .= ' selected';

                     }

-                    $opt .= '>' . $objp->name . ' - ' . $objp->ref_fourn . ' - ';

+                    $opt .= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';

 

                     if (!empty(Globals::$conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {

                         $prod_supplier = new ProductFournisseur($this->db);

@@ -2839,10 +2839,10 @@ 
                         }

                     }

                     if ($objp->quantity == 1) {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/";

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/";

                     }

 

-                    $opt .= $objp->quantity . ' ';

+                    $opt .= $objp->quantity.' ';

 

                     if ($objp->quantity == 1) {

                         $opt .= $langs->trans("Unit");

@@ -2851,10 +2851,10 @@ 
                     }

                     if ($objp->quantity > 1) {

                         $opt .= " - ";

-                        $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->trans("Unit");

+                        $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency)."/".$langs->trans("Unit");

                     }

                     if ($objp->duration)

-                        $opt .= " - " . $objp->duration;

+                        $opt .= " - ".$objp->duration;

                     $opt .= "</option>\n";

 

                     $form .= $opt;

@@ -2886,14 +2886,14 @@ 
         // phpcs:enable

         // looking for users

         $sql = "SELECT a.rowid, a.label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe_address as a";

-        $sql .= " WHERE a.fk_soc = " . $socid;

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";

+        $sql .= " WHERE a.fk_soc = ".$socid;

         $sql .= " ORDER BY a.label ASC";

 

-        dol_syslog(get_class($this) . "::select_address", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_address", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($showempty)

                 print '<option value="0">&nbsp;</option>';

             $num = $this->db->num_rows($resql);

@@ -2903,9 +2903,9 @@ 
                     $obj = $this->db->fetch_object($resql);

 

                     if ($selected && $selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>' . $obj->label . '</option>';

+                        print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">' . $obj->label . '</option>';

+                        print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';

                     }

                     $i++;

                 }

@@ -2930,13 +2930,13 @@ 
 

         $num = count($this->cache_conditions_paiements);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $sql = "SELECT rowid, code, libelle as label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_payment_term';

-        $sql .= " WHERE entity IN (" . getEntity('c_payment_term') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_payment_term';

+        $sql .= " WHERE entity IN (".getEntity('c_payment_term').")";

         $sql .= " AND active > 0";

         $sql .= " ORDER BY sortorder";

 

@@ -2948,7 +2948,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->trans("PaymentConditionShort" . $obj->code) != ("PaymentConditionShort" . $obj->code) ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->trans("PaymentConditionShort".$obj->code) != ("PaymentConditionShort".$obj->code) ? $langs->trans("PaymentConditionShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_conditions_paiements[$obj->rowid]['code'] = $obj->code;

                 $this->cache_conditions_paiements[$obj->rowid]['label'] = $label;

                 $i++;

@@ -2976,14 +2976,14 @@ 
 

         $num = count($this->cache_availability);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $langs->load('propal');

 

         $sql = "SELECT rowid, code, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_availability';

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -2994,7 +2994,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->trans("AvailabilityType" . $obj->code) != ("AvailabilityType" . $obj->code) ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_availability[$obj->rowid]['code'] = $obj->code;

                 $this->cache_availability[$obj->rowid]['label'] = $label;

                 $i++;

@@ -3024,16 +3024,16 @@ 
 

         $this->load_cache_availability();

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

-        print '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';

+        print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';

         if ($addempty)

             print '<option value="0">&nbsp;</option>';

         foreach ($this->cache_availability as $id => $arrayavailability) {

             if ($selected == $id) {

-                print '<option value="' . $id . '" selected>';

+                print '<option value="'.$id.'" selected>';

             } else {

-                print '<option value="' . $id . '">';

+                print '<option value="'.$id.'">';

             }

             print $arrayavailability['label'];

             print '</option>';

@@ -3054,10 +3054,10 @@ 
 

         $num = count($this->cache_demand_reason);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         $sql = "SELECT rowid, code, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_input_reason';

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -3070,10 +3070,10 @@ 
 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

                 $label = ($obj->label != '-' ? $obj->label : '');

-                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code))

-                    $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

+                if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code))

+                    $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work

                 if ($langs->trans($obj->code) != $obj->code)

-                    $label = $langs->trans($obj->code);                // So translation key SRC_XXX will work

+                    $label = $langs->trans($obj->code); // So translation key SRC_XXX will work

 

                 $tmparray[$obj->rowid]['id'] = $obj->rowid;

                 $tmparray[$obj->rowid]['code'] = $obj->code;

@@ -3108,17 +3108,17 @@ 
 

         $this->loadCacheInputReason();

 

-        print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+        print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

         if ($addempty)

-            print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

+            print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';

         foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

             if ($arraydemandreason['code'] == $exclude)

                 continue;

 

             if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

-                print '<option value="' . $arraydemandreason['id'] . '" selected>';

+                print '<option value="'.$arraydemandreason['id'].'" selected>';

             } else {

-                print '<option value="' . $arraydemandreason['id'] . '">';

+                print '<option value="'.$arraydemandreason['id'].'">';

             }

             $label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason

             print $langs->trans($label);

@@ -3142,15 +3142,15 @@ 
 

         $num = count($this->cache_types_paiements);

         if ($num > 0)

-            return $num;    // Cache already loaded

+            return $num; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $this->cache_types_paiements = array();

 

         $sql = "SELECT id, code, libelle as label, type, active";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_paiement";

-        $sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement";

+        $sql .= " WHERE entity IN (".getEntity('c_paiement').")";

         //if ($active >= 0) $sql.= " AND active = ".$active;

 

         $resql = $this->db->query($sql);

@@ -3161,7 +3161,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != ("PaymentTypeShort" . $obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_types_paiements[$obj->id]['id'] = $obj->id;

                 $this->cache_types_paiements[$obj->id]['code'] = $obj->code;

                 $this->cache_types_paiements[$obj->id]['label'] = $label;

@@ -3198,7 +3198,7 @@ 
         // phpcs:enable

         global $langs, $user, $conf;

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

         $this->load_cache_conditions_paiements();

 

@@ -3206,14 +3206,14 @@ 
         if (empty($selected) && !empty(Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID))

             $selected = Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

 

-        print '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

+        print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

         if ($addempty)

             print '<option value="0">&nbsp;</option>';

         foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

             if ($selected == $id) {

-                print '<option value="' . $id . '" selected>';

+                print '<option value="'.$id.'" selected>';

             } else {

-                print '<option value="' . $id . '">';

+                print '<option value="'.$id.'">';

             }

             print $arrayconditions['label'];

             print '</option>';

@@ -3243,7 +3243,7 @@ 
         // phpcs:enable

         global $langs, $user;

 

-        dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

+        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

 

         $filterarray = array();

         if ($filtertype == 'CRDT')

@@ -3255,7 +3255,7 @@ 
 

         $this->load_cache_types_paiements();

 

-        print '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

+        print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

         if ($empty)

             print '<option value="">&nbsp;</option>';

         foreach ($this->cache_types_paiements as $id => $arraytypes) {

@@ -3272,13 +3272,13 @@ 
                 continue;

 

             if ($format == 0)

-                print '<option value="' . $id . '"';

+                print '<option value="'.$id.'"';

             elseif ($format == 1)

-                print '<option value="' . $arraytypes['code'] . '"';

+                print '<option value="'.$arraytypes['code'].'"';

             elseif ($format == 2)

-                print '<option value="' . $arraytypes['code'] . '"';

+                print '<option value="'.$arraytypes['code'].'"';

             elseif ($format == 3)

-                print '<option value="' . $id . '"';

+                print '<option value="'.$id.'"';

             // Si selected est text, on compare avec code, sinon avec id

             if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code'])

                 print ' selected';

@@ -3314,16 +3314,16 @@ 
 

         $return = '';

 

-        $return .= '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+        $return .= '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

         $options = array(

             'HT' => $langs->trans("HT"),

             'TTC' => $langs->trans("TTC")

         );

         foreach ($options as $id => $value) {

             if ($selected == $id) {

-                $return .= '<option value="' . $id . '" selected>' . $value;

+                $return .= '<option value="'.$id.'" selected>'.$value;

             } else {

-                $return .= '<option value="' . $id . '">' . $value;

+                $return .= '<option value="'.$id.'">'.$value;

             }

             $return .= '</option>';

         }

@@ -3350,30 +3350,30 @@ 
         $langs->load("deliveries");

 

         $sql = "SELECT rowid, code, libelle as label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";

         $sql .= " WHERE active > 0";

         if ($filtre)

-            $sql .= " AND " . $filtre;

+            $sql .= " AND ".$filtre;

         $sql .= " ORDER BY libelle ASC";

 

-        dol_syslog(get_class($this) . "::selectShippingMode", LOG_DEBUG);

+        dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             $num = $this->db->num_rows($result);

             $i = 0;

             if ($num) {

-                print '<select id="select' . $htmlname . '" class="flat selectshippingmethod" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

+                print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

                     print '<option value="-1">&nbsp;</option>';

                 }

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($result);

                     if ($selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>';

+                        print '<option value="'.$obj->rowid.'" selected>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">';

+                        print '<option value="'.$obj->rowid.'">';

                     }

-                    print ($langs->trans("SendingMethod" . strtoupper($obj->code)) != "SendingMethod" . strtoupper($obj->code)) ? $langs->trans("SendingMethod" . strtoupper($obj->code)) : $obj->label;

+                    print ($langs->trans("SendingMethod".strtoupper($obj->code)) != "SendingMethod".strtoupper($obj->code)) ? $langs->trans("SendingMethod".strtoupper($obj->code)) : $obj->label;

                     print '</option>';

                     $i++;

                 }

@@ -3404,16 +3404,16 @@ 
         $langs->load("deliveries");

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setshippingmethod">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectShippingMethod($selected, $htmlname, '', $addempty);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

                 $code = $langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');

-                print $langs->trans("SendingMethod" . strtoupper($code));

+                print $langs->trans("SendingMethod".strtoupper($code));

             } else {

                 print "&nbsp;";

             }

@@ -3435,7 +3435,7 @@ 
         $langs->load('bills');

 

         $opt = '<option value ="" selected></option>';

-        $sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';

+        $sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM '.MAIN_DB_PREFIX.'facture WHERE situation_counter>=1';

         $sql .= ' ORDER by situation_cycle_ref, situation_counter desc';

         $resql = $this->db->query($sql);

         if ($resql && $this->db->num_rows($resql) > 0) {

@@ -3453,9 +3453,9 @@ 
                             //Not prov?

                             if (substr($obj->ref, 1, 4) != 'PROV') {

                                 if ($selected == $obj->rowid) {

-                                    $opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->ref . '</option>';

+                                    $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';

                                 } else {

-                                    $opt .= '<option value="' . $obj->rowid . '">' . $obj->ref . '</option>';

+                                    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';

                                 }

                             }

                         }

@@ -3463,10 +3463,10 @@ 
                 }

             }

         } else {

-            dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);

+            dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);

         }

         if ($opt == '<option value ="" selected></option>') {

-            $opt = '<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>';

+            $opt = '<option value ="0" selected>'.$langs->trans('NoSituations').'</option>';

         }

         return $opt;

     }

@@ -3485,9 +3485,9 @@ 
 

         $langs->load('products');

 

-        $return = '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';

+        $return = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

 

-        $sql = 'SELECT rowid, label, code from ' . MAIN_DB_PREFIX . 'c_units';

+        $sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';

         $sql .= ' WHERE active > 0';

 

         $resql = $this->db->query($sql);

@@ -3497,14 +3497,14 @@ 
 

             while ($res = $this->db->fetch_object($resql)) {

                 $unitLabel = $res->label;

-                if (!empty($langs->tab_translate['unit' . $res->code])) { // check if Translation is available before

-                    $unitLabel = $langs->trans('unit' . $res->code) != $res->label ? $langs->trans('unit' . $res->code) : $res->label;

+                if (!empty($langs->tab_translate['unit'.$res->code])) { // check if Translation is available before

+                    $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;

                 }

 

                 if ($selected == $res->rowid) {

-                    $return .= '<option value="' . $res->rowid . '" selected>' . $unitLabel . '</option>';

+                    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';

                 } else {

-                    $return .= '<option value="' . $res->rowid . '">' . $unitLabel . '</option>';

+                    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';

                 }

             }

             $return .= '</select>';

@@ -3534,21 +3534,21 @@ 
         $num = 0;

 

         $sql = "SELECT rowid, label, bank, clos as status, currency_code";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";

-        $sql .= " WHERE entity IN (" . getEntity('bank_account') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";

+        $sql .= " WHERE entity IN (".getEntity('bank_account').")";

         if ($statut != 2)

-            $sql .= " AND clos = '" . $statut . "'";

+            $sql .= " AND clos = '".$statut."'";

         if ($filtre)

-            $sql .= " AND " . $filtre;

+            $sql .= " AND ".$filtre;

         $sql .= " ORDER BY label";

 

-        dol_syslog(get_class($this) . "::select_comptes", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             $num = $this->db->num_rows($result);

             $i = 0;

             if ($num) {

-                print '<select id="select' . $htmlname . '" class="flat selectbankaccount" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

+                print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

                     print '<option value="-1">&nbsp;</option>';

                 }

@@ -3556,15 +3556,15 @@ 
                 while ($i < $num) {

                     $obj = $this->db->fetch_object($result);

                     if ($selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>';

+                        print '<option value="'.$obj->rowid.'" selected>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">';

+                        print '<option value="'.$obj->rowid.'">';

                     }

                     print trim($obj->label);

                     if ($showcurrency)

-                        print ' (' . $obj->currency_code . ')';

+                        print ' ('.$obj->currency_code.')';

                     if ($statut == 2 && $obj->status == 1)

-                        print ' (' . $langs->trans("Closed") . ')';

+                        print ' ('.$langs->trans("Closed").')';

                     print '</option>';

                     $i++;

                 }

@@ -3572,9 +3572,9 @@ 
             }

             else {

                 if ($statut == 0)

-                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';

+                    print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';

                 else

-                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';

+                    print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';

             }

         }

         else {

@@ -3597,19 +3597,19 @@ 
     {

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setbankaccount">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);

             if ($nbaccountfound > 0)

-                print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+                print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

 

             $langs->load('banks');

 

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

                 $bankstatic = new Account($this->db);

                 $result = $bankstatic->fetch($selected);

                 if ($result)

@@ -3639,19 +3639,19 @@ 
         global $conf, $langs;

         $langs->load("categories");

 

-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 

         // For backward compatibility

         if (is_numeric($type)) {

-            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

         }

 

         if ($type === Categorie::TYPE_BANK_LINE) {

             // TODO Move this into common category feature

             $categids = array();

             $sql = "SELECT c.label, c.rowid";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "bank_categ as c";

-            $sql .= " WHERE entity = " . Globals::$conf->entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";

+            $sql .= " WHERE entity = ".Globals::$conf->entity;

             $sql .= " ORDER BY c.label";

             $result = $this->db->query($sql);

             if ($result) {

@@ -3672,11 +3672,11 @@ 
             $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);

         }

 

-        $output = '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

         $outarray = array();

         if (is_array($cate_arbo)) {

             if (!count($cate_arbo))

-                $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

+                $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';

             else {

                 $output .= '<option value="-1">&nbsp;</option>';

                 foreach ($cate_arbo as $key => $value) {

@@ -3685,7 +3685,7 @@ 
                     } else {

                         $add = '';

                     }

-                    $output .= '<option ' . $add . 'value="' . $cate_arbo[$key]['id'] . '">' . dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle') . '</option>';

+                    $output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';

 

                     $outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel'];

                 }

@@ -3719,7 +3719,7 @@ 
     function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)

     {

         // phpcs:enable

-        dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

+        dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

         print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);

     }

 

@@ -3767,36 +3767,36 @@ 
             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

                     if ($input['type'] == 'hidden') {

-                        $more .= '<input type="hidden" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . DolUtils::dol_escape_htmltag($input['value']) . '">' . "\n";

+                        $more .= '<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.DolUtils::dol_escape_htmltag($input['value']).'">'."\n";

                     }

                 }

             }

 

             // Now add questions

-            $more .= '<table class="paddingtopbottomonly" width="100%">' . "\n";

+            $more .= '<table class="paddingtopbottomonly" width="100%">'."\n";

             if (!empty($formquestion['text']))

-                $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+                $more .= '<tr><td colspan="2">'.$formquestion['text'].'</td></tr>'."\n";

             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

-                    $size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');

-                    $moreattr = (!empty($input['moreattr']) ? ' ' . $input['moreattr'] : '');

-                    $morecss = (!empty($input['morecss']) ? ' ' . $input['morecss'] : '');

+                    $size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');

+                    $moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');

+                    $morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');

 

                     if ($input['type'] == 'text') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="text" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";

                     } elseif ($input['type'] == 'password') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="password" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";

                     } elseif ($input['type'] == 'select') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>';

                         if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td class="tdtop" align="left">';

+                            $more .= $input['label'].'</td><td class="tdtop" align="left">';

                         $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

                     elseif ($input['type'] == 'checkbox') {

                         $more .= '<tr>';

-                        $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . ' </td><td align="left">';

-                        $more .= '<input type="checkbox" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $moreattr;

+                        $more .= '<td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].' </td><td align="left">';

+                        $more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;

                         if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0')

                             $more .= ' checked';

                         if (is_bool($input['value']) && $input['value'])

@@ -3804,51 +3804,51 @@ 
                         if (isset($input['disabled']))

                             $more .= ' disabled';

                         $more .= ' /></td>';

-                        $more .= '</tr>' . "\n";

+                        $more .= '</tr>'."\n";

                     }

                     elseif ($input['type'] == 'radio') {

                         $i = 0;

                         foreach ($input['values'] as $selkey => $selval) {

                             $more .= '<tr>';

                             if ($i == 0)

-                                $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

+                                $more .= '<td'.(empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop '.$input['tdclass'].'"')).'>'.$input['label'].'</td>';

                             else

-                                $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';

-                            $more .= '<td><input type="radio" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . $selkey . '"' . $moreattr;

+                                $more .= '<td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>&nbsp;</td>';

+                            $more .= '<td><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;

                             if ($input['disabled'])

                                 $more .= ' disabled';

                             $more .= ' /> ';

                             $more .= $selval;

-                            $more .= '</td></tr>' . "\n";

+                            $more .= '</td></tr>'."\n";

                             $i++;

                         }

                     }

                     elseif ($input['type'] == 'date') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td>';

                         $more .= '<td align="left">';

                         $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

-                        $more .= '</td></tr>' . "\n";

-                        $formquestion[] = array('name' => $input['name'] . 'day');

-                        $formquestion[] = array('name' => $input['name'] . 'month');

-                        $formquestion[] = array('name' => $input['name'] . 'year');

-                        $formquestion[] = array('name' => $input['name'] . 'hour');

-                        $formquestion[] = array('name' => $input['name'] . 'min');

+                        $more .= '</td></tr>'."\n";

+                        $formquestion[] = array('name' => $input['name'].'day');

+                        $formquestion[] = array('name' => $input['name'].'month');

+                        $formquestion[] = array('name' => $input['name'].'year');

+                        $formquestion[] = array('name' => $input['name'].'hour');

+                        $formquestion[] = array('name' => $input['name'].'min');

                     } elseif ($input['type'] == 'other') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>';

                         if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td align="left">';

+                            $more .= $input['label'].'</td><td align="left">';

                         $more .= $input['value'];

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

 

                     elseif ($input['type'] == 'onecolumn') {

                         $more .= '<tr><td colspan="2" align="left">';

                         $more .= $input['value'];

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

                 }

             }

-            $more .= '</table>' . "\n";

+            $more .= '</table>'."\n";

         }

 

         // JQUI method dialog is broken with jmobile, we use standard HTML.

@@ -3867,10 +3867,10 @@ 
                 $button = $useajax;

                 $useajax = 1;

                 $autoOpen = false;

-                $dialogconfirm .= '-' . $button;

+                $dialogconfirm .= '-'.$button;

             }

-            $pageyes = $page . (preg_match('/\?/', $page) ? '&' : '?') . 'action=' . $action . '&confirm=yes';

-            $pageno = ($useajax == 2 ? $page . (preg_match('/\?/', $page) ? '&' : '?') . 'confirm=no' : '');

+            $pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';

+            $pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');

             // Add input fields into list of fields to read during submit (inputok and inputko)

             if (is_array($formquestion)) {

                 foreach ($formquestion as $key => $input) {

@@ -3882,20 +3882,20 @@ 
                 }

             }

             // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template

-            $formconfirm .= '<div id="' . $dialogconfirm . '" title="' . DolUtils::dol_escape_htmltag($title) . '" style="display: none;">';

+            $formconfirm .= '<div id="'.$dialogconfirm.'" title="'.DolUtils::dol_escape_htmltag($title).'" style="display: none;">';

             if (!empty($more)) {

-                $formconfirm .= '<div class="confirmquestions">' . $more . '</div>';

+                $formconfirm .= '<div class="confirmquestions">'.$more.'</div>';

             }

-            $formconfirm .= ($question ? '<div class="confirmmessage">' . img_help('', '') . ' ' . $question . '</div>' : '');

-            $formconfirm .= '</div>' . "\n";

+            $formconfirm .= ($question ? '<div class="confirmmessage">'.img_help('', '').' '.$question.'</div>' : '');

+            $formconfirm .= '</div>'."\n";

 

-            $formconfirm .= "\n<!-- begin ajax formconfirm page=" . $page . " -->\n";

-            $formconfirm .= '<script type="text/javascript">' . "\n";

+            $formconfirm .= "\n<!-- begin ajax formconfirm page=".$page." -->\n";

+            $formconfirm .= '<script type="text/javascript">'."\n";

             $formconfirm .= 'jQuery(document).ready(function() {

             $(function() {

-            	$( "#' . $dialogconfirm . '" ).dialog(

+            	$( "#' . $dialogconfirm.'" ).dialog(

             	{

-                    autoOpen: ' . ($autoOpen ? "true" : "false") . ',';

+                    autoOpen: ' . ($autoOpen ? "true" : "false").',';

             if ($newselectedchoice == 'no') {

                 $formconfirm .= '

 						open: function() {

@@ -3904,15 +3904,15 @@ 
             }

             $formconfirm .= '

                     resizable: false,

-                    height: "' . $height . '",

-                    width: "' . $width . '",

+                    height: "' . $height.'",

+                    width: "' . $width.'",

                     modal: true,

                     closeOnEscape: false,

                     buttons: {

-                        "' . dol_escape_js($langs->transnoentities("Yes")) . '": function() {

+                        "' . dol_escape_js($langs->transnoentities("Yes")).'": function() {

                         	var options="";

-                        	var inputok = ' . json_encode($inputok) . ';

-                         	var pageyes = "' . dol_escape_js(!empty($pageyes) ? $pageyes : '') . '";

+                        	var inputok = ' . json_encode($inputok).';

+                         	var pageyes = "' . dol_escape_js(!empty($pageyes) ? $pageyes : '').'";

                          	if (inputok.length>0) {

                          		$.each(inputok, function(i, inputname) {

                          			var more = "";

@@ -3928,10 +3928,10 @@ 
             				if (pageyes.length > 0) { location.href = urljump; }

                             $(this).dialog("close");

                         },

-                        "' . dol_escape_js($langs->transnoentities("No")) . '": function() {

+                        "' . dol_escape_js($langs->transnoentities("No")).'": function() {

                         	var options = "";

-                         	var inputko = ' . json_encode($inputko) . ';

-                         	var pageno="' . dol_escape_js(!empty($pageno) ? $pageno : '') . '";

+                         	var inputko = ' . json_encode($inputko).';

+                         	var pageno="' . dol_escape_js(!empty($pageno) ? $pageno : '').'";

                          	if (inputko.length>0) {

                          		$.each(inputko, function(i, inputname) {

                          			var more = "";

@@ -3950,10 +3950,10 @@ 
                 }

                 );

 

-            	var button = "' . $button . '";

+            	var button = "' . $button.'";

             	if (button.length > 0) {

                 	$( "#" + button ).click(function() {

-                		$("#' . $dialogconfirm . '").dialog("open");

+                		$("#' . $dialogconfirm.'").dialog("open");

         			});

                 }

             });

@@ -3961,37 +3961,37 @@ 
             </script>';

             $formconfirm .= "<!-- end ajax formconfirm -->\n";

         } else {

-            $formconfirm .= "\n<!-- begin formconfirm page=" . $page . " -->\n";

+            $formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";

 

             if (empty($disableformtag))

-                $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

+                $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";

 

-            $formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

+            $formconfirm .= '<input type="hidden" name="action" value="'.$action.'">'."\n";

             if (empty($disableformtag))

-                $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";

+                $formconfirm .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";

 

-            $formconfirm .= '<table width="100%" class="valid">' . "\n";

+            $formconfirm .= '<table width="100%" class="valid">'."\n";

 

             // Line title

-            $formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">' . img_picto('', 'recent') . ' ' . $title . '</td></tr>' . "\n";

+            $formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";

 

             // Line form fields

             if ($more) {

-                $formconfirm .= '<tr class="valid"><td class="valid" colspan="3">' . "\n";

+                $formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'."\n";

                 $formconfirm .= $more;

-                $formconfirm .= '</td></tr>' . "\n";

+                $formconfirm .= '</td></tr>'."\n";

             }

 

             // Line with question

             $formconfirm .= '<tr class="valid">';

-            $formconfirm .= '<td class="valid">' . $question . '</td>';

+            $formconfirm .= '<td class="valid">'.$question.'</td>';

             $formconfirm .= '<td class="valid">';

             $formconfirm .= $this->selectyesno("confirm", $newselectedchoice);

             $formconfirm .= '</td>';

-            $formconfirm .= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="' . $langs->trans("Validate") . '"></td>';

-            $formconfirm .= '</tr>' . "\n";

+            $formconfirm .= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';

+            $formconfirm .= '</tr>'."\n";

 

-            $formconfirm .= '</table>' . "\n";

+            $formconfirm .= '</table>'."\n";

 

             if (empty($disableformtag))

                 $formconfirm .= "</form>\n";

@@ -4022,8 +4022,8 @@ 
         // phpcs:enable

         global $langs;

 

-        require_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';

-        require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';

 

         $out = '';

 

@@ -4032,11 +4032,11 @@ 
         $langs->load("project");

         if ($htmlname != "none") {

             $out .= "\n";

-            $out .= '<form method="post" action="' . $page . '">';

+            $out .= '<form method="post" action="'.$page.'">';

             $out .= '<input type="hidden" name="action" value="classin">';

-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);

-            $out .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            $out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             $out .= '</form>';

         } else {

             if ($selected) {

@@ -4071,11 +4071,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setconditions">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->select_conditions_paiements($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4102,11 +4102,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setavailability">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4132,11 +4132,11 @@ 
     {

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setdemandreason">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectInputReason($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4174,14 +4174,14 @@ 
         $ret = '';

 

         if ($htmlname != "none") {

-            $ret .= '<form method="post" action="' . $page . '" name="form' . $htmlname . '">';

-            $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

-            $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';

+            $ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

+            $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $ret .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

             $ret .= '<tr><td>';

-            $ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form' . $htmlname, 1, 0);

+            $ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);

             $ret .= '</td>';

-            $ret .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

+            $ret .= '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

             $ret .= '</tr></table></form>';

         } else {

             if ($displayhour)

@@ -4212,15 +4212,15 @@ 
         global $langs;

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '" name="form' . $htmlname . '">';

-            print '<input type="hidden" name="action" value="set' . $htmlname . '">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';

+            print '<input type="hidden" name="action" value="set'.$htmlname.'">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';

                 $theuser = new User($this->db);

                 $theuser->fetch($selected);

                 print $theuser->getNomUrl(1);

@@ -4246,11 +4246,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmode">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->select_types_paiements($selected, $htmlname, $filtertype, 0, 0, 0, 0, $active);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4276,11 +4276,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmulticurrencycode">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print $this->selectMultiCurrency($selected, $htmlname, 0);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             dol_include_once('/core/lib/company.lib.php');

@@ -4304,21 +4304,21 @@ 
         global $langs, $mysoc, $conf;

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmulticurrencyrate">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-            print '<input type="text" name="' . $htmlname . '" value="' . (!empty($rate) ? price($rate) : 1) . '" size="10" /> ';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" /> ';

             print '<select name="calculation_mode">';

-            print '<option value="1">' . $currency . ' > ' . Globals::$conf->currency . '</option>';

-            print '<option value="2">' . Globals::$conf->currency . ' > ' . $currency . '</option>';

+            print '<option value="1">'.$currency.' > '.Globals::$conf->currency.'</option>';

+            print '<option value="2">'.Globals::$conf->currency.' > '.$currency.'</option>';

             print '</select> ';

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if (!empty($rate)) {

                 print price($rate, 1, $langs, 1, 0);

                 if ($currency && $rate != 1)

-                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . Globals::$conf->currency . ')';

+                    print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.Globals::$conf->currency.')';

             }

             else {

                 print 1;

@@ -4347,14 +4347,14 @@ 
         // phpcs:enable

         global $conf, $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setabsolutediscount">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print '<div class="inline-block">';

             if (!empty($discount_type)) {

                 if (!empty(Globals::$conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

                     if (!$filter || $filter == "fk_invoice_supplier_source IS NULL")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice

+                        $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice

                     else

                         $translationKey = 'HasCreditNoteFromSupplier';

                 }

@@ -4367,7 +4367,7 @@ 
             } else {

                 if (!empty(Globals::$conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

                     if (!$filter || $filter == "fk_facture_source IS NULL")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice

+                        $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice

                     else

                         $translationKey = 'CompanyHasCreditNote';

                 }

@@ -4384,21 +4384,21 @@ 
             print '</div>';

             if (empty($hidelist)) {

                 print '<div class="inline-block" style="padding-right: 10px">';

-                $newfilter = 'discount_type=' . intval($discount_type);

+                $newfilter = 'discount_type='.intval($discount_type);

                 if (!empty($discount_type)) {

                     $newfilter .= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available

                 } else {

                     $newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available

                 }

                 if ($filter)

-                    $newfilter .= ' AND (' . $filter . ')';

+                    $newfilter .= ' AND ('.$filter.')';

                 $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);

                 if ($nbqualifiedlines > 0) {

-                    print ' &nbsp; <input type="submit" class="button" value="' . DolUtils::dol_escape_htmltag($langs->trans("UseLine")) . '"';

+                    print ' &nbsp; <input type="submit" class="button" value="'.DolUtils::dol_escape_htmltag($langs->trans("UseLine")).'"';

                     if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

                     if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

 

                     print '>';

                 }

@@ -4435,22 +4435,22 @@ 
         global $langs, $conf;

 

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="set_contact">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

             print '<tr><td>';

             $num = $this->select_contacts($societe->id, $selected, $htmlname);

             if ($num == 0) {

                 $addcontact = (!empty(Globals::$conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

-                print '<a href="' . DOL_URL_ROOT . '/contact/card.php?socid=' . $societe->id . '&amp;action=create&amp;backtoreferer=1">' . $addcontact . '</a>';

+                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';

             }

             print '</td>';

-            print '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

             print '</tr></table></form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

                 $contact = new Contact($this->db);

                 $contact->fetch($selected);

                 print $contact->getFullName($langs);

@@ -4482,15 +4482,15 @@ 
 

         $out = '';

         if ($htmlname != "none") {

-            $out .= '<form method="post" action="' . $page . '">';

+            $out .= '<form method="post" action="'.$page.'">';

             $out .= '<input type="hidden" name="action" value="set_thirdparty">';

-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);

-            $out .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            $out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             $out .= '</form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

                 $soc = new Societe($this->db);

                 $soc->fetch($selected);

                 $out .= $soc->getNomUrl($langs);

@@ -4536,17 +4536,17 @@ 
         $out = '';

 

         if ($selected == 'euro' || $selected == 'euros')

-            $selected = 'EUR';   // Pour compatibilite

+            $selected = 'EUR'; // Pour compatibilite

 

-        $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';

         foreach ($langs->cache_currencies as $code_iso => $currency) {

             if ($selected && $selected == $code_iso) {

-                $out .= '<option value="' . $code_iso . '" selected>';

+                $out .= '<option value="'.$code_iso.'" selected>';

             } else {

-                $out .= '<option value="' . $code_iso . '">';

+                $out .= '<option value="'.$code_iso.'">';

             }

             $out .= $currency['label'];

-            $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

+            $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

             $out .= '</option>';

         }

         $out .= '</select>';

@@ -4554,7 +4554,7 @@ 
             $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

 

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

         $out .= ajax_combobox($htmlname);

 

         return $out;

@@ -4572,12 +4572,12 @@ 
     {

         global $db, $conf, $langs, $user;

 

-        $langs->loadCacheCurrencies('');        // Load ->cache_currencies

+        $langs->loadCacheCurrencies(''); // Load ->cache_currencies

 

         $TCurrency = array();

 

-        $sql = 'SELECT code FROM ' . MAIN_DB_PREFIX . 'multicurrency';

-        $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';

+        $sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";

         $resql = $db->query($sql);

         if ($resql) {

             while ($obj = $db->fetch_object($resql))

@@ -4585,7 +4585,7 @@ 
         }

 

         $out = '';

-        $out .= '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

         if ($useempty)

             $out .= '<option value=""></option>';

         // If company current currency not in table, we add it into list. Should always be available.

@@ -4596,12 +4596,12 @@ 
             foreach ($langs->cache_currencies as $code_iso => $currency) {

                 if (isset($TCurrency[$code_iso])) {

                     if (!empty($selected) && $selected == $code_iso)

-                        $out .= '<option value="' . $code_iso . '" selected="selected">';

+                        $out .= '<option value="'.$code_iso.'" selected="selected">';

                     else

-                        $out .= '<option value="' . $code_iso . '">';

+                        $out .= '<option value="'.$code_iso.'">';

 

                     $out .= $currency['label'];

-                    $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

+                    $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

                     $out .= '</option>';

                 }

             }

@@ -4609,7 +4609,7 @@ 
 

         $out .= '</select>';

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

         $out .= ajax_combobox($htmlname);

 

         return $out;

@@ -4629,15 +4629,15 @@ 
 

         $num = count($this->cache_vatrates);

         if ($num > 0)

-            return $num;    // Cache already loaded

+            return $num; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $sql = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid";

         $sql .= " AND t.active > 0";

-        $sql .= " AND c.code IN (" . $country_code . ")";

+        $sql .= " AND c.code IN (".$country_code.")";

         $sql .= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";

 

         $resql = $this->db->query($sql);

@@ -4655,28 +4655,28 @@ 
                     $this->cache_vatrates[$i]['localtax2'] = $obj->localtax2;

                     $this->cache_vatrates[$i]['localtax2_type'] = $obj->localtax1_type;

 

-                    $this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : '');   // Label must contains only 0-9 , . % or *

-                    $this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+                    $this->cache_vatrates[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *

+                    $this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1 ? $obj->localtax1 : '0').'/'.($obj->localtax2 ? $obj->localtax2 : '0').($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

                     $positiverates = '';

                     if ($obj->taux)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->taux;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->taux;

                     if ($obj->localtax1)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->localtax1;

                     if ($obj->localtax2)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->localtax2;

                     if (empty($positiverates))

                         $positiverates = '0';

-                    $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+                    $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

                 }

 

                 return $num;

             }

             else {

-                $this->error = '<font class="error">' . $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code) . '</font>';

+                $this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';

                 return -1;

             }

         } else {

-            $this->error = '<font class="error">' . $this->db->error() . '</font>';

+            $this->error = '<font class="error">'.$this->db->error().'</font>';

             return -2;

         }

     }

@@ -4725,9 +4725,9 @@ 
         // Check parameters

         if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {

             if ($societe_vendeuse->id == $mysoc->id) {

-                $return .= '<font class="error">' . $langs->trans("ErrorYourCountryIsNotDefined") . '</div>';

+                $return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';

             } else {

-                $return .= '<font class="error">' . $langs->trans("ErrorSupplierCountryIsNotDefined") . '</div>';

+                $return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';

             }

             return $return;

         }

@@ -4738,32 +4738,32 @@ 
         // Define list of countries to use to search VAT rates to show

         // First we defined code_country to use to find list

         if (is_object($societe_vendeuse)) {

-            $code_country = "'" . $societe_vendeuse->country_code . "'";

+            $code_country = "'".$societe_vendeuse->country_code."'";

         } else {

-            $code_country = "'" . $mysoc->country_code . "'";   // Pour compatibilite ascendente

+            $code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente

         }

         if (!empty(Globals::$conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {    // If option to have vat for end customer for services is on

-            require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

             if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {

                 // We also add the buyer

                 if (is_numeric($type)) {

                     if ($type == 1) { // We know product is a service

-                        $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                        $code_country .= ",'".$societe_acheteuse->country_code."'";

                     }

                 } else if (!$idprod) {  // We don't know type of product

-                    $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                    $code_country .= ",'".$societe_acheteuse->country_code."'";

                 } else {

                     $prodstatic = new Product($this->db);

                     $prodstatic->fetch($idprod);

                     if ($prodstatic->type == Product::TYPE_SERVICE) {   // We know product is a service

-                        $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                        $code_country .= ",'".$societe_acheteuse->country_code."'";

                     }

                 }

             }

         }

 

         // Now we get list

-        $num = $this->load_cache_vatrates($code_country);   // If no vat defined, return -1 with message into this->error

+        $num = $this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error

 

         if ($num > 0) {

             // Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')

@@ -4796,13 +4796,13 @@ 
             if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {

                 // Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses

                 if (empty(Globals::$conf->global->OVERRIDE_VAT_FOR_EXPENSE_REPORT)) {

-                    $title = ' title="' . $langs->trans('VATIsNotUsed') . '"';

+                    $title = ' title="'.$langs->trans('VATIsNotUsed').'"';

                     $disabled = true;

                 }

             }

 

             if (!$options_only) {

-                $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';

+                $return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';

             }

 

             $selectedfound = false;

@@ -4815,11 +4815,11 @@ 
                 $key = $rate['txtva'];

                 $key .= $rate['nprtva'] ? '*' : '';

                 if ($mode > 0 && $rate['code'])

-                    $key .= ' (' . $rate['code'] . ')';

+                    $key .= ' ('.$rate['code'].')';

                 if ($mode < 0)

                     $key = $rate['rowid'];

 

-                $return .= '<option value="' . $key . '"';

+                $return .= '<option value="'.$key.'"';

                 if (!$selectedfound) {

                     if ($defaultcode) { // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag

                         if ($defaultcode == $rate['code']) {

@@ -4839,7 +4839,7 @@ 
                     $return .= vatrate($rate['label']);

                 }

                 //$return.=($rate['code']?' '.$rate['code']:'');

-                $return .= (empty($rate['code']) && $rate['nprtva']) ? ' *' : '';         // We show the *  (old behaviour only if new vat code is not used)

+                $return .= (empty($rate['code']) && $rate['nprtva']) ? ' *' : ''; // We show the *  (old behaviour only if new vat code is not used)

 

                 $return .= '</option>';

             }

@@ -4938,7 +4938,7 @@ 
         $orig_set_time = $set_time;

 

         if ($set_time === '' && $emptydate == 0) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

             $set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone

         }

 

@@ -4991,36 +4991,36 @@ 
                 //print "e".$set_time." t ".Globals::$conf->format_date_short;

                 if (strval($set_time) != '' && $set_time != -1) {

                     //$formated_date=DolUtils::dol_print_date($set_time,Globals::$conf->format_date_short);

-                    $formated_date = DolUtils::dol_print_date($set_time, $langs->trans("FormatDateShortInput"));  // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $formated_date = DolUtils::dol_print_date($set_time, $langs->trans("FormatDateShortInput")); // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

                 }

 

                 // Calendrier popup version eldy

                 if ($usecalendar == "eldy") {

                     // Zone de saisie manuelle de la date

-                    $retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidth75" maxlength="11" value="' . $formated_date . '"';

+                    $retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

                     $retstring .= ($disabled ? ' disabled' : '');

-                    $retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "';  // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

                     $retstring .= '>';

 

                     // Icone calendrier

                     if (!$disabled) {

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';

-                        $base = DOL_URL_ROOT . '/core/';

-                        $retstring .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

-                        $retstring .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';

+                        $base = DOL_URL_ROOT.'/core/';

+                        $retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';

+                        $retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';

                     } else

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

 

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

                 }

                 elseif ($usecalendar == 'jquery') {

                     if (!$disabled) {

                         // Output javascript for datepicker

                         $retstring .= "<script type='text/javascript'>";

-                        $retstring .= "$(function(){ $('#" . $prefix . "').datepicker({

-							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput") . "',

+                        $retstring .= "$(function(){ $('#".$prefix."').datepicker({

+							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput")."',

 							autoclose: true,

 							todayHighlight: true,";

                         if (!empty(Globals::$conf->dol_use_jmobile)) {

@@ -5043,7 +5043,7 @@ 
                              */

                             $retstring .= "

 								showOn: 'button',

-								buttonImage: '" . DOL_BASE_URI . "/theme/" . Globals::$conf->theme . "/img/object_calendarday.png',

+								buttonImage: '" . DOL_BASE_URI."/theme/".Globals::$conf->theme."/img/object_calendarday.png',

 								buttonImageOnly: true";

                         }

                         $retstring .= "

@@ -5053,9 +5053,9 @@ 
 

                     // Zone de saisie manuelle de la date

                     $retstring .= '<div class="nowrap inline-block">';

-                    $retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidth75" maxlength="11" value="' . $formated_date . '"';

+                    $retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

                     $retstring .= ($disabled ? ' disabled' : '');

-                    $retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "';  // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for DolUtils::dol_print_date / FormatDateShortJavaInput that is same for javascript

                     $retstring .= '>';

 

                     // Icone calendrier

@@ -5070,13 +5070,13 @@ 
                           $retstring.='});';

                           $retstring.="</script>"; */

                     } else {

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

                     }

 

                     $retstring .= '</div>';

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

                 } else {

                     $retstring .= "Bad value of MAIN_POPUP_CALENDAR";

                 }

@@ -5085,26 +5085,26 @@ 
             else {

                 //$retstring.='<div class="inline-block">';

                 // Day

-                $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50imp" id="' . $prefix . 'day" name="' . $prefix . 'day">';

+                $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';

 

                 if ($emptydate || $set_time == -1) {

                     $retstring .= '<option value="0" selected>&nbsp;</option>';

                 }

 

                 for ($day = 1; $day <= 31; $day++) {

-                    $retstring .= '<option value="' . $day . '"' . ($day == $sday ? ' selected' : '') . '>' . $day . '</option>';

+                    $retstring .= '<option value="'.$day.'"'.($day == $sday ? ' selected' : '').'>'.$day.'</option>';

                 }

 

                 $retstring .= "</select>";

 

-                $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'month" name="' . $prefix . 'month">';

+                $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';

                 if ($emptydate || $set_time == -1) {

                     $retstring .= '<option value="0" selected>&nbsp;</option>';

                 }

 

                 // Month

                 for ($month = 1; $month <= 12; $month++) {

-                    $retstring .= '<option value="' . $month . '"' . ($month == $smonth ? ' selected' : '') . '>';

+                    $retstring .= '<option value="'.$month.'"'.($month == $smonth ? ' selected' : '').'>';

                     $retstring .= DolUtils::dol_print_date(mktime(12, 0, 0, $month, 1, 2000), "%b");

                     $retstring .= "</option>";

                 }

@@ -5112,12 +5112,12 @@ 
 

                 // Year

                 if ($emptydate || $set_time == -1) {

-                    $retstring .= '<input' . ($disabled ? ' disabled' : '') . ' placeholder="' . DolUtils::dol_escape_htmltag($langs->trans("Year")) . '" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="' . $prefix . 'year" name="' . $prefix . 'year" value="' . $syear . '">';

+                    $retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.DolUtils::dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';

                 } else {

-                    $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'year" name="' . $prefix . 'year">';

+                    $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';

 

                     for ($year = $syear - 10; $year < $syear + 10; $year++) {

-                        $retstring .= '<option value="' . $year . '"' . ($year == $syear ? ' selected' : '') . '>' . $year . '</option>';

+                        $retstring .= '<option value="'.$year.'"'.($year == $syear ? ' selected' : '').'>'.$year.'</option>';

                     }

                     $retstring .= "</select>\n";

                 }

@@ -5130,13 +5130,13 @@ 
 

         if ($h) {

             // Show hour

-            $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

+            $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'hour' : '').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';

             if ($emptyhours)

                 $retstring .= '<option value="-1">&nbsp;</option>';

             for ($hour = 0; $hour < 24; $hour++) {

                 if (strlen($hour) < 2)

-                    $hour = "0" . $hour;

-                $retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour . (empty(Globals::$conf->dol_optimize_smallscreen) ? '' : 'H') . '</option>';

+                    $hour = "0".$hour;

+                $retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty(Globals::$conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';

             }

             $retstring .= '</select>';

             if ($m && empty(Globals::$conf->dol_optimize_smallscreen))

@@ -5145,17 +5145,17 @@ 
 

         if ($m) {

             // Show minutes

-            $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

+            $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'min' : '').'" id="'.$prefix.'min" name="'.$prefix.'min">';

             if ($emptyhours)

                 $retstring .= '<option value="-1">&nbsp;</option>';

             for ($min = 0; $min < 60; $min++) {

                 if (strlen($min) < 2)

-                    $min = "0" . $min;

-                $retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty(Globals::$conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

+                    $min = "0".$min;

+                $retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty(Globals::$conf->dol_optimize_smallscreen) ? '' : '').'</option>';

             }

             $retstring .= '</select>';

 

-            $retstring .= '<input type="hidden" name="' . $prefix . 'sec" value="' . $ssec . '">';

+            $retstring .= '<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';

         }

 

         // Add a "Now" link

@@ -5164,10 +5164,10 @@ 
             $reset_scripts = "";

 

             // Generate the date part, depending on the use or not of the javascript calendar

-            $reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . DolUtils::dol_print_date(dol_now(), 'day') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . DolUtils::dol_print_date(dol_now(), '%d') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . DolUtils::dol_print_date(dol_now(), '%m') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . DolUtils::dol_print_date(dol_now(), '%Y') . '\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.DolUtils::dol_print_date(dol_now(), 'day').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.DolUtils::dol_print_date(dol_now(), '%d').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.DolUtils::dol_print_date(dol_now(), '%m').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.DolUtils::dol_print_date(dol_now(), '%Y').'\');';

             /* if ($usecalendar == "eldy")

               {

               $base=DOL_URL_ROOT.'/core/';

@@ -5184,7 +5184,7 @@ 
                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . DolUtils::dol_print_date(dol_now(), '%H') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.DolUtils::dol_print_date(dol_now(), '%H').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

@@ -5193,13 +5193,13 @@ 
                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . DolUtils::dol_print_date(dol_now(), '%M') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.DolUtils::dol_print_date(dol_now(), '%M').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty(Globals::$conf->dol_optimize_smallscreen)) {

-                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonNow" type="button" name="_useless" value="now" onClick="' . $reset_scripts . '">';

+                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';

                 $retstring .= $langs->trans("Now");

                 $retstring .= '</button> ';

             }

@@ -5211,15 +5211,15 @@ 
             $reset_scripts = "";

 

             // Generate the date part, depending on the use or not of the javascript calendar

-            $reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . DolUtils::dol_print_date(dol_now(), 'day') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . DolUtils::dol_print_date(dol_now(), '%d') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . DolUtils::dol_print_date(dol_now(), '%m') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . DolUtils::dol_print_date(dol_now(), '%Y') . '\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.DolUtils::dol_print_date(dol_now(), 'day').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.DolUtils::dol_print_date(dol_now(), '%d').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.DolUtils::dol_print_date(dol_now(), '%m').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.DolUtils::dol_print_date(dol_now(), '%Y').'\');';

             // Update the hour part

             if ($h) {

                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . DolUtils::dol_print_date(dol_now(), '%H') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.DolUtils::dol_print_date(dol_now(), '%H').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

@@ -5227,13 +5227,13 @@ 
             if ($m) {

                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . DolUtils::dol_print_date(dol_now(), '%M') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.DolUtils::dol_print_date(dol_now(), '%M').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty(Globals::$conf->dol_optimize_smallscreen)) {

-                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="' . $reset_scripts . '">';

+                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';

                 $retstring .= $langs->trans("DateStartPlusOne");

                 $retstring .= '</button> ';

             }

@@ -5242,7 +5242,7 @@ 
         // Add a "Plus one hour" link

         if (Globals::$conf->use_javascript_ajax && $adddateof) {

             $tmparray = dol_getdate($adddateof);

-            $retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\'' . DolUtils::dol_print_date($adddateof, 'day') . '\');jQuery(\'#reday\').val(\'' . $tmparray['mday'] . '\');jQuery(\'#remonth\').val(\'' . $tmparray['mon'] . '\');jQuery(\'#reyear\').val(\'' . $tmparray['year'] . '\');">' . $langs->trans("DateInvoice") . '</a>';

+            $retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.DolUtils::dol_print_date($adddateof, 'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$langs->trans("DateInvoice").'</a>';

         }

 

         return $retstring;

@@ -5274,29 +5274,29 @@ 
 

         // Hours

         if ($iSecond != '') {

-            require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

             $hourSelected = convertSecondToTime($iSecond, 'allhour');

             $minSelected = convertSecondToTime($iSecond, 'min');

         }

 

         if ($typehour == 'select') {

-            $retstring .= '<select class="flat" id="select_' . $prefix . 'hour" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . '>';

+            $retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';

             for ($hour = 0; $hour < 25; $hour++) { // For a duration, we allow 24 hours

-                $retstring .= '<option value="' . $hour . '"';

+                $retstring .= '<option value="'.$hour.'"';

                 if ($hourSelected == $hour) {

                     $retstring .= " selected";

                 }

-                $retstring .= ">" . $hour . "</option>";

+                $retstring .= ">".$hour."</option>";

             }

             $retstring .= "</select>";

         } elseif ($typehour == 'text' || $typehour == 'textselect') {

-            $retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" size="1" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

+            $retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';

         } else

             return 'BadValueForParameterTypeHour';

 

         if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('HourShort');

+            $retstring .= ' '.$langs->trans('HourShort');

         else

             $retstring .= '<span class="hideonsmartphone">:</span>';

 

@@ -5307,21 +5307,21 @@ 
             $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

 

         if ($typehour == 'select' || $typehour == 'textselect') {

-            $retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

+            $retstring .= '<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').'>';

             for ($min = 0; $min <= 55; $min = $min + 5) {

-                $retstring .= '<option value="' . $min . '"';

+                $retstring .= '<option value="'.$min.'"';

                 if ($minSelected == $min)

                     $retstring .= ' selected';

-                $retstring .= '>' . $min . '</option>';

+                $retstring .= '>'.$min.'</option>';

             }

             $retstring .= "</select>";

         }

         elseif ($typehour == 'text') {

-            $retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" size="1" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

+            $retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';

         }

 

         if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('MinuteShort');

+            $retstring .= ' '.$langs->trans('MinuteShort');

 

         //$retstring.="&nbsp;";

 

@@ -5364,30 +5364,30 @@ 
             }

         }

         if (!is_object($objecttmp)) {

-            dol_syslog('Error bad setup of type for field ' . $InfoFieldList, LOG_WARNING);

-            return 'Error bad setup of type for field ' . join(',', $InfoFieldList);

+            dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);

+            return 'Error bad setup of type for field '.join(',', $InfoFieldList);

         }

 

         $prefixforautocompletemode = $objecttmp->element;

         if ($prefixforautocompletemode == 'societe')

             $prefixforautocompletemode = 'company';

-        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

-        dol_syslog(get_class($this) . "::selectForForms", LOG_DEBUG);

+        dol_syslog(get_class($this)."::selectForForms", LOG_DEBUG);

 

         $out = '';

         if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->$confkeyforautocompletemode) && !$forcecombo) {

-            $objectdesc = $classname . ':' . $classpath;

-            $urlforajaxcall = DOL_URL_ROOT . '/core/ajax/selectobject.php';

+            $objectdesc = $classname.':'.$classpath;

+            $urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';

             //if ($objecttmp->element == 'societe') $urlforajaxcall = DOL_URL_ROOT.'/societe/ajax/company.php';

             // No immediate load of all database

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&objectdesc=' . $objectdesc . ($moreparams ? $moreparams : '');

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.($moreparams ? $moreparams : '');

             // Activate the auto complete using ajax call.

             $out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, Globals::$conf->global->$confkeyforautocompletemode, 0, array());

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

             if ($placeholder)

-                $placeholder = ' placeholder="' . $placeholder . '"';

-            $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $preselectedvalue . '"' . $placeholder . ' />';

+                $placeholder = ' placeholder="'.$placeholder.'"';

+            $out .= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$preselectedvalue.'"'.$placeholder.' />';

         }

         else {

             // Immediate load of all database

@@ -5421,14 +5421,14 @@ 
         $prefixforautocompletemode = $objecttmp->element;

         if ($prefixforautocompletemode == 'societe')

             $prefixforautocompletemode = 'company';

-        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         $fieldstoshow = 't.ref';

         if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields ( like societe, contact, ...)

             $tmpfieldstoshow = '';

             foreach ($objecttmp->fields as $key => $val) {

                 if ($val['showoncombobox'])

-                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

+                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;

             }

             if ($tmpfieldstoshow)

                 $fieldstoshow = $tmpfieldstoshow;

@@ -5440,36 +5440,36 @@ 
         $num = 0;

 

         // Search data

-        $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . MAIN_DB_PREFIX . $objecttmp->table_element . " as t";

+        $sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";

         if ($objecttmp->ismultientitymanaged == 2)

             if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+                $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         $sql .= " WHERE 1=1";

         if (!empty($objecttmp->ismultientitymanaged))

-            $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

+            $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";

         if ($objecttmp->ismultientitymanaged == 1 && !empty($user->societe_id)) {

             if ($objecttmp->element == 'societe')

-                $sql .= " AND t.rowid = " . $user->societe_id;

+                $sql .= " AND t.rowid = ".$user->societe_id;

             else

-                $sql .= " AND t.fk_soc = " . $user->societe_id;

+                $sql .= " AND t.fk_soc = ".$user->societe_id;

         }

         if ($searchkey != '')

             $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

         if ($objecttmp->ismultientitymanaged == 2)

             if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

         $sql .= $this->db->order($fieldstoshow, "ASC");

         //$sql.=$this->db->plimit($limit, 0);

         // Build output string

         $resql = $this->db->query($sql);

         if ($resql) {

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, null, Globals::$conf->global->$confkeyforautocompletemode);

             }

 

             // Construct $out and $outarray

-            $out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparams ? ' ' . $moreparams : '') . ' name="' . $htmlname . '">' . "\n";

+            $out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";

 

             // Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4

             $textifempty = '&nbsp;';

@@ -5482,7 +5482,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+                $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -5493,13 +5493,13 @@ 
                     $tmparray = explode(',', $fieldstoshow);

                     foreach ($tmparray as $key => $val) {

                         $val = preg_replace('/t\./', '', $val);

-                        $label .= (($label && $obj->$val) ? ' - ' : '') . $obj->$val;

+                        $label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;

                     }

                     if (empty($outputmode)) {

                         if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

                         } else {

-                            $out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

                         }

                     } else {

                         array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label));

@@ -5511,7 +5511,7 @@ 
                 }

             }

 

-            $out .= '</select>' . "\n";

+            $out .= '</select>'."\n";

         }

         else {

             DolUtils::dol_print_error($this->db);

@@ -5567,12 +5567,12 @@ 
             $tmpplugin = empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) ? (constant('REQUIRE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : 'select2') : Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT;

 

             // Enhance with select2

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

         }

 

-        $out .= '<select id="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($disabled ? 'disabled ' : '') . 'class="flat ' . (preg_replace('/^\./', '', $htmlname)) . ($morecss ? ' ' . $morecss : '') . '"';

-        $out .= ' name="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($moreparam ? $moreparam : '');

+        $out .= '<select id="'.preg_replace('/^\./', '', $htmlname).'" '.($disabled ? 'disabled ' : '').'class="flat '.(preg_replace('/^\./', '', $htmlname)).($morecss ? ' '.$morecss : '').'"';

+        $out .= ' name="'.preg_replace('/^\./', '', $htmlname).'" '.($moreparam ? $moreparam : '');

         $out .= '>';

 

         if ($show_empty) {

@@ -5581,7 +5581,7 @@ 
                 $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

             if (!is_numeric($show_empty))

                 $textforempty = $show_empty;

-            $out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

+            $out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";

         }

 

         if (is_array($array)) {

@@ -5611,9 +5611,9 @@ 
 

                 if ($key_in_label) {

                     if (empty($nohtmlescape))

-                        $selectOptionValue = DolUtils::dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

+                        $selectOptionValue = DolUtils::dol_escape_htmltag($key.' - '.($maxlen ? dol_trunc($value, $maxlen) : $value));

                     else

-                        $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

+                        $selectOptionValue = $key.' - '.($maxlen ? dol_trunc($value, $maxlen) : $value);

                 }

                 else {

                     if (empty($nohtmlescape))

@@ -5624,12 +5624,12 @@ 
                         $selectOptionValue = '&nbsp;';

                 }

 

-                $out .= '<option value="' . $key . '"';

-                $out .= $style . $disabled;

+                $out .= '<option value="'.$key.'"';

+                $out .= $style.$disabled;

                 if ($id != '' && $id == $key && !$disabled)

-                    $out .= ' selected';  // To preselect a value

+                    $out .= ' selected'; // To preselect a value

                 if ($nohtmlescape)

-                    $out .= ' data-html="' . DolUtils::dol_escape_htmltag($selectOptionValue) . '"';

+                    $out .= ' data-html="'.DolUtils::dol_escape_htmltag($selectOptionValue).'"';

                 $out .= '>';

                 //var_dump($selectOptionValue);

                 $out .= $selectOptionValue;

@@ -5668,19 +5668,19 @@ 
         if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

             return '';

 

-        $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

+        $out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';

 

         $tmpplugin = 'select2';

-        $outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+        $outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 	    	<script type="text/javascript">

 	    	$(document).ready(function () {

 

-    	        ' . ($callurlonselect ? 'var saveRemoteData = [];' : '') . '

+    	        ' . ($callurlonselect ? 'var saveRemoteData = [];' : '').'

 

-                $(".' . $htmlname . '").select2({

+                $(".' . $htmlname.'").select2({

 			    	ajax: {

 				    	dir: "ltr",

-				    	url: "' . $url . '",

+				    	url: "' . $url.'",

 				    	dataType: \'json\',

 				    	delay: 250,

 				    	data: function (params) {

@@ -5707,9 +5707,9 @@ 
 			    	},

 	 				language: select2arrayoflanguage,

 					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-				    placeholder: "' . dol_escape_js($placeholder) . '",

+				    placeholder: "' . dol_escape_js($placeholder).'",

 			    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-			    	minimumInputLength: ' . $minimumInputLength . ',

+			    	minimumInputLength: ' . $minimumInputLength.',

 			        formatResult: function(result, container, query, escapeMarkup) {

                         return escapeMarkup(result.text);

                     },

@@ -5717,10 +5717,10 @@ 
 

                 ' . ($callurlonselect ? '

                 /* Code to execute a GET when we select a value */

-                $(".' . $htmlname . '").change(function() {

-			    	var selected = $(".' . $htmlname . '").val();

+                $(".' . $htmlname.'").change(function() {

+			    	var selected = $(".' . $htmlname.'").val();

                 	console.log("We select in selectArrayAjax the entry "+selected)

-			        $(".' . $htmlname . '").val("");  /* reset visible combo value */

+			        $(".' . $htmlname.'").val("");  /* reset visible combo value */

     			    $.each( saveRemoteData, function( key, value ) {

     				        if (key == selected)

     			            {

@@ -5728,7 +5728,7 @@ 
     			                 location.assign(value.url);

     			            }

                     });

-    			});' : '' ) . '

+    			});' : '').'

 

     	   });

 	       </script>';

@@ -5768,7 +5768,7 @@ 
         if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

             return '';

 

-        $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"><option></option></select>';

+        $out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"><option></option></select>';

 

         $formattedarrayresult = array();

 

@@ -5781,20 +5781,20 @@ 
         }

 

         $tmpplugin = 'select2';

-        $outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+        $outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 			<script type="text/javascript">

 			$(document).ready(function () {

-				var data = ' . json_encode($formattedarrayresult) . ';

+				var data = ' . json_encode($formattedarrayresult).';

 

-				' . ($callurlonselect ? 'var saveRemoteData = ' . json_encode($array) . ';' : '') . '

+				' . ($callurlonselect ? 'var saveRemoteData = '.json_encode($array).';' : '').'

 

-				$(".' . $htmlname . '").select2({

+				$(".' . $htmlname.'").select2({

 					data: data,

 					language: select2arrayoflanguage,

 					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-					placeholder: "' . dol_escape_js($placeholder) . '",

+					placeholder: "' . dol_escape_js($placeholder).'",

 					escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-					minimumInputLength: ' . $minimumInputLength . ',

+					minimumInputLength: ' . $minimumInputLength.',

 					formatResult: function(result, container, query, escapeMarkup) {

 						return escapeMarkup(result.text);

 					},

@@ -5832,11 +5832,11 @@ 
 

 				' . ($callurlonselect ? '

 				/* Code to execute a GET when we select a value */

-				$(".' . $htmlname . '").change(function() {

-					var selected = $(".' . $htmlname . '").val();

+				$(".' . $htmlname.'").change(function() {

+					var selected = $(".' . $htmlname.'").val();

 					console.log("We select "+selected)

 

-					$(".' . $htmlname . '").val("");  /* reset visible combo value */

+					$(".' . $htmlname.'").val("");  /* reset visible combo value */

 					$.each( saveRemoteData, function( key, value ) {

 						if (key == selected)

 						{

@@ -5844,7 +5844,7 @@ 
 							location.assign(value.url);

 						}

 					});

-				});' : '' ) . '

+				});' : '').'

 

 			});

 			</script>';

@@ -5884,28 +5884,28 @@ 
 

         // Add code for jquery to use multiselect

         if (!empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {

-            $out .= "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+            $out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 						<script type="text/javascript">' . "\n";

             if ($addjscombo == 1) {

                 $tmpplugin = empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT;

-                $out .= 'function formatResult(record) {' . "\n";

+                $out .= 'function formatResult(record) {'."\n";

                 if ($elemtype == 'category') {

-                    $out .= '	//return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> <a href="' . DOL_URL_ROOT . '/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

-									  	return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> \'+record.text+\'</span>\';';

+                    $out .= '	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

+									  	return \'<span><img src="' . DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';

                 } else {

                     $out .= 'return record.text;';

                 }

-                $out .= '};' . "\n";

-                $out .= 'function formatSelection(record) {' . "\n";

+                $out .= '};'."\n";

+                $out .= 'function formatSelection(record) {'."\n";

                 if ($elemtype == 'category') {

-                    $out .= '	//return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> <a href="' . DOL_URL_ROOT . '/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

-									  	return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> \'+record.text+\'</span>\';';

+                    $out .= '	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

+									  	return \'<span><img src="' . DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';

                 } else {

                     $out .= 'return record.text;';

                 }

-                $out .= '};' . "\n";

+                $out .= '};'."\n";

                 $out .= '$(document).ready(function () {

-							$(\'#' . $htmlname . '\').' . $tmpplugin . '({

+							$(\'#' . $htmlname.'\').'.$tmpplugin.'({

 								dir: \'ltr\',

 								// Specify format function for dropdown item

 								formatResult: formatResult,

@@ -5919,13 +5919,13 @@ 
                 // Add other js lib

                 // ...

                 $out .= '$(document).ready(function () {

-							$(\'#' . $htmlname . '\').multiSelect({

+							$(\'#' . $htmlname.'\').multiSelect({

 								containerHTML: \'<div class="multi-select-container">\',

 								menuHTML: \'<div class="multi-select-menu">\',

-								buttonHTML: \'<span class="multi-select-button ' . $morecss . '">\',

+								buttonHTML: \'<span class="multi-select-button ' . $morecss.'">\',

 								menuItemHTML: \'<label class="multi-select-menuitem">\',

 								activeClass: \'multi-select-container--open\',

-								noneText: \'' . $placeholder . '\'

+								noneText: \'' . $placeholder.'\'

 							});

 						})';

             }

@@ -5934,27 +5934,27 @@ 
 

         // Try also magic suggest

 

-        $out .= '<select id="' . $htmlname . '" class="multiselect' . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

+        $out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";

         if (is_array($array) && !empty($array)) {

             if ($value_as_key)

                 $array = array_combine($array, $array);

 

             if (!empty($array)) {

                 foreach ($array as $key => $value) {

-                    $out .= '<option value="' . $key . '"';

+                    $out .= '<option value="'.$key.'"';

                     if (is_array($selected) && !empty($selected) && in_array($key, $selected) && !empty($key)) {

                         $out .= ' selected';

                     }

                     $out .= '>';

 

                     $newval = ($translate ? $langs->trans($value) : $value);

-                    $newval = ($key_in_label ? $key . ' - ' . $newval : $newval);

+                    $newval = ($key_in_label ? $key.' - '.$newval : $newval);

                     $out .= dol_htmlentitiesbr($newval);

-                    $out .= '</option>' . "\n";

+                    $out .= '</option>'."\n";

                 }

             }

         }

-        $out .= '</select>' . "\n";

+        $out .= '</select>'."\n";

 

         return $out;

     }

@@ -5975,7 +5975,7 @@ 
         if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

             return '';

 

-        $tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage;

+        $tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;

         if (!empty($user->conf->$tmpvar)) {

             $tmparray = explode(',', $user->conf->$tmpvar);

             foreach ($array as $key => $val) {

@@ -5997,28 +5997,28 @@ 
               var_dump(array_key_exists('enabled', $val));

               var_dump(!$val['enabled']); */

             if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {

-                unset($array[$key]);     // We don't want this field

+                unset($array[$key]); // We don't want this field

                 continue;

             }

             if ($val['label']) {

-                $lis .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . (empty($val['checked']) ? '' : ' checked="checked"') . '/><label for="checkbox' . $key . '">' . DolUtils::dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';

-                $listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');

+                $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.DolUtils::dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';

+                $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');

             }

         }

 

-        $out = '<!-- Component multiSelectArrayWithCheckbox ' . $htmlname . ' -->

+        $out = '<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->

 

         <dl class="dropdown">

             <dt>

             <a href="#">

-              ' . img_picto('', 'list') . '

+              ' . img_picto('', 'list').'

             </a>

-            <input type="hidden" class="' . $htmlname . '" name="' . $htmlname . '" value="' . $listcheckedstring . '">

+            <input type="hidden" class="' . $htmlname.'" name="'.$htmlname.'" value="'.$listcheckedstring.'">

             </dt>

             <dd class="dropdowndd">

-                <div class="multiselectcheckbox' . $htmlname . '">

-                    <ul class="ul' . $htmlname . '">

-                    ' . $lis . '

+                <div class="multiselectcheckbox' . $htmlname.'">

+                    <ul class="ul' . $htmlname.'">

+                    ' . $lis.'

                     </ul>

                 </div>

             </dd>

@@ -6026,15 +6026,15 @@ 
 

         <script type="text/javascript">

           jQuery(document).ready(function () {

-              $(\'.multiselectcheckbox' . $htmlname . ' input[type="checkbox"]\').on(\'click\', function () {

+              $(\'.multiselectcheckbox' . $htmlname.' input[type="checkbox"]\').on(\'click\', function () {

                   console.log("A new field was added/removed")

                   $("input:hidden[name=formfilteraction]").val(\'listafterchangingselectedfields\')

                   var title = $(this).val() + ",";

                   if ($(this).is(\':checked\')) {

-                      $(\'.' . $htmlname . '\').val(title + $(\'.' . $htmlname . '\').val());

+                      $(\'.' . $htmlname.'\').val(title + $(\'.'.$htmlname.'\').val());

                   }

                   else {

-                      $(\'.' . $htmlname . '\').val( $(\'.' . $htmlname . '\').val().replace(title, \'\') )

+                      $(\'.' . $htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )

                   }

                   // Now, we submit page

                   $(this).parents(\'form:first\').submit();

@@ -6058,7 +6058,7 @@ 
     {

         global $db;

 

-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 

         $cat = new Categorie($db);

         $categories = $cat->containing($id, $type);

@@ -6066,12 +6066,12 @@ 
         if ($rendermode == 1) {

             $toprint = array();

             foreach ($categories as $c) {

-                $ways = $c->print_all_ways();       // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

+                $ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

                 foreach ($ways as $way) {

-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';

+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';

                 }

             }

-            return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+            return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

         }

 

         if ($rendermode == 0) {

@@ -6107,7 +6107,7 @@ 
             'morehtmlright' => $morehtmlright,

             'compatibleImportElementsList' => & $compatibleImportElementsList,

         );

-        $reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

 

         if (empty($reshook)) {

             $nbofdifferenttypes = count($object->linkedObjects);

@@ -6117,15 +6117,15 @@ 
 

 

             print '<div class="div-table-responsive-no-min">';

-            print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="' . $object->element . '"  data-elementid="' . $object->id . '"   >';

+            print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="'.$object->element.'"  data-elementid="'.$object->id.'"   >';

 

             print '<tr class="liste_titre">';

-            print '<td>' . $langs->trans("Type") . '</td>';

-            print '<td>' . $langs->trans("Ref") . '</td>';

+            print '<td>'.$langs->trans("Type").'</td>';

+            print '<td>'.$langs->trans("Ref").'</td>';

             print '<td align="center"></td>';

-            print '<td align="center">' . $langs->trans("Date") . '</td>';

-            print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';

-            print '<td align="right">' . $langs->trans("Status") . '</td>';

+            print '<td align="center">'.$langs->trans("Date").'</td>';

+            print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';

+            print '<td align="right">'.$langs->trans("Status").'</td>';

             print '<td></td>';

             print '</tr>';

 

@@ -6143,13 +6143,13 @@ 
                 if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {

                     $element = $regs[1];

                     $subelement = $regs[2];

-                    $tplpath = $element . '/' . $subelement;

+                    $tplpath = $element.'/'.$subelement;

                 }

                 $tplname = 'linkedobjectblock';

 

                 // To work with non standard path

                 if ($objecttype == 'facture') {

-                    $tplpath = 'compta/' . $element;

+                    $tplpath = 'compta/'.$element;

                     if (empty(Globals::$conf->facture->enabled))

                         continue; // Do not show if module disabled

                 }

@@ -6160,7 +6160,7 @@ 
                         continue; // Do not show if module disabled

                 }

                 else if ($objecttype == 'propal') {

-                    $tplpath = 'comm/' . $element;

+                    $tplpath = 'comm/'.$element;

                     if (empty(Globals::$conf->propal->enabled))

                         continue; // Do not show if module disabled

                 }

@@ -6198,14 +6198,14 @@ 
 

 

                 // Output template part (modules that overwrite templates must declare this into descriptor)

-                $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/' . $tplpath . '/tpl'));

+                $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));

                 foreach ($dirtpls as $reldir) {

                     if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {    // No more type to show after

                         global $noMoreLinkedObjectBlockAfter;

                         $noMoreLinkedObjectBlockAfter = 1;

                     }

 

-                    $res = @include dol_buildpath($reldir . '/' . $tplname . '.tpl.php');

+                    $res = @include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');

                     if ($res) {

                         $nboftypesoutput++;

                         break;

@@ -6214,7 +6214,7 @@ 
             }

 

             if (!$nboftypesoutput) {

-                print '<tr><td class="impair opacitymedium" colspan="7">' . $langs->trans("None") . '</td></tr>';

+                print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';

             }

 

             print '</table>';

@@ -6254,26 +6254,26 @@ 
         if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

             $listofidcompanytoscan = $object->thirdparty->id;

             if (($object->thirdparty->parent > 0) && !empty(Globals::$conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO))

-                $listofidcompanytoscan .= ',' . $object->thirdparty->parent;

+                $listofidcompanytoscan .= ','.$object->thirdparty->parent;

             if (($object->fk_project > 0) && !empty(Globals::$conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {

-                include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                 $tmpproject = new Project($this->db);

                 $tmpproject->fetch($object->fk_project);

                 if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id))

-                    $listofidcompanytoscan .= ',' . $tmpproject->socid;

+                    $listofidcompanytoscan .= ','.$tmpproject->socid;

                 unset($tmpproject);

             }

 

             $possiblelinks = array(

-                'propal' => array('enabled' => Globals::$conf->propal->enabled, 'perms' => 1, 'label' => 'LinkToProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('propal') . ')'),

-                'order' => array('enabled' => Globals::$conf->commande->enabled, 'perms' => 1, 'label' => 'LinkToOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('commande') . ')'),

-                'invoice' => array('enabled' => Globals::$conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-                'invoice_template' => array('enabled' => Globals::$conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToTemplateInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-                'contrat' => array('enabled' => Globals::$conf->contrat->enabled, 'perms' => 1, 'label' => 'LinkToContract', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('contract') . ')'),

-                'fichinter' => array('enabled' => Globals::$conf->ficheinter->enabled, 'perms' => 1, 'label' => 'LinkToIntervention', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('intervention') . ')'),

-                'supplier_proposal' => array('enabled' => Globals::$conf->supplier_proposal->enabled, 'perms' => 1, 'label' => 'LinkToSupplierProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('supplier_proposal') . ')'),

-                'order_supplier' => array('enabled' => Globals::$conf->supplier_order->enabled, 'perms' => 1, 'label' => 'LinkToSupplierOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('commande_fournisseur') . ')'),

-                'invoice_supplier' => array('enabled' => Globals::$conf->supplier_invoice->enabled, 'perms' => 1, 'label' => 'LinkToSupplierInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('facture_fourn') . ')')

+                'propal' => array('enabled' => Globals::$conf->propal->enabled, 'perms' => 1, 'label' => 'LinkToProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),

+                'order' => array('enabled' => Globals::$conf->commande->enabled, 'perms' => 1, 'label' => 'LinkToOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),

+                'invoice' => array('enabled' => Globals::$conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+                'invoice_template' => array('enabled' => Globals::$conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToTemplateInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+                'contrat' => array('enabled' => Globals::$conf->contrat->enabled, 'perms' => 1, 'label' => 'LinkToContract', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),

+                'fichinter' => array('enabled' => Globals::$conf->ficheinter->enabled, 'perms' => 1, 'label' => 'LinkToIntervention', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),

+                'supplier_proposal' => array('enabled' => Globals::$conf->supplier_proposal->enabled, 'perms' => 1, 'label' => 'LinkToSupplierProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),

+                'order_supplier' => array('enabled' => Globals::$conf->supplier_order->enabled, 'perms' => 1, 'label' => 'LinkToSupplierOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

+                'invoice_supplier' => array('enabled' => Globals::$conf->supplier_invoice->enabled, 'perms' => 1, 'label' => 'LinkToSupplierInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')

             );

         }

 

@@ -6282,7 +6282,7 @@ 
         // Can complete the possiblelink array

         $hookmanager->initHooks(array('commonobject'));

         $parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);

-        $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

         if (empty($reshook)) {

             if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {

                 $possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);

@@ -6300,7 +6300,7 @@ 
                 continue;

 

             if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

-                print '<div id="' . $key . 'list"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '') . '>';

+                print '<div id="'.$key.'list"'.(empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '').'>';

                 $sql = $possiblelink['sql'];

 

                 $resqllist = $this->db->query($sql);

@@ -6308,34 +6308,34 @@ 
                     $num = $this->db->num_rows($resqllist);

                     $i = 0;

 

-                    print '<br><form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="formlinked' . $key . '">';

-                    print '<input type="hidden" name="id" value="' . $object->id . '">';

+                    print '<br><form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formlinked'.$key.'">';

+                    print '<input type="hidden" name="id" value="'.$object->id.'">';

                     print '<input type="hidden" name="action" value="addlink">';

-                    print '<input type="hidden" name="addlink" value="' . $key . '">';

+                    print '<input type="hidden" name="addlink" value="'.$key.'">';

                     print '<table class="noborder">';

                     print '<tr class="liste_titre">';

                     print '<td class="nowrap"></td>';

-                    print '<td align="center">' . $langs->trans("Ref") . '</td>';

-                    print '<td align="left">' . $langs->trans("RefCustomer") . '</td>';

-                    print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';

-                    print '<td align="left">' . $langs->trans("Company") . '</td>';

+                    print '<td align="center">'.$langs->trans("Ref").'</td>';

+                    print '<td align="left">'.$langs->trans("RefCustomer").'</td>';

+                    print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';

+                    print '<td align="left">'.$langs->trans("Company").'</td>';

                     print '</tr>';

                     while ($i < $num) {

                         $objp = $this->db->fetch_object($resqllist);

 

                         print '<tr class="oddeven">';

                         print '<td aling="left">';

-                        print '<input type="radio" name="idtolinkto" value=' . $objp->rowid . '>';

+                        print '<input type="radio" name="idtolinkto" value='.$objp->rowid.'>';

                         print '</td>';

-                        print '<td align="center">' . $objp->ref . '</td>';

-                        print '<td>' . $objp->ref_client . '</td>';

-                        print '<td align="right">' . price($objp->total_ht) . '</td>';

-                        print '<td>' . $objp->name . '</td>';

+                        print '<td align="center">'.$objp->ref.'</td>';

+                        print '<td>'.$objp->ref_client.'</td>';

+                        print '<td align="right">'.price($objp->total_ht).'</td>';

+                        print '<td>'.$objp->name.'</td>';

                         print '</tr>';

                         $i++;

                     }

                     print '</table>';

-                    print '<div class="center"><input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';

+                    print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></div>';

 

                     print '</form>';

                     $this->db->free($resqllist);

@@ -6349,20 +6349,20 @@ 
 

                 //$linktoelem.=($linktoelem?' &nbsp; ':'');

                 if ($num > 0)

-                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

+                    $linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';

                 //else $linktoelem.=$langs->trans($possiblelink['label']);

                 else

-                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

+                    $linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';

             }

         }

 

         if ($linktoelemlist) {

             $linktoelem = '

     		<dl class="dropdown" id="linktoobjectname">

-    		<dt><a href="#linktoobjectname">' . $langs->trans("LinkTo") . '...</a></dt>

+    		<dt><a href="#linktoobjectname">' . $langs->trans("LinkTo").'...</a></dt>

     		<dd>

     		<div class="multiselectlinkto">

-    		<ul class="ulselectedfields">' . $linktoelemlist . '

+    		<ul class="ulselectedfields">' . $linktoelemlist.'

     		</ul>

     		</div>

     		</dd>

@@ -6409,18 +6409,18 @@ 
 

         $disabled = ($disabled ? ' disabled' : '');

 

-        $resultyesno = '<select class="flat width75" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

+        $resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";

         if ($useempty)

-            $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+            $resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";

         if (("$value" == 'yes') || ($value == 1)) {

-            $resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans("Yes") . '</option>' . "\n";

-            $resultyesno .= '<option value="' . $no . '">' . $langs->trans("No") . '</option>' . "\n";

+            $resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";

+            $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";

         } else {

             $selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');

-            $resultyesno .= '<option value="' . $yes . '">' . $langs->trans("Yes") . '</option>' . "\n";

-            $resultyesno .= '<option value="' . $no . '"' . $selected . '>' . $langs->trans("No") . '</option>' . "\n";

+            $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";

+            $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";

         }

-        $resultyesno .= '</select>' . "\n";

+        $resultyesno .= '</select>'."\n";

         return $resultyesno;

     }

 

@@ -6438,12 +6438,12 @@ 
     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "export_model";

-        $sql .= " WHERE type = '" . $type . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";

+        $sql .= " WHERE type = '".$type."'";

         $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result) {

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($useempty) {

                 print '<option value="-1">&nbsp;</option>';

             }

@@ -6453,9 +6453,9 @@ 
             while ($i < $num) {

                 $obj = $this->db->fetch_object($result);

                 if ($selected == $obj->rowid) {

-                    print '<option value="' . $obj->rowid . '" selected>';

+                    print '<option value="'.$obj->rowid.'" selected>';

                 } else {

-                    print '<option value="' . $obj->rowid . '">';

+                    print '<option value="'.$obj->rowid.'">';

                 }

                 print $obj->label;

                 print '</option>';

@@ -6498,7 +6498,7 @@ 
         // Add where from hooks

         if (is_object($hookmanager)) {

             $parameters = array();

-            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object);    // Note that $action and $object may have been modified by hook

+            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook

             $object->next_prev_filter .= $hookmanager->resPrint;

         }

         $previous_ref = $next_ref = '';

@@ -6524,8 +6524,8 @@ 
                 $stringforfirstkey .= ' CTL +';

             }

 

-            $previous_ref = $object->ref_previous ? '<a accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_previous) . $moreparam . '"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

-            $next_ref = $object->ref_next ? '<a accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_next) . $moreparam . '"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

+            $previous_ref = $object->ref_previous ? '<a accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

+            $next_ref = $object->ref_next ? '<a accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

         }

 

         //print "xx".$previous_ref."x".$next_ref;

@@ -6533,30 +6533,30 @@ 
 

         // Right part of banner

         if ($morehtmlright)

-            $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

+            $ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';

 

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '<div class="pagination paginationref"><ul class="right">';

         }

         if ($morehtml) {

-            $ret .= '<li class="noborder litext">' . $morehtml . '</li>';

+            $ret .= '<li class="noborder litext">'.$morehtml.'</li>';

         }

         if ($shownav && ($previous_ref || $next_ref)) {

-            $ret .= '<li class="pagination">' . $previous_ref . '</li>';

-            $ret .= '<li class="pagination">' . $next_ref . '</li>';

+            $ret .= '<li class="pagination">'.$previous_ref.'</li>';

+            $ret .= '<li class="pagination">'.$next_ref.'</li>';

         }

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '</ul></div>';

         }

 

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook

         if (empty($reshook))

             $morehtmlstatus .= $hookmanager->resPrint;

         else

             $morehtmlstatus = $hookmanager->resPrint;

         if ($morehtmlstatus)

-            $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

+            $ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';

 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook

@@ -6568,29 +6568,29 @@ 
         // Left part of banner

         if ($morehtmlleft) {

             if (Globals::$conf->browser->layout == 'phone')

-                $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';    // class="center" to have photo in middle

+                $ret .= '<div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle

             else

-                $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';

+                $ret .= '<div class="inline-block floatleft">'.$morehtmlleft.'</div>';

         }

 

         //if (Globals::$conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

-        $ret .= '<div class="inline-block floatleft valignmiddle refid' . (($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '') . '">';

+        $ret .= '<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '').'">';

 

         // For thirdparty, contact, user, member, the ref is the id, so we show something else

         if ($object->element == 'societe') {

             $ret .= dol_htmlentities($object->name);

         } else if ($object->element == 'member') {

-            $ret .= $object->ref . '<br>';

+            $ret .= $object->ref.'<br>';

             $fullname = $object->getFullName($langs);

             if ($object->morphy == 'mor' && $object->societe) {

-                $ret .= dol_htmlentities($object->societe) . ((!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . ')' : '');

+                $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : '');

             } else {

-                $ret .= dol_htmlentities($fullname) . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '');

+                $ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');

             }

         } else if (in_array($object->element, array('contact', 'user', 'usergroup'))) {

             $ret .= dol_htmlentities($object->getFullName($langs));

         } else if (in_array($object->element, array('action', 'agenda'))) {

-            $ret .= $object->ref . '<br>' . $object->label;

+            $ret .= $object->ref.'<br>'.$object->label;

         } else if (in_array($object->element, array('adherent_type'))) {

             $ret .= $object->label;

         } else if ($object->element == 'ecm_directories') {

@@ -6600,7 +6600,7 @@ 
 

 

         if ($morehtmlref) {

-            $ret .= ' ' . $morehtmlref;

+            $ret .= ' '.$morehtmlref;

         }

         $ret .= '</div>';

 

@@ -6633,9 +6633,9 @@ 
         }

 

         // Barcode image

-        $url = DOL_URL_ROOT . '/viewimage.php?modulepart=barcode&generator=' . urlencode($object->barcode_type_coder) . '&code=' . urlencode($object->barcode) . '&encoding=' . urlencode($object->barcode_type_code);

-        $out = '<!-- url barcode = ' . $url . ' -->';

-        $out .= '<img src="' . $url . '">';

+        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);

+        $out = '<!-- url barcode = '.$url.' -->';

+        $out .= '<img src="'.$url.'">';

         return $out;

     }

 

@@ -6670,46 +6670,46 @@ 
             $dir = Globals::$conf->societe->multidir_output[$entity];

             if (!empty($object->logo)) {

                 if ((string) $imagesize == 'mini') {

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs

+                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs

                 } else {

                     if ((string) $imagesize == 'small') {

-                        $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');

+                        $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');

                     } else {

-                        $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

+                        $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

                     }

                 }

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

             }

             $email = $object->email;

         } else if ($modulepart == 'contact') {

-            $dir = Globals::$conf->societe->multidir_output[$entity] . '/contact';

+            $dir = Globals::$conf->societe->multidir_output[$entity].'/contact';

             if (!empty($object->photo)) {

                 if ((string) $imagesize == 'mini') {

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');

                 } else if ((string) $imagesize == 'small') {

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');

                 } else {

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

                 }

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

             }

             $email = $object->email;

             $capture = 'user';

         } else {

             if ($modulepart == 'userphoto') {

-                $dir = Globals::$conf->user->dir_output ?? (DOL_BASE_URI . '/users');

+                $dir = Globals::$conf->user->dir_output ?? (DOL_BASE_URI.'/users');

                 if (!empty($object->photo)) {

                     if ((string) $imagesize == 'mini') {

-                        $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');

+                        $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');

                     } else if ((string) $imagesize == 'small') {

-                        $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');

+                        $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');

                     } else {

-                        $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

+                        $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

                     }

-                    $originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

+                    $originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

                 }

                 if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS)) {

-                    $altfile = $object->id . ".jpg"; // For backward compatibility

+                    $altfile = $object->id.".jpg"; // For backward compatibility

                 }

                 $email = $object->email;

                 $capture = 'user';

@@ -6718,15 +6718,15 @@ 
                     $dir = Globals::$conf->adherent->dir_output;

                     if (!empty($object->photo)) {

                         if ((string) $imagesize == 'mini')

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

+                            $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');

                         else if ((string) $imagesize == 'small')

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

+                            $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');

                         else

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

-                        $originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

+                            $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

+                        $originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

                     }

                     if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS))

-                        $altfile = $object->id . ".jpg"; // For backward compatibility

+                        $altfile = $object->id.".jpg"; // For backward compatibility

                     $email = $object->email;

                     $capture = 'user';

                 }

@@ -6735,15 +6735,15 @@ 
                     $dir = Globals::$conf->$modulepart->dir_output;

                     if (!empty($object->photo)) {

                         if ((string) $imagesize == 'mini')

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

+                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');

                         else if ((string) $imagesize == 'small')

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

+                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');

                         else

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

-                        $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

+                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

+                        $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

                     }

                     if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS))

-                        $altfile = $object->id . ".jpg"; // For backward compatibility

+                        $altfile = $object->id.".jpg"; // For backward compatibility

                     $email = $object->email;

                 }

             }

@@ -6752,27 +6752,27 @@ 
             $capture = $forcecapture;

 

         if ($dir) {

-            if ($file && file_exists($dir . "/" . $file)) {

+            if ($file && file_exists($dir."/".$file)) {

                 if ($addlinktofullsize) {

-                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

+                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

                     if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

+                        $ret .= '<a href="'.$urladvanced.'">';

                     else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                        $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

                 }

-                $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

+                $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';

                 if ($addlinktofullsize)

                     $ret .= '</a>';

             }

-            else if ($altfile && file_exists($dir . "/" . $altfile)) {

+            else if ($altfile && file_exists($dir."/".$altfile)) {

                 if ($addlinktofullsize) {

-                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

+                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

                     if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

+                        $ret .= '<a href="'.$urladvanced.'">';

                     else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                        $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

                 }

-                $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

+                $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';

                 if ($addlinktofullsize)

                     $ret .= '</a>';

             }

@@ -6796,10 +6796,10 @@ 
                     $ret .= '<!-- Put link to gravatar -->';

                     //$defaultimg=urlencode(dol_buildpath($nophoto,3));

                     $defaultimg = 'mm';

-                    $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Gravatar avatar" title="' . $email . ' Gravatar avatar" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="https://www.gravatar.com/avatar/' . dol_hash(strtolower(trim($email)), 3) . '?s=' . $width . '&d=' . $defaultimg . '">'; // gravatar need md5 hash

+                    $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)), 3).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash

                 } else {

                     //$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . $nophoto . '">';

-                    $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '">';

+                    $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'">';

                 }

             }

 

@@ -6809,13 +6809,13 @@ 
                 }

                 $ret .= '<table class="nobordernopadding centpercent">';

                 if ($object->photo) {

-                    $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> ' . $langs->trans("Delete") . '<br><br></td></tr>';

+                    $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';

                 }

-                $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"' . ($capture ? ' capture="' . $capture . '"' : '') . '></td></tr>';

+                $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';

                 $ret .= '</table>';

             }

         } else

-            DolUtils::dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);

+            DolUtils::dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);

 

         return $ret;

     }

@@ -6858,37 +6858,37 @@ 
         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= ", e.label";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup as ug ";

+        $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";

         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=ug.entity";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";

             if ($force_entity)

-                $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";

+                $sql .= " WHERE ug.entity IN (0,".$force_entity.")";

             else

                 $sql .= " WHERE ug.entity IS NOT NULL";

         }

         else {

-            $sql .= " WHERE ug.entity IN (0," . Globals::$conf->entity . ")";

+            $sql .= " WHERE ug.entity IN (0,".Globals::$conf->entity.")";

         }

         if (is_array($exclude) && $excludeGroups)

-            $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";

+            $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";

         if (is_array($include) && $includeGroups)

-            $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";

+            $sql .= " AND ug.rowid IN ('".$includeGroups."')";

         $sql .= " ORDER BY ug.nom ASC";

 

-        dol_syslog(get_class($this) . "::select_dolgroups", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             // Enhance with select2

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

-            $out .= '<select class="flat minwidth200" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

+            $out .= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

 

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

                 if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                    $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";

 

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

@@ -6896,17 +6896,17 @@ 
                     if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

                         $disableline = 1;

 

-                    $out .= '<option value="' . $obj->rowid . '"';

+                    $out .= '<option value="'.$obj->rowid.'"';

                     if ($disableline)

                         $out .= ' disabled';

-                    if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected) )) {

+                    if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected))) {

                         $out .= ' selected';

                     }

                     $out .= '>';

 

                     $out .= $obj->name;

                     if (!empty(Globals::$conf->multicompany->enabled) && empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE) && Globals::$conf->entity == 1) {

-                        $out .= " (" . $obj->label . ")";

+                        $out .= " (".$obj->label.")";

                     }

 

                     $out .= '</option>';

@@ -6914,8 +6914,8 @@ 
                 }

             } else {

                 if ($show_empty)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

-                $out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

+                    $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";

+                $out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';

             }

             $out .= '</select>';

         }

@@ -6936,8 +6936,8 @@ 
         global $conf, $langs;

 

         $out = '<div class="nowrap">';

-        $out .= '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . DolUtils::dol_escape_htmltag($langs->trans("Search")) . '" title="' . DolUtils::dol_escape_htmltag($langs->trans("Search")) . '">';

-        $out .= '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . DolUtils::dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . DolUtils::dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';

+        $out .= '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.DolUtils::dol_escape_htmltag($langs->trans("Search")).'" title="'.DolUtils::dol_escape_htmltag($langs->trans("Search")).'">';

+        $out .= '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.DolUtils::dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.DolUtils::dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

         $out .= '</div>';

 

         return $out;

@@ -6962,12 +6962,12 @@ 
             	$("#checkallactions").click(function() {

                     if($(this).is(\':checked\')){

                         console.log("We check all");

-                		$(".' . $cssclass . '").prop(\'checked\', true).trigger(\'change\');

+                		$(".' . $cssclass.'").prop(\'checked\', true).trigger(\'change\');

                     }

                     else

                     {

                         console.log("We uncheck all");

-                		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

+                		$(".' . $cssclass.'").prop(\'checked\', false).trigger(\'change\');

                     }' . "\n";

         if ($calljsfunction)

             $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

@@ -7016,64 +7016,64 @@ 
     {

         global $db, $conf, $langs, $user;

 

-        $sql = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_cat WHERE active = 1';

-        $sql .= ' AND entity IN (0,' . getEntity('exp_tax_cat') . ')';

+        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';

+        $sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';

         if (!empty($excludeid))

-            $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';

+            $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';

         $sql .= ' ORDER BY label';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0">&nbsp;</option>';

 

             while ($obj = $db->fetch_object($resql)) {

-                $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

+                $out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';

             }

             $out .= '</select>';

             if (!empty($htmlname) && $user->admin)

-                $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

 

             if (!empty($target)) {

-                $sql = "SELECT c.id FROM " . MAIN_DB_PREFIX . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

+                $sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

                 $resql = $db->query($sql);

                 if ($resql) {

                     if ($db->num_rows($resql) > 0) {

                         $obj = $db->fetch_object($resql);

                         $out .= '<script type="text/javascript">

 							$(function() {

-								$("select[name=' . $target . ']").on("change", function() {

+								$("select[name=' . $target.']").on("change", function() {

 									var current_val = $(this).val();

-									if (current_val == ' . $obj->id . ') {';

+									if (current_val == ' . $obj->id.') {';

                         if (!empty($default_selected) || !empty($selected))

-                            $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

+                            $out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';

 

                         $out .= '

-										$("select[name=' . $htmlname . ']").change();

+										$("select[name=' . $htmlname.']").change();

 									}

 								});

 

-								$("select[name=' . $htmlname . ']").change(function() {

+								$("select[name=' . $htmlname.']").change(function() {

 

-									if ($("select[name=' . $target . ']").val() == ' . $obj->id . ') {

+									if ($("select[name=' . $target.']").val() == '.$obj->id.') {

 										// get price of kilometer to fill the unit price

-										var data = ' . json_encode($params) . ';

+										var data = ' . json_encode($params).';

 										data.fk_c_exp_tax_cat = $(this).val();

 

 										$.ajax({

 											method: "POST",

 											dataType: "json",

 											data: data,

-											url: "' . (DOL_URL_ROOT . '/expensereport/ajax/ajaxik.php') . '",

+											url: "' . (DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php').'",

 										}).done(function( data, textStatus, jqXHR ) {

 											console.log(data);

 											if (typeof data.up != "undefined") {

 												$("input[name=value_unit]").val(data.up);

-												$("select[name=' . $htmlname . ']").attr("title", data.title);

+												$("select[name=' . $htmlname.']").attr("title", data.title);

 											} else {

 												$("input[name=value_unit]").val("");

-												$("select[name=' . $htmlname . ']").attr("title", "");

+												$("select[name=' . $htmlname.']").attr("title", "");

 											}

 										});

 									}

@@ -7103,17 +7103,17 @@ 
     {

         global $db, $conf, $langs;

 

-        $sql = 'SELECT rowid, range_ik FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_range';

-        $sql .= ' WHERE entity = ' . Globals::$conf->entity . ' AND active = 1';

+        $sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';

+        $sql .= ' WHERE entity = '.Globals::$conf->entity.' AND active = 1';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0"></option>';

 

             while ($obj = $db->fetch_object($resql)) {

-                $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

+                $out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';

             }

             $out .= '</select>';

         } else {

@@ -7137,16 +7137,16 @@ 
     {

         global $db, $langs;

 

-        $sql = 'SELECT id, code, label FROM ' . MAIN_DB_PREFIX . 'c_type_fees';

+        $sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';

         $sql .= ' WHERE active = 1';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0"></option>';

             if ($allchoice)

-                $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

+                $out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';

 

             $field = 'code';

             if ($useid)

@@ -7154,7 +7154,7 @@ 
 

             while ($obj = $db->fetch_object($resql)) {

                 $key = $langs->trans($obj->code);

-                $out .= '<option ' . ($selected == $obj->{$field} ? 'selected="selected"' : '') . ' value="' . $obj->{$field} . '">' . ($key != $obj->code ? $key : $obj->label) . '</option>';

+                $out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';

             }

             $out .= '</select>';

         } else {

Base/AlixarBasicView.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
      */
     function top_htmlhead(/* $head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0 */)
     {
-        $this->top_httphead();  // TODO: Null method!
+        $this->top_httphead(); // TODO: Null method!
         // TODO: Nothing to do?
         return;