alxarafe / alixar

dolibarr/htdocs/admin/translation.php

Spacing +76 added lines, -76 removed lines

@@ -23,11 +23,11 @@ 
  *       \file       htdocs/admin/translation.php
  *       \brief      Page to show translation information
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
-require_once DOL_BASE_PATH . '/core/lib/files.lib.php';
-require_once DOL_BASE_PATH . '/core/class/html.formadmin.class.php';
+require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/files.lib.php';
+require_once DOL_BASE_PATH.'/core/class/html.formadmin.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "products", "admin", "sms", "other", "errors"));
@@ -77,11 +77,11 @@ 
 }
 
 $parameters = array('socid' => $socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0)
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
@@ -107,7 +107,7 @@ 
     if (!$error) {
         $db->begin();
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "overwrite_trans set transvalue = '" . $db->escape($transvalue) . "' WHERE rowid = " . GETPOST('rowid', 'int');
+        $sql = "UPDATE ".MAIN_DB_PREFIX."overwrite_trans set transvalue = '".$db->escape($transvalue)."' WHERE rowid = ".GETPOST('rowid', 'int');
         $result = $db->query($sql);
         if ($result > 0) {
             $db->commit();
@@ -146,7 +146,7 @@ 
     if (!$error) {
         $db->begin();
 
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "overwrite_trans(lang, transkey, transvalue, entity) VALUES ('" . $db->escape($langcode) . "','" . $db->escape($transkey) . "','" . $db->escape($transvalue) . "', " . $db->escape($conf->entity) . ")";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
         $result = $db->query($sql);
         if ($result > 0) {
             $db->commit();
@@ -169,7 +169,7 @@ 
 
 // Delete line from delete picto
 if ($action == 'delete') {
-    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "overwrite_trans WHERE rowid = " . $db->escape($id);
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."overwrite_trans WHERE rowid = ".$db->escape($id);
     $result = $db->query($sql);
     if ($result >= 0) {
         setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
@@ -188,20 +188,20 @@ 
 $wikihelp = 'EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
-$param = '&mode=' . $mode;
+$param = '&mode='.$mode;
 
 $enabledisablehtml = '';
-$enabledisablehtml .= $langs->trans("EnableOverwriteTranslation") . ' ';
+$enabledisablehtml .= $langs->trans("EnableOverwriteTranslation").' ';
 if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
     // Button off, click to enable
     // $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
-    $enabledisablehtml .= '<a class="reposition" href="' . BASE_URI . '?controller=admin&method=translation&action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1' . $param . '">';
+    $enabledisablehtml .= '<a class="reposition" href="'.BASE_URI.'?controller=admin&method=translation&action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
 } else {
     // Button on, click to disable
     // $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
-    $enabledisablehtml .= '<a class="reposition" href="' . BASE_URI . '?controller=admin&method=translation&action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0' . $param . '">';
+    $enabledisablehtml .= '<a class="reposition" href="'.BASE_URI.'?controller=admin&method=translation&action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
     $enabledisablehtml .= '</a>';
 }
@@ -209,39 +209,39 @@ 
 print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
 
 //print '<span class="opacitymedium">';
-print $langs->trans("TranslationDesc") . "<br>\n";
+print $langs->trans("TranslationDesc")."<br>\n";
 //print '</span>';
 print "<br>\n";
 
 $current_language_code = $langs->defaultlang;
 $s = picto_from_langcode($current_language_code);
-print $langs->trans("CurrentUserLanguage") . ': <strong>' . $s . ' ' . $current_language_code . '</strong><br>';
+print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong><br>';
 
 print '<br>';
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])
-    $param .= '&contextpage=' . $contextpage;
+    $param .= '&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit)
-    $param .= '&limit=' . $limit;
+    $param .= '&limit='.$limit;
 if ($optioncss != '')
-    $param .= '&optioncss=' . $optioncss;
+    $param .= '&optioncss='.$optioncss;
 if ($langcode)
-    $param .= '&langcode=' . urlencode($langcode);
+    $param .= '&langcode='.urlencode($langcode);
 if ($transkey)
-    $param .= '&transkey=' . urlencode($transkey);
+    $param .= '&transkey='.urlencode($transkey);
 if ($transvalue)
-    $param .= '&transvalue=' . urlencode($transvalue);
+    $param .= '&transvalue='.urlencode($transvalue);
 
 
-print '<form action="' . $_SERVER["PHP_SELF"] . ((empty($user->entity) && $debug) ? '?debug=1' : '') . '" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
 if ($optioncss != '') {
-    print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
-print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-print '<input type="hidden" name="page" value="' . $page . '">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head = translation_prepare_head();
 
@@ -259,23 +259,23 @@ 
         $disablededit = ' disabled';
 
     print '<div class="justify"><span class="opacitymedium">';
-    print img_info() . ' ' . $langs->trans("SomeTranslationAreUncomplete");
+    print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
     $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-    print ' (' . $langs->trans("SeeAlso", '<a href="' . $urlwikitranslatordoc . '" target="_blank">' . $langs->trans("Here") . '</a>') . ')<br>';
-    print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow")) . "\n";
-    print ' (' . $langs->trans("TranslationOverwriteDesc2") . ').' . "<br>\n";
+    print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
+    print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
+    print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
     print '</span></div>';
 
     print '<br>';
 
 
-    print '<input type="hidden" name="action" value="' . ($action == 'edit' ? 'update' : 'add') . '">';
-    print '<input type="hidden" id="mode" name="mode" value="' . $mode . '">';
+    print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'add').'">';
+    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Language") . ' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
     //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
@@ -288,11 +288,11 @@ 
 
     print '<tr class="oddeven"><td>';
     print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
-    print '</td>' . "\n";
+    print '</td>'."\n";
     print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone"' . $disablededit . ' name="transkey" id="transkey" value="' . (!empty($transkey) ? $transkey : "") . '">';
+    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
     print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent"' . $disablededit . ' name="transvalue" id="transvalue" value="' . (!empty($transvalue) ? $transvalue : "") . '">';
+    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
     print '</td>';
     // Limit to superadmin
     /* if (! empty($conf->multicompany->enabled) && !$user->entity)
@@ -305,18 +305,18 @@ 
       else
       { */
     print '<td align="center">';
-    print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
+    print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
     //}
-    print '<input type="submit" class="button"' . $disabled . ' value="' . $langs->trans("Add") . '" name="add" title="' . dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")) . '">';
+    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
     print "</td>\n";
     print '</tr>';
 
 
     // Show constants
     $sql = "SELECT rowid, entity, lang, transkey, transvalue";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "overwrite_trans";
+    $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
     $sql .= " WHERE 1 = 1";
-    $sql .= " AND entity IN (" . getEntity('overwrite_trans') . ")";
+    $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
     $sql .= $db->order($sortfield, $sortorder);
 
     dol_syslog("translation::select from table", LOG_DEBUG);
@@ -332,8 +332,8 @@ 
 
             print '<tr class="oddeven">';
 
-            print '<td>' . $obj->lang . '</td>' . "\n";
-            print '<td>' . $obj->transkey . '</td>' . "\n";
+            print '<td>'.$obj->lang.'</td>'."\n";
+            print '<td>'.$obj->transkey.'</td>'."\n";
 
             // Value
             print '<td>';
@@ -343,7 +343,7 @@ 
               print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
              */
             if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
-                print '<input type="text" class="quatrevingtpercent" name="transvalue" value="' . $obj->transvalue . '">';
+                print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$obj->transvalue.'">';
             } else {
                 print $obj->transvalue;
             }
@@ -351,16 +351,16 @@ 
 
             print '<td align="center">';
             if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
-                print '<input type="hidden" class="button" name="rowid" value="' . $obj->rowid . '">';
-                print '<input type="submit" class="button" name="save" value="' . dol_escape_htmltag($langs->trans("Save")) . '">';
+                print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
+                print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
                 print ' &nbsp; ';
-                print '<input type="submit" class="button" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '">';
+                print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
             } else {
                 // print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_edit().'</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=translation&rowid=' . $obj->rowid . '&entity=' . $obj->entity . '&action=edit' . ((empty($user->entity) && $debug) ? '&debug=1' : '') . '">' . img_edit() . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=translation&rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
                 print ' &nbsp; ';
                 // print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=translation&rowid=' . $obj->rowid . '&entity=' . $obj->entity . '&action=delete' . ((empty($user->entity) && $debug) ? '&debug=1' : '') . '">' . img_delete() . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=translation&rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
             }
             print '</td>';
 
@@ -408,9 +408,9 @@ 
         // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
         $i = 0;
         foreach ($modulesdir as $keydir => $tmpsearchdir) {
-            $searchdir = $tmpsearchdir;  // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+            $searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
             // Directory of translation files
-            $dir_lang = dirname(dirname($searchdir)) . "/langs/" . $langcode; // The 2 dirname is to go up in dir for 2 levels
+            $dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
             $dir_lang_osencoded = dol_osencode($dir_lang);
 
             $filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ? SORT_ASC : SORT_DESC), 1);
@@ -420,14 +420,14 @@ 
 
                 $langkey = $tmpfile;
                 if ($i > 0) {
-                    $langkey .= '@' . $moduledirname;
+                    $langkey .= '@'.$moduledirname;
                 }
                 //var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
 
-                $result = $newlang->load($langkey, 0, 0, '', 0);                              // Load translation files + database overwrite
-                $result = $newlangfileonly->load($langkey, 0, 0, '', 1);                      // Load translation files only
+                $result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
+                $result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
                 if ($result < 0) {
-                    print 'Failed to load language file ' . $tmpfile . '<br>' . "\n";
+                    print 'Failed to load language file '.$tmpfile.'<br>'."\n";
                 } else {
                     $nbtotaloffiles++;
                 }
@@ -438,10 +438,10 @@ 
 
         // Now search into translation array
         foreach ($newlang->tab_translate as $key => $val) {
-            if ($transkey && !preg_match('/' . preg_quote($transkey, '/') . '/i', $key)) {
+            if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) {
                 continue;
             }
-            if ($transvalue && !preg_match('/' . preg_quote($transvalue, '/') . '/i', $val)) {
+            if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) {
                 continue;
             }
             $recordtoshow[$key] = $val;
@@ -459,17 +459,17 @@ 
     //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
     $title = $langs->trans("TranslationKeySearch");
     if ($nbtotalofrecords > 0) {
-        $title .= ' (' . $nbtotalofrecords . ' / ' . $nbtotalofrecordswithoutfilters . ' - ' . $nbtotaloffiles . ' ' . $langs->trans("Files") . ')';
+        $title .= ' ('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')';
     }
-    print print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit) . "\n";
+    print print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit)."\n";
 
     print '<input type="hidden" id="action" name="action" value="search">';
-    print '<input type="hidden" id="mode" name="mode" value="' . $mode . '">';
+    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Language") . ' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder) . '</td>';
+    print_liste_field_titre($langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'</td>';
     print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
     //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity",$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
@@ -482,11 +482,11 @@ 
     print '<tr class="oddeven"><td>';
     //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
     print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
-    print '</td>' . "\n";
+    print '</td>'."\n";
     print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="' . $transkey . '">';
+    print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
     print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent" name="transvalue" value="' . $transvalue . '">';
+    print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
     // Limit to superadmin
     /* if (! empty($conf->multicompany->enabled) && !$user->entity)
       {
@@ -495,7 +495,7 @@ 
       }
       else
       { */
-    print '<input type="hidden" name="entitysearch" value="' . $conf->entity . '">';
+    print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
     //}
     print '</td>';
     // Action column
@@ -528,41 +528,41 @@ 
         if ($i > ($offset + $limit)) {
             break;
         }
-        print '<tr class="oddeven"><td>' . $langcode . '</td><td>' . $key . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
         print dol_escape_htmltag($val);
         print '</td><td align="right">';
         if (!empty($newlangfileonly->tab_translate[$key])) {
             if ($val != $newlangfileonly->tab_translate[$key]) {
                 // retrieve rowid
                 $sql = "SELECT rowid";
-                $sql .= " FROM " . MAIN_DB_PREFIX . "overwrite_trans";
-                $sql .= " WHERE transkey = '" . $key . "'";
-                $sql .= " AND entity IN (" . getEntity('overwrite_trans') . ")";
+                $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+                $sql .= " WHERE transkey = '".$key."'";
+                $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
                 dol_syslog("translation::select from table", LOG_DEBUG);
                 $result = $db->query($sql);
                 if ($result) {
                     $obj = $db->fetch_object($result);
                 }
                 // print '<a href="' . $_SERVER['PHP_SELF'] . '?rowid=' . $obj->rowid . '&entity=' . $conf->entity . '&action=edit">' . img_edit() . '</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=translation&rowid=' . $obj->rowid . '&entity=' . $conf->entity . '&action=edit">' . img_edit() . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=translation&rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
                 print '&nbsp;&nbsp;';
                 //print '<a href="' . $_SERVER['PHP_SELF'] . '?rowid=' . $obj->rowid . '&entity=' . $conf->entity . '&action=delete">' . img_delete() . '</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=translation&rowid=' . $obj->rowid . '&entity=' . $conf->entity . '&action=delete">' . img_delete() . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=translation&rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete">'.img_delete().'</a>';
                 print '&nbsp;&nbsp;';
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
                 print $form->textwithpicto('', $htmltext, 1, 'info');
             } else if (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
                 //print $key.'-'.$val;
                 // print '<a href="' . $_SERVER['PHP_SELF'] . '?mode=overwrite&amp;langcode=' . $langcode . '&amp;transkey=' . $key . '">' . img_edit_add($langs->trans("Overwrite")) . '</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=translation&mode=overwrite&amp;langcode=' . $langcode . '&amp;transkey=' . $key . '">' . img_edit_add($langs->trans("Overwrite")) . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=translation&mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
             }
 
             if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
-                $transifexlangfile = '$';  // $ means 'All'
+                $transifexlangfile = '$'; // $ means 'All'
                 //$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
-                $transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#' . $langcode . '/' . $transifexlangfile . '?q=key%3A' . $key;
+                $transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
 
-                print ' &nbsp; <a href="' . $transifexurl . '" target="transifex">' . img_picto('FixOnTransifex', 'object_globe') . '</a>';
+                print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto('FixOnTransifex', 'object_globe').'</a>';
             }
         } else {
             $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
@@ -572,7 +572,7 @@ 
           {
           print '<td>'.$val.'</td>';
           } */
-        print '</td></tr>' . "\n";
+        print '</td></tr>'."\n";
     }
 
     print '</table>';

dolibarr/htdocs/admin/company.php

Spacing +216 added lines, -216 removed lines

@@ -28,19 +28,19 @@ 
  * 	\ingroup    company
  * 	\brief      Setup page to configure company/foundation
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09', 3);
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'admincompany';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
 
@@ -58,7 +58,7 @@ 
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0)
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -69,7 +69,7 @@ 
         $mysoc->country_code = $tmparray['code'];
         $mysoc->country_label = $tmparray['label'];
 
-        $s = $mysoc->country_id . ':' . $mysoc->country_code . ':' . $mysoc->country_label;
+        $s = $mysoc->country_id.':'.$mysoc->country_code.':'.$mysoc->country_label;
         dolibarr_set_const($db, "MAIN_INFO_SOCIETE_COUNTRY", $s, 'chaine', 0, '', $conf->entity);
 
         activateModulesRequiredByCountry($mysoc->country_code);
@@ -92,18 +92,18 @@ 
     dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode", 'alpha'), 'chaine', 0, '', $conf->entity);
 
     $varforimage = 'logo';
-    $dirforimage = $conf->mycompany->dir_output . '/logos/';
+    $dirforimage = $conf->mycompany->dir_output.'/logos/';
     if ($_FILES[$varforimage]["tmp_name"]) {
         if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) {
             $original_file = $reg[1];
 
             $isimage = image_format_supported($original_file);
             if ($isimage >= 0) {
-                dol_syslog("Move file " . $_FILES[$varforimage]["tmp_name"] . " to " . $dirforimage . $original_file);
+                dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
                 if (!is_dir($dirforimage)) {
                     dol_mkdir($dirforimage);
                 }
-                $result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage . $original_file, 1, 0, $_FILES[$varforimage]['error']);
+                $result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
                 if ($result > 0) {
                     dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO", $original_file, 'chaine', 0, '', $conf->entity);
 
@@ -112,17 +112,17 @@ 
                         // Create thumbs
                         //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
                         // Create small thumb, Used on logon for example
-                        $imgThumbSmall = vignette($dirforimage . $original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+                        $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
                         if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg)) {
-                            $imgThumbSmall = $reg[1];    // Save only basename
+                            $imgThumbSmall = $reg[1]; // Save only basename
                             dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
                         } else
                             dol_syslog($imgThumbSmall);
 
                         // Create mini thumb, Used on menu or for setup page for example
-                        $imgThumbMini = vignette($dirforimage . $original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
+                        $imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
                         if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg)) {
-                            $imgThumbMini = $reg[1];     // Save only basename
+                            $imgThumbMini = $reg[1]; // Save only basename
                             dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
                         } else
                             dol_syslog($imgThumbMini);
@@ -203,13 +203,13 @@ 
     }
 
     if ($action != 'updateedit' && !$error) {
-        header("Location: " . $_SERVER["PHP_SELF"]);
+        header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
     }
 }
 
 if ($action == 'addthumb') {  // Regenerate thumbs
-    if (file_exists($conf->mycompany->dir_output . '/logos/' . $_GET["file"])) {
+    if (file_exists($conf->mycompany->dir_output.'/logos/'.$_GET["file"])) {
         $isimage = image_format_supported($_GET["file"]);
 
         // Create thumbs of logo
@@ -217,22 +217,22 @@ 
             // Create thumbs
             //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
             // Create small thumb. Used on logon for example
-            $imgThumbSmall = vignette($conf->mycompany->dir_output . '/logos/' . $_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);
+            $imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);
             if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg)) {
-                $imgThumbSmall = $reg[1];   // Save only basename
+                $imgThumbSmall = $reg[1]; // Save only basename
                 dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
             } else
                 dol_syslog($imgThumbSmall);
 
             // Create mini thumbs. Used on menu or for setup page for example
-            $imgThumbMini = vignette($conf->mycompany->dir_output . '/logos/' . $_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
+            $imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
             if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg)) {
-                $imgThumbMini = $reg[1];   // Save only basename
+                $imgThumbMini = $reg[1]; // Save only basename
                 dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
             } else
                 dol_syslog($imgThumbMini);
 
-            header("Location: " . $_SERVER["PHP_SELF"]);
+            header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
         else {
@@ -250,21 +250,21 @@ 
 }
 
 if ($action == 'removelogo') {
-    require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    $logofile = $conf->mycompany->dir_output . '/logos/' . $mysoc->logo;
+    $logofile = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
     if ($mysoc->logo != '')
         dol_delete_file($logofile);
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO", $conf->entity);
     $mysoc->logo = '';
 
-    $logosmallfile = $conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small;
+    $logosmallfile = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
     if ($mysoc->logo_small != '')
         dol_delete_file($logosmallfile);
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $conf->entity);
     $mysoc->logo_small = '';
 
-    $logominifile = $conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini;
+    $logominifile = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini;
     if ($mysoc->logo_mini != '')
         dol_delete_file($logominifile);
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $conf->entity);
@@ -283,7 +283,7 @@ 
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
-$countrynotdefined = '<font class="error">' . $langs->trans("ErrorSetACountryFirst") . ' (' . $langs->trans("SeeAbove") . ')</font>';
+$countrynotdefined = '<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
 
 print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
@@ -291,115 +291,115 @@ 
 
 dol_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
 
-print '<span class="opacitymedium">' . $langs->trans("CompanyFundationDesc", $langs->transnoentities("Modify"), $langs->transnoentities("Save")) . "</span><br>\n";
+print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Modify"), $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
 
 if ($action == 'edit' || $action == 'updateedit') {
     /**
      * Edition des parametres
      */
-    print "\n" . '<script type="text/javascript" language="javascript">';
+    print "\n".'<script type="text/javascript" language="javascript">';
     print '$(document).ready(function () {
 			  $("#selectcountry_id").change(function() {
 				document.form_index.action.value="updateedit";
 				document.form_index.submit();
 			  });
 		  });';
-    print '</script>' . "\n";
+    print '</script>'."\n";
 
-    print '<form enctype="multipart/form-data" method="POST" href="' . BASE_URI . '?controller=admin&method=company" name="form_index">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+    print '<form enctype="multipart/form-data" method="POST" href="'.BASE_URI.'?controller=admin&method=company" name="form_index">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
 
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><th class="titlefield wordbreak">' . $langs->trans("CompanyInfo") . '</th><th>' . $langs->trans("Value") . '</th></tr>' . "\n";
+    print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
     // Name
 
-    print '<tr class="oddeven"><td class="fieldrequired"><label for="name">' . $langs->trans("CompanyName") . '</label></td><td>';
-    print '<input name="nom" id="name" class="minwidth200" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')) . '" autofocus="autofocus"></td></tr>' . "\n";
+    print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+    print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'" autofocus="autofocus"></td></tr>'."\n";
 
     // Addresse
 
-    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">' . $langs->trans("CompanyAddress") . '</label></td><td>';
-    print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="' . ROWS_3 . '">' . ($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')) . '</textarea></td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
+    print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">' . $langs->trans("CompanyZip") . '</label></td><td>';
-    print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')) . '"></td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
+    print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">' . $langs->trans("CompanyTown") . '</label></td><td>';
-    print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')) . '"></td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
+    print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
 
     // Country
 
-    print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td><td class="maxwidthonsmartphone">';
+    print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
     //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
     print $form->select_country($mysoc->country_id, 'country_id');
     if ($user->admin)
         print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    print '</td></tr>' . "\n";
+    print '</td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="state_id">' . $langs->trans("State") . '</label></td><td class="maxwidthonsmartphone">';
+    print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
     $formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE, $mysoc->country_code, 'state_id');
-    print '</td></tr>' . "\n";
+    print '</td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="currency">' . $langs->trans("CompanyCurrency") . '</label></td><td>';
+    print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
     print $form->selectCurrency($conf->currency, "currency");
-    print '</td></tr>' . "\n";
+    print '</td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="phone">' . $langs->trans("Phone") . '</label></td><td>';
-    print '<input name="tel" id="phone" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL) . '"></td></tr>';
-    print '</td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+    print '<input name="tel" id="phone" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'"></td></tr>';
+    print '</td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="fax">' . $langs->trans("Fax") . '</label></td><td>';
-    print '<input name="fax" id="fax" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX) . '"></td></tr>';
-    print '</td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+    print '<input name="fax" id="fax" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX).'"></td></tr>';
+    print '</td></tr>'."\n";
 
 
-    print '<tr class="oddeven"><td><label for="email">' . $langs->trans("EMail") . '</label></td><td>';
-    print '<input name="mail" id="email" class="minwidth200" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL) . '"></td></tr>';
-    print '</td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+    print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'"></td></tr>';
+    print '</td></tr>'."\n";
 
     // Web
-    print '<tr class="oddeven"><td><label for="web">' . $langs->trans("Web") . '</label></td><td>';
-    print '<input name="web" id="web" class="minwidth300" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB) . '"></td></tr>';
-    print '</td></tr>' . "\n";
+    print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+    print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'"></td></tr>';
+    print '</td></tr>'."\n";
 
     // Barcode
     if (!empty($conf->barcode->enabled)) {
 
-        print '<tr class="oddeven"><td><label for="barcode">' . $langs->trans("Gencod") . '</label></td><td>';
-        print '<input name="barcode" id="barcode" class="minwidth150" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD) . '"></td></tr>';
+        print '<tr class="oddeven"><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+        print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD).'"></td></tr>';
         print '</td></tr>';
     }
 
     // Logo
-    print '<tr class="oddeven hideonsmartphone"><td><label for="logo">' . $langs->trans("Logo") . ' (png,jpg)</label></td><td>';
+    print '<tr class="oddeven hideonsmartphone"><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
     print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
     print '<input type="file" class="flat class=minwidth200" name="logo" id="logo">';
     print '</td><td class="nocellnopadd" valign="middle" align="right">';
     if (!empty($mysoc->logo_mini)) {
-        print '<a href="' . $_SERVER["PHP_SELF"] . '?action=removelogo">' . img_delete($langs->trans("Delete")) . '</a>';
-        if (file_exists($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini)) {
+        print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
+        if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
             print ' &nbsp; ';
-            print '<img src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;file=' . urlencode('logos/thumbs/' . $mysoc->logo_mini) . '">';
+            print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
         }
     } else {
         // print '<img height="30" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png">';
-        print '<img height="30" src="' . DOL_BASE_URI . '/public/theme/common/nophoto.png">';
+        print '<img height="30" src="'.DOL_BASE_URI.'/public/theme/common/nophoto.png">';
     }
     print '</td></tr></table>';
     print '</td></tr>';
 
     // Note
-    print '<tr class="oddeven"><td class="tdtop"><label for="note">' . $langs->trans("Note") . '</label></td><td>';
-    print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="' . ROWS_5 . '">' . (GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_SOCIETE_NOTE) . '</textarea></td></tr>';
+    print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+    print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
     print '</td></tr>';
 
     print '</table>';
@@ -408,30 +408,30 @@ 
 
     // IDs of the company (country-specific)
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td class="titlefield">' . $langs->trans("CompanyIds") . '</td><td>' . $langs->trans("Value") . '</td></tr>';
+    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
     $langs->load("companies");
 
     // Managing Director(s)
 
-    print '<tr class="oddeven"><td><label for="director">' . $langs->trans("ManagingDirectors") . '</label></td><td>';
-    print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS) . '"></td></tr>';
+    print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
+    print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
 
     // GDPR contact
 
     print '<tr class="oddeven"><td>';
     print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
     print '</td><td>';
-    print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_GDPR) . '"></td></tr>';
+    print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
 
     // Capital
 
-    print '<tr class="oddeven"><td><label for="capital">' . $langs->trans("Capital") . '</label></td><td>';
-    print '<input name="capital" id="capital" class="minwidth100" value="' . dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL) . '"></td></tr>';
+    print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
+    print '<input name="capital" id="capital" class="minwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
 
     // Juridical Status
 
-    print '<tr class="oddeven"><td><label for="forme_juridique_code">' . $langs->trans("JuridicalStatus") . '</label></td><td>';
+    print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
     if ($mysoc->country_code) {
         print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
     } else {
@@ -442,9 +442,9 @@ 
     // ProfID1
     if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid1">' . $langs->transcountry("ProfId1", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid1">'.$langs->transcountry("ProfId1", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="siren" id="profid1" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
+            print '<input name="siren" id="profid1" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -454,9 +454,9 @@ 
     // ProfId2
     if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid2">' . $langs->transcountry("ProfId2", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid2">'.$langs->transcountry("ProfId2", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="siret" id="profid2" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
+            print '<input name="siret" id="profid2" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -466,9 +466,9 @@ 
     // ProfId3
     if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid3">' . $langs->transcountry("ProfId3", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid3">'.$langs->transcountry("ProfId3", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="ape" id="profid3" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
+            print '<input name="ape" id="profid3" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -478,9 +478,9 @@ 
     // ProfId4
     if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid4">' . $langs->transcountry("ProfId4", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid4">'.$langs->transcountry("ProfId4", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="rcs" id="profid4" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
+            print '<input name="rcs" id="profid4" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -490,9 +490,9 @@ 
     // ProfId5
     if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid5">' . $langs->transcountry("ProfId5", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid5">'.$langs->transcountry("ProfId5", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
+            print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -502,9 +502,9 @@ 
     // ProfId6
     if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td><label for="profid6">' . $langs->transcountry("ProfId6", $mysoc->country_code) . '</label></td><td>';
+        print '<tr class="oddeven"><td><label for="profid6">'.$langs->transcountry("ProfId6", $mysoc->country_code).'</label></td><td>';
         if (!empty($mysoc->country_code)) {
-            print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
+            print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '').'">';
         } else {
             print $countrynotdefined;
         }
@@ -513,14 +513,14 @@ 
 
     // TVA Intra
 
-    print '<tr class="oddeven"><td><label for="intra_vat">' . $langs->trans("VATIntra") . '</label></td><td>';
-    print '<input name="tva" id="intra_vat" class="minwidth200" value="' . dol_escape_htmltag(!empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
+    print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+    print '<input name="tva" id="intra_vat" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '').'">';
     print '</td></tr>';
 
     // Object of the company
 
-    print '<tr class="oddeven"><td><label for="object">' . $langs->trans("CompanyObject") . '</label></td><td>';
-    print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="' . ROWS_5 . '">' . (!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '') . '</textarea></td></tr>';
+    print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
+    print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
     print '</td></tr>';
 
     print '</table>';
@@ -530,12 +530,12 @@ 
     print '<br>';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td class="titlefield">' . $langs->trans("FiscalYearInformation") . '</td><td>' . $langs->trans("Value") . '</td>';
+    print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
     print "</tr>\n";
 
 
-    print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">' . $langs->trans("FiscalMonthStart") . '</label></td><td>';
-    print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START, 'SOCIETE_FISCAL_MONTH_START', 0, 1) . '</td></tr>';
+    print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
+    print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START, 'SOCIETE_FISCAL_MONTH_START', 0, 1).'</td></tr>';
 
     print "</table>";
 
@@ -544,27 +544,27 @@ 
     print '<br>';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td width="140">' . $langs->trans("VATManagement") . '</td><td>' . $langs->trans("Description") . '</td>';
+    print '<td width="140">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
     print '<td align="right">&nbsp;</td>';
     print "</tr>\n";
 
 
-    print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"" . (empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked") . "> " . $langs->trans("VATIsUsed") . "</label></td>";
+    print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td><label for=\"use_vat\">" . $langs->trans("VATIsUsedDesc") . "</label></td></tr>";
+    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
     if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+        print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
 
-    print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"" . (empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "") . "> " . $langs->trans("VATIsNotUsed") . "</label></td>";
+    print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td><label for=\"no_vat\">" . $langs->trans("VATIsNotUsedDesc") . "</label></td></tr>";
+    print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
     if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+        print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
@@ -578,38 +578,38 @@ 
         print '<br>';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td width="140">' . $langs->transcountry("LocalTax1Management", $mysoc->country_code) . '</td><td>' . $langs->trans("Description") . '</td>';
+        print '<td width="140">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
         print '<td align="right">&nbsp;</td>';
         print "</tr>\n";
 
         // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"" . (($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "") . "> " . $langs->transcountry("LocalTax1IsUsed", $mysoc->country_code) . "</td>";
+        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print '<table class="nobordernopadding">';
-        print "<tr><td><label for=\"lt1\">" . $langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax1IsUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax1IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         if (!isOnlyOneLocalTax(1)) {
-            print '<tr><td align="left"><label for="lt1">' . $langs->trans("LTRate") . '</label>: ';
+            print '<tr><td align="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
             $formcompany->select_localtax(1, $conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
             print '</td></tr>';
         }
 
-        $opcions = array($langs->trans("CalcLocaltax1") . ' ' . $langs->trans("CalcLocaltax1Desc"), $langs->trans("CalcLocaltax2") . ' - ' . $langs->trans("CalcLocaltax2Desc"), $langs->trans("CalcLocaltax3") . ' - ' . $langs->trans("CalcLocaltax3Desc"));
+        $opcions = array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"), $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"), $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
 
-        print '<tr><td align="left"></label for="clt1">' . $langs->trans("CalcLocaltax") . '</label>: ';
+        print '<tr><td align="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
         print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
         print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
 
-        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"" . ((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "") . "> " . $langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code) . "</td>";
+        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td><label for=\"nolt1\">" . $langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax1IsNotUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax1IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         print "</table>";
         print "</td></tr>\n";
         print "</table>";
@@ -619,36 +619,36 @@ 
         print '<br>';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td>' . $langs->transcountry("LocalTax2Management", $mysoc->country_code) . '</td><td>' . $langs->trans("Description") . '</td>';
+        print '<td>'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
         print '<td align="right">&nbsp;</td>';
         print "</tr>\n";
 
 
         // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"" . (($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "") . "> " . $langs->transcountry("LocalTax2IsUsed", $mysoc->country_code) . "</td>";
+        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print '<table class="nobordernopadding">';
-        print "<tr><td><label for=\"lt2\">" . $langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax2IsUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax2IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         if (!isOnlyOneLocalTax(2)) {
-            print '<tr><td align="left"><label for="lt2">' . $langs->trans("LTRate") . '</label>: ';
+            print '<tr><td align="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
             $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
             print '</td></tr>';
         }
-        print '<tr><td align="left"><label for="clt2">' . $langs->trans("CalcLocaltax") . '</label>: ';
+        print '<tr><td align="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
         print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
         print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
 
-        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"" . ((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "") . "> " . $langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code) . "</td>";
+        print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td><label for=\"nolt2\">" . $langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax2IsNotUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax2IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         print "</table>";
         print "</td></tr>\n";
         print "</table>";
@@ -656,9 +656,9 @@ 
 
 
     print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
+    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
+    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
     print '<br>';
 
@@ -675,42 +675,42 @@ 
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>' . $langs->trans("CompanyInfo") . '</td><td>' . $langs->trans("Value") . '</td></tr>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 
-    print '<tr class="oddeven"><td class="titlefield wordbreak">' . $langs->trans("CompanyName") . '</td><td>';
+    print '<tr class="oddeven"><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>';
     if (!empty($conf->global->MAIN_INFO_SOCIETE_NOM)) {
         print $conf->global->MAIN_INFO_SOCIETE_NOM;
     } else {
-        print img_warning() . ' <font class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyName")) . '</font>';
+        print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyName")).'</font>';
     }
     print '</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("CompanyAddress") . '</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>'.nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS).'</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("CompanyZip") . '</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>'.(empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP).'</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("CompanyTown") . '</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>'.(empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("CompanyCountry") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>';
     if ($mysoc->country_code) {
         $img = picto_from_langcode($mysoc->country_code);
-        print $img ? $img . ' ' : '';
+        print $img ? $img.' ' : '';
         print getCountry($mysoc->country_code, 1);
     } else {
-        print img_warning() . ' <font class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")) . '</font>';
+        print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
     }
     print '</td></tr>';
 
 
     if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) {
-        print '<tr class="oddeven"><td>' . $langs->trans("Region-State") . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
     } else {
-        print '<tr class="oddeven"><td>' . $langs->trans("State") . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
     } if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
         print getState($conf->global->MAIN_INFO_SOCIETE_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
     } else {
@@ -719,25 +719,25 @@ 
     print '</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("CompanyCurrency") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CompanyCurrency").'</td><td>';
     print currency_name($conf->currency, 1);
-    print ' (' . $conf->currency;
-    print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - ' . $langs->getCurrencySymbol($conf->currency) : '');
+    print ' ('.$conf->currency;
+    print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : '');
     print ')';
     print '</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Phone") . '</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL, $mysoc->country_code) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>'.dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL, $mysoc->country_code).'</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Fax") . '</td><td>' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX, $mysoc->country_code) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX, $mysoc->country_code).'</td></tr>';
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Mail") . '</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL, 0, 0, 0, 80) . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>'.dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL, 0, 0, 0, 80).'</td></tr>';
 
     // Web
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Web") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>';
     $arrayofurl = preg_split('/\s/', $conf->global->MAIN_INFO_SOCIETE_WEB);
     foreach ($arrayofurl as $urltoshow) {
         if ($urltoshow)
@@ -748,35 +748,35 @@ 
     // Barcode
     if (!empty($conf->barcode->enabled)) {
 
-        print '<tr class="oddeven"><td>' . $langs->trans("Gencod") . '</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';
+        print '<tr class="oddeven"><td>'.$langs->trans("Gencod").'</td><td>'.$conf->global->MAIN_INFO_SOCIETE_GENCOD.'</td></tr>';
     }
 
     // Logo
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Logo") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Logo").'</td><td>';
 
     $tagtd = 'tagtd ';
     if ($conf->browser->layout == 'phone')
         $tagtd = '';
-    print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="' . $tagtd . 'inline-block valignmiddle left">';
+    print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="'.$tagtd.'inline-block valignmiddle left">';
     print $mysoc->logo;
-    print '</div><div class="' . $tagtd . 'inline-block valignmiddle left">';
+    print '</div><div class="'.$tagtd.'inline-block valignmiddle left">';
 
     // It offers the generation of the thumbnail if it does not exist
-    if (!is_file($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i', $mysoc->logo)) {
-        print '<a class="img_logo" href="' . $_SERVER["PHP_SELF"] . '?action=addthumb&amp;file=' . urlencode($mysoc->logo) . '">' . img_picto($langs->trans('GenerateThumb'), 'refresh') . '</a>&nbsp;&nbsp;';
-    } else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini)) {
-        print '<img class="img_logo" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;file=' . urlencode('logos/thumbs/' . $mysoc->logo_mini) . '">';
+    if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i', $mysoc->logo)) {
+        print '<a class="img_logo" href="'.$_SERVER["PHP_SELF"].'?action=addthumb&amp;file='.urlencode($mysoc->logo).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'</a>&nbsp;&nbsp;';
+    } else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+        print '<img class="img_logo" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
     } else {
         // print '<img class="img_logo" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png">';
-        print '<img class="img_logo" src="' . DOL_BASE_URI . '/public/theme/common/nophoto.png">';
+        print '<img class="img_logo" src="'.DOL_BASE_URI.'/public/theme/common/nophoto.png">';
     }
     print '</div></div></div>';
 
     print '</td></tr>';
 
 
-    print '<tr class="oddeven"><td class="tdtop">' . $langs->trans("Note") . '</td><td>' . (!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . '</td></tr>';
+    print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>'.(!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '').'</td></tr>';
 
     print '</table>';
     print "</div>";
@@ -786,42 +786,42 @@ 
 
     // IDs of the company (country-specific)
     print '<form name="formsoc" method="post">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td class="titlefield wordbreak">' . $langs->trans("CompanyIds") . '</td><td>' . $langs->trans("Value") . '</td></tr>';
+    print '<tr class="liste_titre"><td class="titlefield wordbreak">'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
     // Managing Director(s)
 
-    print '<tr class="oddeven"><td>' . $langs->trans("ManagingDirectors") . '</td><td>';
-    print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("ManagingDirectors").'</td><td>';
+    print $conf->global->MAIN_INFO_SOCIETE_MANAGERS.'</td></tr>';
 
     // GDPR Contact
 
-    print '<tr class="oddeven"><td>' . $langs->trans("GDPRContact") . '</td><td>';
-    print $conf->global->MAIN_INFO_GDPR . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("GDPRContact").'</td><td>';
+    print $conf->global->MAIN_INFO_GDPR.'</td></tr>';
 
     // Capital
 
-    print '<tr class="oddeven"><td>' . $langs->trans("Capital") . '</td><td>';
-    print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("Capital").'</td><td>';
+    print $conf->global->MAIN_INFO_CAPITAL.'</td></tr>';
 
     // Juridical Status
 
-    print '<tr class="oddeven"><td>' . $langs->trans("JuridicalStatus") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("JuridicalStatus").'</td><td>';
     print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
     print '</td></tr>';
 
     // ProfId1
     if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId1", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_SIREN)) {
             print $conf->global->MAIN_INFO_SIREN;
             $s = $mysoc->id_prof_url(1, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -831,12 +831,12 @@ 
     // ProfId2
     if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId2", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId2", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_SIRET)) {
             print $conf->global->MAIN_INFO_SIRET;
             $s = $mysoc->id_prof_url(2, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -846,12 +846,12 @@ 
     // ProfId3
     if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId3", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId3", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_APE)) {
             print $conf->global->MAIN_INFO_APE;
             $s = $mysoc->id_prof_url(3, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -861,12 +861,12 @@ 
     // ProfId4
     if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId4", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId4", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_RCS)) {
             print $conf->global->MAIN_INFO_RCS;
             $s = $mysoc->id_prof_url(4, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -876,12 +876,12 @@ 
     // ProfId5
     if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId5", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId5", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_PROFID5)) {
             print $conf->global->MAIN_INFO_PROFID5;
             $s = $mysoc->id_prof_url(5, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -891,12 +891,12 @@ 
     // ProfId6
     if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-') {
 
-        print '<tr class="oddeven"><td>' . $langs->transcountry("ProfId6", $mysoc->country_code) . '</td><td>';
+        print '<tr class="oddeven"><td>'.$langs->transcountry("ProfId6", $mysoc->country_code).'</td><td>';
         if (!empty($conf->global->MAIN_INFO_PROFID6)) {
             print $conf->global->MAIN_INFO_PROFID6;
             $s = $mysoc->id_prof_url(6, $mysoc);
             if ($s)
-                print ' - ' . $s;
+                print ' - '.$s;
         } else {
             print '&nbsp;';
         }
@@ -905,26 +905,26 @@ 
 
     // VAT
 
-    print '<tr class="oddeven"><td>' . $langs->trans("VATIntra") . '</td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("VATIntra").'</td>';
     print '<td>';
     if (!empty($conf->global->MAIN_INFO_TVAINTRA)) {
         $s = '';
         $s .= $conf->global->MAIN_INFO_TVAINTRA;
-        $s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="' . $conf->global->MAIN_INFO_TVAINTRA . '">';
+        $s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
         if (empty($conf->global->MAIN_DISABLEVATCHECK) && $mysoc->isInEEC()) {
             $s .= ' - ';
             if (!empty($conf->use_javascript_ajax)) {
                 print "\n";
                 print '<script language="JavaScript" type="text/javascript">';
                 print "function CheckVAT(a) {\n";
-                print "newpopup('" . DOL_URL_ROOT . "/societe/checkvat/checkVatPopup.php?vatNumber='+a,'" . dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")) . "',500,285);\n";
+                print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
                 print "}\n";
                 print '</script>';
                 print "\n";
-                $s .= '<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">' . $langs->trans("VATIntraCheck") . '</a>';
+                $s .= '<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
             } else {
-                $s .= '<a href="' . $langs->transcountry("VATIntraCheckURL", $soc->id_country) . '" target="_blank">' . img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help') . '</a>';
+                $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $soc->id_country).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
         print $s;
@@ -935,7 +935,7 @@ 
     print '</tr>';
 
 
-    print '<tr class="oddeven"><td class="tdtop">' . $langs->trans("CompanyObject") . '</td><td>' . (!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . '</td></tr>';
+    print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("CompanyObject").'</td><td>'.(!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '').'</td></tr>';
 
     print '</table>';
     print "</div>";
@@ -950,13 +950,13 @@ 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td class="titlefield">' . $langs->trans("FiscalYearInformation") . '</td><td>' . $langs->trans("Value") . '</td>';
+    print '<td class="titlefield">'.$langs->trans("FiscalYearInformation").'</td><td>'.$langs->trans("Value").'</td>';
     print "</tr>\n";
 
 
-    print '<tr class="oddeven"><td>' . $langs->trans("FiscalMonthStart") . '</td><td>';
+    print '<tr class="oddeven"><td>'.$langs->trans("FiscalMonthStart").'</td><td>';
     $monthstart = (!empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1;
-    print dol_print_date(dol_mktime(12, 0, 0, $monthstart, 1, 2000, 1), '%B', 'gm') . '</td></tr>';
+    print dol_print_date(dol_mktime(12, 0, 0, $monthstart, 1, 2000, 1), '%B', 'gm').'</td></tr>';
 
     print "</table>";
     print "</div>";
@@ -968,29 +968,29 @@ 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td class="titlefield">' . $langs->trans("VATManagement") . '</td><td>' . $langs->trans("Description") . '</td>';
+    print '<td class="titlefield">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
     print '<td align="right">&nbsp;</td>';
     print "</tr>\n";
 
 
     print '<tr class="oddeven"><td class="titlefield">';
-    print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"" . (empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked") . "> " . $langs->trans("VATIsUsed") . "</td>";
+    print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td><label for=\"use_vat\">" . $langs->trans("VATIsUsedDesc") . "</label></td></tr>";
+    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
     if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+        print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
 
     print '<tr class="oddeven"><td class="titlefield">';
-    print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"" . (empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "") . "> " . $langs->trans("VATIsNotUsed") . "</td>";
+    print "<input class=\"oddeven\" type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td><label=\"no_vat\">" . $langs->trans("VATIsNotUsedDesc") . "</label></td></tr>";
+    print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
     if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+        print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
@@ -1006,28 +1006,28 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td class="titlefield">' . $langs->transcountry("LocalTax1Management", $mysoc->country_code) . '</td><td>' . $langs->trans("Description") . '</td>';
+        print '<td class="titlefield">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
         print '<td align="right">&nbsp;</td>';
         print "</tr>\n";
 
 
         print "<tr class=\"oddeven\"><td>";
-        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"" . (($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "") . "> " . $langs->transcountry("LocalTax1IsUsed", $mysoc->country_code) . "</td>";
+        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td></label for=\"lt1\">" . $langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax1IsUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax1IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         if ($conf->global->MAIN_INFO_VALUE_LOCALTAX1 != 0) {
-            print '<tr><td>' . $langs->trans("LTRate") . ': ' . $conf->global->MAIN_INFO_VALUE_LOCALTAX1 . '</td></tr>';
+            print '<tr><td>'.$langs->trans("LTRate").': '.$conf->global->MAIN_INFO_VALUE_LOCALTAX1.'</td></tr>';
         }
-        print '<tr><td align="left">' . $langs->trans("CalcLocaltax") . ': ';
+        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
         if ($conf->global->MAIN_INFO_LOCALTAX_CALC1 == 0) {
-            print $langs->trans("CalcLocaltax1") . ' - ' . $langs->trans("CalcLocaltax1Desc");
+            print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
         } else if ($conf->global->MAIN_INFO_LOCALTAX_CALC1 == 1) {
-            print $langs->trans("CalcLocaltax2") . ' - ' . $langs->trans("CalcLocaltax2Desc");
+            print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
         } else if ($conf->global->MAIN_INFO_LOCALTAX_CALC1 == 2) {
-            print $langs->trans("CalcLocaltax3") . ' - ' . $langs->trans("CalcLocaltax3Desc");
+            print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
         }
 
         print '</td></tr>';
@@ -1036,12 +1036,12 @@ 
 
 
         print '<tr class="oddeven"><td>';
-        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"" . ((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "") . "> " . $langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code) . "</td>";
+        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td><label for=\"no_lt1\">" . $langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax1IsNotUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax1IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         print "</table>";
         print "</td></tr>\n";
 
@@ -1054,28 +1054,28 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<td class="titlefield">' . $langs->transcountry("LocalTax2Management", $mysoc->country_code) . '</td><td>' . $langs->trans("Description") . '</td>';
+        print '<td class="titlefield">'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
         print '<td align="right">&nbsp;</td>';
         print "</tr>\n";
 
 
         print "<tr class=\"oddeven\"><td>";
-        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"" . (($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "") . "> " . $langs->transcountry("LocalTax2IsUsed", $mysoc->country_code) . "</td>";
+        print "<input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td><label for=\"lt2\">" . $langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax2IsUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax2IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         if ($conf->global->MAIN_INFO_VALUE_LOCALTAX2 != 0) {
-            print '<tr><td>' . $langs->trans("LTRate") . ': ' . $conf->global->MAIN_INFO_VALUE_LOCALTAX2 . '</td></tr>';
+            print '<tr><td>'.$langs->trans("LTRate").': '.$conf->global->MAIN_INFO_VALUE_LOCALTAX2.'</td></tr>';
         }
-        print '<tr><td align="left">' . $langs->trans("CalcLocaltax") . ': ';
+        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
         if ($conf->global->MAIN_INFO_LOCALTAX_CALC2 == 0) {
-            print $langs->trans("CalcLocaltax1") . ' - ' . $langs->trans("CalcLocaltax1Desc");
+            print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc");
         } else if ($conf->global->MAIN_INFO_LOCALTAX_CALC2 == 1) {
-            print $langs->trans("CalcLocaltax2") . ' - ' . $langs->trans("CalcLocaltax2Desc");
+            print $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc");
         } else if ($conf->global->MAIN_INFO_LOCALTAX_CALC2 == 2) {
-            print $langs->trans("CalcLocaltax3") . ' - ' . $langs->trans("CalcLocaltax3Desc");
+            print $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc");
         }
 
         print '</td></tr>';
@@ -1083,12 +1083,12 @@ 
         print "</td></tr>\n";
 
 
-        print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"" . ((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "") . "> " . $langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code) . "</td>";
+        print "<tr class=\"oddeven\"><td width=\"160\"><input class=\"oddeven\" type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td><label for=\"nolt2\">" . $langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code) . "</label></td></tr>";
+        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
         $example = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
-        print ($example != "LocalTax2IsNotUsedExample" ? "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code) . "</i></td></tr>\n" : "");
+        print ($example != "LocalTax2IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
         print "</table>";
         print "</td></tr>\n";
 
@@ -1100,7 +1100,7 @@ 
     // Actions buttons
     print '<div class="tabsAction">';
     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit">' . $langs->trans("Modify") . '</a></div>';
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=admin&method=company&action=edit">' . $langs->trans("Modify") . '</a></div>';
+    print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=admin&method=company&action=edit">'.$langs->trans("Modify").'</a></div>';
     print '</div>';
 }
 

dolibarr/htdocs/admin/accountant.php

Spacing +59 added lines, -59 removed lines

@@ -23,51 +23,51 @@ 
  *	\brief      Setup page to configure accountant / auditor
  */
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09', 3);
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'adminaccoutant';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
-$error=0;
+$error = 0;
 
 
 /*
  * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
-|| ($action == 'updateedit') )
+if (($action == 'update' && !GETPOST("cancel", 'alpha'))
+|| ($action == 'updateedit'))
 {
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id','int'), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web",'alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code",'nohtml'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note",'none'),'chaine',0,'',$conf->entity);
-
-	if ($action != 'updateedit' && ! $error)
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'none'), 'chaine', 0, '', $conf->entity);
+
+	if ($action != 'updateedit' && !$error)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -78,20 +78,20 @@ 
  * View
  */
 
-$help_url='';
-llxHeader('',$langs->trans("CompanyFoundation"),$help_url);
+$help_url = '';
+llxHeader('', $langs->trans("CompanyFoundation"), $help_url);
 
-print load_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');
+print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
 dol_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
 
-$form=new Form($db);
-$formother=new FormOther($db);
-$formcompany=new FormCompany($db);
+$form = new Form($db);
+$formother = new FormOther($db);
+$formcompany = new FormCompany($db);
 
-$countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
+$countrynotdefined = '<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
 
 print '<span class="opacitymedium">'.$langs->trans("AccountantDesc")."</span><br>\n";
 print "<br>\n";
@@ -111,7 +111,7 @@ 
 	print '</script>'."\n";
 
 	//print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
-    print '<form method="POST" href="' . BASE_URI . '?controller=admin&method=accountant" name="form_index">';
+    print '<form method="POST" href="'.BASE_URI.'?controller=admin&method=accountant" name="form_index">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
 
@@ -120,23 +120,23 @@ 
 
 	// Name
 	print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-	print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom",'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+	print '<input name="nom" id="name" class="minwidth200" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_NAME ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : GETPOST("nom", 'nohtml')).'" autofocus="autofocus"></td></tr>'."\n";
 
 	// Address
 	print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-	print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address",'nohtml')) . '</textarea></td></tr>'."\n";
+	print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : GETPOST("address", 'nohtml')).'</textarea></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-	print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode",'alpha')) . '"></td></tr>'."\n";
+	print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_ZIP ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : GETPOST("zipcode", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-	print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town",'nohtml')) . '"></td></tr>'."\n";
+	print '<input name="town" class="minwidth100" id="town" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_TOWN ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : GETPOST("town", 'nohtml')).'"></td></tr>'."\n";
 
 	// Country
 	print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 	//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
 	print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
@@ -144,29 +144,29 @@ 
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
-	print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>';
+	print '<input name="tel" id="phone" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_PHONE.'"></td></tr>';
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
-	print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>';
+	print '<input name="fax" id="fax" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_FAX.'"></td></tr>';
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
-	print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>';
+	print '<input name="mail" id="email" class="minwidth200" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_MAIL.'"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Web
 	print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
-	print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
+	print '<input name="web" id="web" class="minwidth300" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_WEB.'"></td></tr>';
 	print '</td></tr>'."\n";
 
 	// Code
 	print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-	print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code",'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n";
+	print '<input name="code" id="code" class="minwidth100" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_CODE ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : GETPOST("code", 'nohtml')).'" autofocus="autofocus"></td></tr>'."\n";
 
 	// Note
 	print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note','none') ? GETPOST('note','none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
+	print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
 	print '</td></tr>';
 
 	print '</table>';
@@ -201,43 +201,43 @@ 
 	print '</td></tr>';
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>'.nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? '' : $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS).'</td></tr>';
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>'.(empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? '' : $conf->global->MAIN_INFO_ACCOUNTANT_ZIP).'</td></tr>';
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>'.(empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? '' : $conf->global->MAIN_INFO_ACCOUNTANT_TOWN).'</td></tr>';
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY))
+	if (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY))
 	{
 		$code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2);
-		$img=picto_from_langcode($code);
-		print $img?$img.' ':'';
-		print getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY,1);
+		$img = picto_from_langcode($code);
+		print $img ? $img.' ' : '';
+		print getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 1);
 	}
 	print '</td></tr>';
 
 
-	if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
+	if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>';
 	else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
-	if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE,$conf->global->MAIN_SHOW_STATE_CODE,0,$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+	if (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 	else print '&nbsp;';
 	print '</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE,$mysoc->country_code) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>'.dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code).'</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX,$mysoc->country_code) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code).'</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL,0,0,0,80) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>'.dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80).'</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB,'_blank',80) . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>'.dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80).'</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("AccountantFileNumber").'</td><td>' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("AccountantFileNumber").'</td><td>'.$conf->global->MAIN_INFO_ACCOUNTANT_CODE.'</td></tr>';
 
-	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>';
+	print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>'.(!empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '').'</td></tr>';
 
 	print '</table>';
 	print "</div>";
@@ -247,7 +247,7 @@ 
 	// Actions buttons
 	print '<div class="tabsAction">';
 	// print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>';
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=admin&method=accountant&action=edit">' . $langs->trans("Modify") . '</a></div>';
+    print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=admin&method=accountant&action=edit">'.$langs->trans("Modify").'</a></div>';
     print '</div>';
 }
 

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

Spacing +58 added lines, -58 removed lines

@@ -30,8 +30,8 @@ 
      * @var DoliDB Database handler.
      */
     public $db;
-    var $type_user = 0;     // Put 0 for internal users, 1 for external users
-    var $atarget = "";                 // To store default target to use onto links
+    var $type_user = 0; // Put 0 for internal users, 1 for external users
+    var $atarget = ""; // To store default target to use onto links
     var $menu;
     var $menu_array_after;
 
@@ -70,7 +70,7 @@ 
 
         $id = 'mainmenu';
 
-        require_once DOL_DOCUMENT_ROOT . '/core/class/menu.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu = new Menu();
 
         $res = 'ErrorBadParameterForMode';
@@ -113,7 +113,7 @@ 
                 if (empty($noout))
                     print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
                 if (empty($noout))
-                    print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+                    print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
                 if (empty($noout))
                     print_end_menu_entry_empty($menuval['enabled']);
             }
@@ -145,7 +145,7 @@ 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
             $lastlevel = array();
-            print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n";
+            print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
             foreach ($this->menu->liste as $key => $val) {  // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
                 print '<ul class="ulmenu" data-inset="true">';
                 print '<li class="lilevel0">';
@@ -165,14 +165,14 @@ 
                         print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
 
                     print $val['titre'];
-                    print '</a>' . "\n";
+                    print '</a>'."\n";
 
                     // Search submenu fot this mainmenu entry
                     $tmpmainmenu = $val['mainmenu'];
                     $tmpleftmenu = 'all';
                     $submenu = new Menu();
 
-                    $langs->load("admin");  // Load translation file admin.lang
+                    $langs->load("admin"); // Load translation file admin.lang
                     $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
                     $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
                     $submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
@@ -199,20 +199,20 @@ 
                     $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
                     //var_dump($canonrelurl);
                     //var_dump($canonnexturl);
-                    print '<ul>' . "\n";
+                    print '<ul>'."\n";
                     if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools'))) || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
                         // We add sub entry
-                        print str_pad('', 1) . '<li class="lilevel1 ui-btn-icon-right ui-btn">';  // ui-btn to highlight on clic
-                        print '<a href="' . $relurl . '">';
-                        if ($langs->trans(ucfirst($val['mainmenu']) . "Dashboard") == ucfirst($val['mainmenu']) . "Dashboard") {  // No translation
+                        print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
+                        print '<a href="'.$relurl.'">';
+                        if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
                             if (in_array($val['mainmenu'], array('cashdesk', 'websites')))
                                 print $langs->trans("Access");
                             else
                                 print $langs->trans("Dashboard");
                         } else
-                            print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");
+                            print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
                         print '</a>';
-                        print '</li>' . "\n";
+                        print '</li>'."\n";
                     }
 
                     if ($val['level'] == 0) {
@@ -258,13 +258,13 @@ 
                             }
 
                             print str_pad('', $val2['level'] + 1);
-                            print '<li class="lilevel' . ($val2['level'] + 1);
+                            print '<li class="lilevel'.($val2['level'] + 1);
                             if ($val2['level'] == 0)
-                                print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
-                            print $disabled . '">';  // ui-btn to highlight on clic
+                                print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+                            print $disabled.'">'; // ui-btn to highlight on clic
                             if ($relurl2) {
                                 if ($val2['enabled']) { // Allowed
-                                    print '<a href="' . $relurl2 . '"';
+                                    print '<a href="'.$relurl2.'"';
                                     //print ' data-ajax="false"';
                                     print '>';
                                     $lastlevel2[$val2['level']] = 'enabled';
@@ -288,17 +288,17 @@ 
                                 else
                                     print '</a>';
                             }
-                            print '</li>' . "\n";
+                            print '</li>'."\n";
                         }
                     }
                     //var_dump($submenu);
                     print '</ul>';
                 }
                 if ($val['enabled'] == 2) {
-                    print '<font class="vsmenudisabled">' . $val['titre'] . '</font>';
+                    print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
                 }
                 print '</li>';
-                print '</ul>' . "\n";
+                print '</ul>'."\n";
             }
         }
 
@@ -306,7 +306,7 @@ 
             // Put here left menu entries
             // ***** START *****
 
-            $langs->load("admin");  // Load translation file admin.lang
+            $langs->load("admin"); // Load translation file admin.lang
 
             /*
               $this->menu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
@@ -328,23 +328,23 @@ 
               $this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
              */
 
-            $this->menu->add(BASE_URI . "?controller=admin&method=index&leftmenu=setup", $langs->trans("Setup"), 0);
-            $this->menu->add(BASE_URI . "?controller=admin&method=company", $langs->trans("MenuCompanySetup"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=modules", $langs->trans("Modules"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=menus", $langs->trans("Menus"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=ihm", $langs->trans("GUISetup"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=translation&mainmenu=home", $langs->trans("Translation"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=defaultvalues&mainmenu=home", $langs->trans("DefaultValues"), 1);
-
-            $this->menu->add(BASE_URI . "?controller=admin&method=boxes", $langs->trans("Boxes"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=delais", $langs->trans("Alerts"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=proxy&mainmenu=home", $langs->trans("Security"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=limits&mainmenu=home", $langs->trans("MenuLimits"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=pdf&mainmenu=home", $langs->trans("PDF"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=mails&mainmenu=home", $langs->trans("Emails"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=sms&mainmenu=home", $langs->trans("SMS"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=dict&mainmenu=home", $langs->trans("DictionarySetup"), 1);
-            $this->menu->add(BASE_URI . "?controller=admin&method=const&mainmenu=home", $langs->trans("OtherSetup"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=index&leftmenu=setup", $langs->trans("Setup"), 0);
+            $this->menu->add(BASE_URI."?controller=admin&method=company", $langs->trans("MenuCompanySetup"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=modules", $langs->trans("Modules"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=menus", $langs->trans("Menus"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=ihm", $langs->trans("GUISetup"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=translation&mainmenu=home", $langs->trans("Translation"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=defaultvalues&mainmenu=home", $langs->trans("DefaultValues"), 1);
+
+            $this->menu->add(BASE_URI."?controller=admin&method=boxes", $langs->trans("Boxes"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=delais", $langs->trans("Alerts"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=proxy&mainmenu=home", $langs->trans("Security"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=limits&mainmenu=home", $langs->trans("MenuLimits"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=pdf&mainmenu=home", $langs->trans("PDF"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=mails&mainmenu=home", $langs->trans("Emails"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=sms&mainmenu=home", $langs->trans("SMS"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=dict&mainmenu=home", $langs->trans("DictionarySetup"), 1);
+            $this->menu->add(BASE_URI."?controller=admin&method=const&mainmenu=home", $langs->trans("OtherSetup"), 1);
 
             // ***** END *****
             // do not change code after this
@@ -364,12 +364,12 @@ 
                             if (empty($menu_array[$j]['level']))
                                 $lastopened = false;
                         }
-                        $alt = 0;   // For menu manager "empty", we force to not have blockvmenufirst defined
+                        $alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
                         $lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
                         if (($alt % 2 == 0)) {
-                            print '<div class="blockvmenub lockvmenuimpair blockvmenuunique' . ($lastopened ? ' blockvmenulast' : '') . ($alt == 1 ? ' blockvmenufirst' : '') . '">' . "\n";
+                            print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
                         } else {
-                            print '<div class="blockvmenu blockvmenupair blockvmenuunique' . ($lastopened ? ' blockvmenulast' : '') . ($alt == 1 ? ' blockvmenufirst' : '') . '">' . "\n";
+                            print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
                         }
                     }
 
@@ -384,44 +384,44 @@ 
 
                     if ($this->menu->liste[$i]['level'] == 0) {
                         if ($this->menu->liste[$i]['enabled']) {
-                            print '<div class="menu_titre">' . $tabstring . '<a class="vmenu" href="' . dol_buildpath($this->menu->liste[$i]['url'], 1) . '"' . ($this->menu->liste[$i]['target'] ? ' target="' . $this->menu->liste[$i]['target'] . '"' : '') . '>' . $this->menu->liste[$i]['titre'] . '</a></div>' . "\n";
+                            print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
                         } else {
-                            print '<div class="menu_titre">' . $tabstring . '<font class="vmenudisabled">' . $this->menu->liste[$i]['titre'] . '</font></div>' . "\n";
+                            print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
                         }
-                        print '<div class="menu_top"></div>' . "\n";
+                        print '<div class="menu_top"></div>'."\n";
                     }
 
                     if ($this->menu->liste[$i]['level'] > 0) {
                         $cssmenu = '';
                         if ($this->menu->liste[$i]['url'])
-                            $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+                            $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
 
-                        print '<div class="menu_contenu' . $cssmenu . '">';
+                        print '<div class="menu_contenu'.$cssmenu.'">';
 
                         if ($this->menu->liste[$i]['enabled']) {
                             print $tabstring;
                             if ($this->menu->liste[$i]['url'])
-                                print '<a class="vsmenu" href="' . dol_buildpath($this->menu->liste[$i]['url'], 1) . '"' . ($this->menu->liste[$i]['target'] ? ' target="' . $this->menu->liste[$i]['target'] . '"' : '') . '>';
+                                print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
                             else
                                 print '<span class="vsmenu">';
                             if ($this->menu->liste[$i]['url'])
-                                print $this->menu->liste[$i]['titre'] . '</a>';
+                                print $this->menu->liste[$i]['titre'].'</a>';
                             else
                                 print '</span>';
                         }
                         else {
-                            print $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $this->menu->liste[$i]['titre'] . '</font>';
+                            print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
                         }
 
                         // If title is not pure text and contains a table, no carriage return added
                         if (!strstr($this->menu->liste[$i]['titre'], '<table'))
                             print '<br>';
-                        print '</div>' . "\n";
+                        print '</div>'."\n";
                     }
 
                     // If next is a new block or end
                     if (empty($this->menu->liste[$i + 1]['level'])) {
-                        print '<div class="menu_end"></div>' . "\n";
+                        print '<div class="menu_end"></div>'."\n";
                         print "</div>\n";
                     }
                 }
@@ -511,7 +511,7 @@ 
     global $conf;
 
     print '<div class="tmenudiv">';
-    print '<ul class="tmenu"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"') . '>';
+    print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -525,7 +525,7 @@ 
 function print_start_menu_entry_empty($idsel, $classname, $showmode)
 {
     if ($showmode) {
-        print '<li ' . $classname . ' id="mainmenutd_' . $idsel . '">';
+        print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
         //print '<div class="tmenuleft tmenusep"></div>';
         print '<div class="tmenucenter">';
     }
@@ -548,18 +548,18 @@ 
     global $conf, $langs;
 
     if ($showmode == 1) {
-        print '<a class="tmenuimage" tabindex="-1" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';
-        print '<div class="' . $id . ' ' . $idsel . '"><span class="' . $id . ' tmenuimage" id="mainmenuspan_' . $idsel . '"></span></div>';
+        print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
+        print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
         print '</a>';
-        print '<a ' . $classname . ' id="mainmenua_' . $idsel . '" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';
+        print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
         print '<span class="mainmenuaspan">';
         print $text;
         print '</span>';
         print '</a>';
     }
     if ($showmode == 2) {
-        print '<div class="' . $id . ' ' . $idsel . ' tmenudisabled"><span class="' . $id . '" id="mainmenuspan_' . $idsel . '"></span></div>';
-        print '<a class="tmenudisabled" id="mainmenua_' . $idsel . '" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">';
+        print '<div class="'.$id.' '.$idsel.' tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
+        print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
     }
 }
 

dolibarr/htdocs/core/lib/admin.lib.php

Spacing +161 added lines, -161 removed lines

@@ -19,7 +19,7 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
  */
-require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
 /**
  * 	\file			htdocs/core/lib/admin.lib.php
@@ -38,9 +38,9 @@ 
     if (isset($versionarray[0]))
         $string = $versionarray[0];
     if (isset($versionarray[1]))
-        $string .= '.' . $versionarray[1];
+        $string .= '.'.$versionarray[1];
     if (isset($versionarray[2]))
-        $string .= '.' . $versionarray[2];
+        $string .= '.'.$versionarray[2];
     return $string;
 }
 
@@ -147,7 +147,7 @@ 
 {
     global $db, $conf, $langs, $user;
 
-    dol_syslog("Admin.lib::run_sql run sql file " . $sqlfile . " silent=" . $silent . " entity=" . $entity . " usesavepoint=" . $usesavepoint . " handler=" . $handler . " okerror=" . $okerror, LOG_DEBUG);
+    dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
 
     if (!is_numeric($linelengthlimit)) {
         dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
@@ -178,7 +178,7 @@ 
 
                 // restrict on database type
                 if (!empty($reg[1])) {
-                    if (!preg_match('/' . preg_quote($reg[1]) . '/i', $db->type))
+                    if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type))
                         $qualified = 0;
                 }
 
@@ -233,7 +233,7 @@ 
         fclose($fp);
     }
     else {
-        dol_syslog("Admin.lib::run_sql failed to open file " . $sqlfile, LOG_ERR);
+        dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
     }
 
     // Loop on each request to see if there is a __+MAX_table__ key
@@ -246,7 +246,7 @@ 
             $table = $reg[1];
             if (!isset($listofmaxrowid[$table])) {
                 //var_dump($db);
-                $sqlgetrowid = 'SELECT MAX(rowid) as max from ' . preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
+                $sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
                 $resql = $db->query($sqlgetrowid);
                 if ($resql) {
                     $obj = $db->fetch_object($resql);
@@ -258,7 +258,7 @@ 
                     if (!$silent)
                         print '<tr><td valign="top" colspan="2">';
                     if (!$silent)
-                        print '<div class="error">' . $langs->trans("Failed to get max rowid for " . $table) . "</div></td>";
+                        print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
                     if (!$silent)
                         print '</tr>';
                     $error++;
@@ -266,10 +266,10 @@ 
                 }
             }
             // Replace __+MAX_llx_table__ with +999
-            $from = '__+MAX_' . $table . '__';
-            $to = '+' . $listofmaxrowid[$table];
+            $from = '__+MAX_'.$table.'__';
+            $to = '+'.$listofmaxrowid[$table];
             $newsql = str_replace($from, $to, $newsql);
-            dol_syslog('Admin.lib::run_sql New Request ' . ($i + 1) . ' (replacing ' . $from . ' to ' . $to . ')', LOG_DEBUG);
+            dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
 
             $arraysql[$i] = $newsql;
         }
@@ -279,8 +279,8 @@ 
             // 'INSERT INTO llx_accounting_account (__ENTITY__, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1401, 'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', 0, '...', 1);'
             // with
             // 'INSERT INTO llx_accounting_account (__ENTITY__, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1401 + 200100000, 'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', 0, '...', 1);'
-            $newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + ' . $offsetforchartofaccount . ', \2, \3 + ' . $offsetforchartofaccount, $newsql);
-            $newsql = preg_replace('/([,\s])0 \+ ' . $offsetforchartofaccount . '/ims', '\1 0', $newsql);
+            $newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
+            $newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
             //var_dump($newsql);
             $arraysql[$i] = $newsql;
         }
@@ -297,14 +297,14 @@ 
             }
 
             if (!empty($handler))
-                $sql = preg_replace('/__HANDLER__/i', "'" . $handler . "'", $sql);
+                $sql = preg_replace('/__HANDLER__/i', "'".$handler."'", $sql);
 
             $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
             // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
             if (!$silent)
-                print '<tr><td class="tdtop">' . $langs->trans("Request") . ' ' . ($i + 1) . " sql='" . dol_htmlentities($newsql, ENT_NOQUOTES) . "'</td></tr>\n";
-            dol_syslog('Admin.lib::run_sql Request ' . ($i + 1), LOG_DEBUG);
+                print '<tr><td class="tdtop">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+            dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
             $sqlmodified = 0;
 
             // Replace for encrypt data
@@ -338,25 +338,25 @@ 
                     if (!$silent)
                         print '<tr><td valign="top" colspan="2">';
                     if (!$silent)
-                        print '<div class="error">' . $langs->trans("FileIsNotCorrect") . "</div></td>";
+                        print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
                     if (!$silent)
                         print '</tr>';
                     $error++;
                     break;
                 }
-                $from = '__' . $cursor . '__';
+                $from = '__'.$cursor.'__';
                 $to = $listofinsertedrowid[$cursor];
                 $newsql = str_replace($from, $to, $newsql);
                 $sqlmodified++;
             }
 
             if ($sqlmodified)
-                dol_syslog('Admin.lib::run_sql New Request ' . ($i + 1), LOG_DEBUG);
+                dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
 
             $result = $db->query($newsql, $usesavepoint);
             if ($result) {
                 if (!$silent)
-                    print '<!-- Result = OK -->' . "\n";
+                    print '<!-- Result = OK -->'."\n";
 
                 if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg)) {
                     $cursorinsert++;
@@ -365,13 +365,13 @@ 
                     $table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);
                     $insertedrowid = $db->last_insert_id($table);
                     $listofinsertedrowid[$cursorinsert] = $insertedrowid;
-                    dol_syslog('Admin.lib::run_sql Insert nb ' . $cursorinsert . ', done in table ' . $table . ', rowid is ' . $listofinsertedrowid[$cursorinsert], LOG_DEBUG);
+                    dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
                 }
                 // 	          print '<td align="right">OK</td>';
             } else {
                 $errno = $db->errno();
                 if (!$silent)
-                    print '<!-- Result = ' . $errno . ' -->' . "\n";
+                    print '<!-- Result = '.$errno.' -->'."\n";
 
                 // Define list of errors we accept (array $okerrors)
                 $okerrors = array(// By default
@@ -397,31 +397,31 @@ 
                     if (!$silent)
                         print '<tr><td valign="top" colspan="2">';
                     if (!$silent)
-                        print '<div class="error">' . $langs->trans("Error") . " " . $db->errno() . ": " . $newsql . "<br>" . $db->error() . "</div></td>";
+                        print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
                     if (!$silent)
-                        print '</tr>' . "\n";
-                    dol_syslog('Admin.lib::run_sql Request ' . ($i + 1) . " Error " . $db->errno() . " " . $newsql . "<br>" . $db->error(), LOG_ERR);
+                        print '</tr>'."\n";
+                    dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
                     $error++;
                 }
             }
 
             if (!$silent)
-                print '</tr>' . "\n";
+                print '</tr>'."\n";
         }
     }
 
     if ($error == 0) {
         if (!$silent)
-            print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
+            print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent)
-            print '<td align="right">' . $langs->trans("OK") . '</td></tr>' . "\n";
+            print '<td align="right">'.$langs->trans("OK").'</td></tr>'."\n";
         $ok = 1;
     }
     else {
         if (!$silent)
-            print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
+            print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent)
-            print '<td align="right"><font class="error">' . $langs->trans("KO") . '</font></td></tr>' . "\n";
+            print '<td align="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
         $ok = 0;
     }
 
@@ -447,13 +447,13 @@ 
         return -1;
     }
 
-    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
-    $sql .= " WHERE (" . $db->decrypt('name') . " = '" . $db->escape($name) . "'";
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+    $sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
     if (is_numeric($name))
-        $sql .= " OR rowid = '" . $db->escape($name) . "'";
+        $sql .= " OR rowid = '".$db->escape($name)."'";
     $sql .= ")";
     if ($entity >= 0)
-        $sql .= " AND entity = " . $entity;
+        $sql .= " AND entity = ".$entity;
 
     dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -481,10 +481,10 @@ 
     global $conf;
     $value = '';
 
-    $sql = "SELECT " . $db->decrypt('value') . " as value";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "const";
-    $sql .= " WHERE name = " . $db->encrypt($name, 1);
-    $sql .= " AND entity = " . $entity;
+    $sql = "SELECT ".$db->decrypt('value')." as value";
+    $sql .= " FROM ".MAIN_DB_PREFIX."const";
+    $sql .= " WHERE name = ".$db->encrypt($name, 1);
+    $sql .= " AND entity = ".$entity;
 
     dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -527,20 +527,20 @@ 
 
     $db->begin();
 
-    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
-    $sql .= " WHERE name = " . $db->encrypt($name, 1);
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+    $sql .= " WHERE name = ".$db->encrypt($name, 1);
     if ($entity >= 0)
-        $sql .= " AND entity = " . $entity;
+        $sql .= " AND entity = ".$entity;
 
     dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
     $resql = $db->query($sql);
 
     if (strcmp($value, '')) { // true if different. Must work for $value='0' or $value=0
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity)";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
         $sql .= " VALUES (";
         $sql .= $db->encrypt($name, 1);
-        $sql .= ", " . $db->encrypt($value, 1);
-        $sql .= ",'" . $db->escape($type) . "'," . $visible . ",'" . $db->escape($note) . "'," . $entity . ")";
+        $sql .= ", ".$db->encrypt($value, 1);
+        $sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";
 
         //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
         //print "xx".$db->escape($value);
@@ -571,25 +571,25 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/modules.php?mode=common";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=modules&mode=common";
+    $head[$h][0] = BASE_URI."?controller=admin&method=modules&mode=common";
     $head[$h][1] = $langs->trans("AvailableModules");
     $head[$h][2] = 'common';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/modules.php?mode=marketplace";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=modules&mode=marketplace";
+    $head[$h][0] = BASE_URI."?controller=admin&method=modules&mode=marketplace";
     $head[$h][1] = $langs->trans("ModulesMarketPlaces");
     $head[$h][2] = 'marketplace';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/modules.php?mode=deploy";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=modules&mode=deploy";
+    $head[$h][0] = BASE_URI."?controller=admin&method=modules&mode=deploy";
     $head[$h][1] = $langs->trans("AddExtensionThemeModuleOrOther");
     $head[$h][2] = 'deploy';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/modules.php?mode=develop";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=modules&mode=develop";
+    $head[$h][0] = BASE_URI."?controller=admin&method=modules&mode=develop";
     $head[$h][1] = $langs->trans("ModulesDevelopYourModule");
     $head[$h][2] = 'develop';
     $h++;
@@ -609,20 +609,20 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/security_other.php";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=security_other";
+    $head[$h][0] = BASE_URI."?controller=admin&method=security_other";
     $head[$h][1] = $langs->trans("Miscellaneous");
     $head[$h][2] = 'misc';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/security.php";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=security";
+    $head[$h][0] = BASE_URI."?controller=admin&method=security";
     $head[$h][1] = $langs->trans("Passwords");
     $head[$h][2] = 'passwords';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/security_file.php";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=security_file";
-    $head[$h][1] = $langs->trans("Files") . ' (' . $langs->trans("Upload") . ')';
+    $head[$h][0] = BASE_URI."?controller=admin&method=security_file";
+    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';
     $head[$h][2] = 'file';
     $h++;
 
@@ -634,13 +634,13 @@ 
      */
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/proxy.php";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=proxy";
+    $head[$h][0] = BASE_URI."?controller=admin&method=proxy";
     $head[$h][1] = $langs->trans("ExternalAccess");
     $head[$h][2] = 'proxy';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/events.php";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=events";
+    $head[$h][0] = BASE_URI."?controller=admin&method=events";
     $head[$h][1] = $langs->trans("Audit");
     $head[$h][2] = 'audit';
     $h++;
@@ -649,12 +649,12 @@ 
     // Show permissions lines
     $nbPerms = 0;
     $sql = "SELECT COUNT(r.id) as nb";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def as r";
-    $sql .= " WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-    $sql .= " AND entity = " . $conf->entity;
+    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+    $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+    $sql .= " AND entity = ".$conf->entity;
     $sql .= " AND bydefault = 1";
     if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-        $sql .= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is not enabled
+        $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
     }
     $resql = $db->query($sql);
     if ($resql) {
@@ -668,11 +668,11 @@ 
         dol_print_error($db);
     }
 
-    $head[$h][0] = DOL_URL_ROOT . "/admin/perms.php";
+    $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
     $head[$h][1] = $langs->trans("DefaultRights");
     if ($nbPerms > 0)
     {
-        $head[$h][1] .= ' <span class="badge">' . $nbPerms . '</span>';
+        $head[$h][1] .= ' <span class="badge">'.$nbPerms.'</span>';
     }
     $head[$h][2] = 'default';
     $h++;
@@ -692,13 +692,13 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/translation.php?mode=overwrite";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=translation&mode=overwrite";
+    $head[$h][0] = BASE_URI."?controller=admin&method=translation&mode=overwrite";
     $head[$h][1] = $langs->trans("TranslationOverwriteKey");
     $head[$h][2] = 'overwrite';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/translation.php?mode=searchkey";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=translation&mode=searchkey";
+    $head[$h][0] = BASE_URI."?controller=admin&method=translation&mode=searchkey";
     $head[$h][1] = $langs->trans("TranslationKeySearch");
     $head[$h][2] = 'searchkey';
     $h++;
@@ -723,32 +723,32 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/defaultvalues.php?mode=createform";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=defaultvalues&mode=createform";
+    $head[$h][0] = BASE_URI."?controller=admin&method=defaultvalues&mode=createform";
     $head[$h][1] = $langs->trans("DefaultCreateForm");
     $head[$h][2] = 'createform';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/defaultvalues.php?mode=filters";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=defaultvalues&mode=filters";
+    $head[$h][0] = BASE_URI."?controller=admin&method=defaultvalues&mode=filters";
     $head[$h][1] = $langs->trans("DefaultSearchFilters");
     $head[$h][2] = 'filters';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . "/admin/defaultvalues.php?mode=sortorder";
-    $head[$h][0] = BASE_URI . "?controller=admin&method=defaultvalues&mode=sortorder";
+    $head[$h][0] = BASE_URI."?controller=admin&method=defaultvalues&mode=sortorder";
     $head[$h][1] = $langs->trans("DefaultSortOrder");
     $head[$h][2] = 'sortorder';
     $h++;
 
     if (!empty($conf->use_javascript_ajax)) {
         // $head[$h][0] = DOL_URL_ROOT . "/admin/defaultvalues.php?mode=focus";
-        $head[$h][0] = BASE_URI . "?controller=admin&method=defaultvalues&mode=focus";
+        $head[$h][0] = BASE_URI."?controller=admin&method=defaultvalues&mode=focus";
         $head[$h][1] = $langs->trans("DefaultFocus");
         $head[$h][2] = 'focus';
         $h++;
 
         // $head[$h][0] = DOL_URL_ROOT . "/admin/defaultvalues.php?mode=mandatory";
-        $head[$h][0] = BASE_URI . "?controller=admin&method=defaultvalues&mode=mandatory";
+        $head[$h][0] = BASE_URI."?controller=admin&method=defaultvalues&mode=mandatory";
         $head[$h][1] = $langs->trans("DefaultMandatory");
         $head[$h][2] = 'mandatory';
         $h++;
@@ -784,13 +784,13 @@ 
         $sessPath = $iniPath;
     }
     $sessPath .= '/'; // We need the trailing slash
-    dol_syslog('admin.lib:listOfSessions sessPath=' . $sessPath);
+    dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
 
     $dh = @opendir(dol_osencode($sessPath));
     if ($dh) {
         while (($file = @readdir($dh)) !== false) {
             if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..") {
-                $fullpath = $sessPath . $file;
+                $fullpath = $sessPath.$file;
                 if (!@is_dir($fullpath) && is_readable($fullpath)) {
                     $sessValues = file_get_contents($fullpath); // get raw session data
                     // Example of possible value
@@ -799,8 +799,8 @@ 
                     // dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
 
                     if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                        (preg_match('/dol_entity\|i:' . $conf->entity . ';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"' . $conf->entity . '"/i', $sessValues)) && // limit to current entity
-                        preg_match('/dol_company\|s:([0-9]+):"(' . $conf->global->MAIN_INFO_SOCIETE_NOM . ')"/i', $sessValues)) { // limit to company name
+                        (preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
+                        preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
                         $tmp = explode('_', $file);
                         $idsess = $tmp[1];
                         $login = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
@@ -830,20 +830,20 @@ 
     global $conf;
 
     $arrayofSessions = array();
-    $sessPath = ini_get("session.save_path") . "/";
-    dol_syslog('admin.lib:purgeSessions mysessionid=' . $mysessionid . ' sessPath=' . $sessPath);
+    $sessPath = ini_get("session.save_path")."/";
+    dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
 
     $error = 0;
     $dh = @opendir(dol_osencode($sessPath));
     while (($file = @readdir($dh)) !== false) {
         if ($file != "." && $file != "..") {
-            $fullpath = $sessPath . $file;
+            $fullpath = $sessPath.$file;
             if (!@is_dir($fullpath)) {
                 $sessValues = file_get_contents($fullpath); // get raw session data
 
                 if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                    preg_match('/dol_entity\|s:([0-9]+):"(' . $conf->entity . ')"/i', $sessValues) && // limit to current entity
-                    preg_match('/dol_company\|s:([0-9]+):"(' . $conf->global->MAIN_INFO_SOCIETE_NOM . ')"/i', $sessValues)) { // limit to company name
+                    preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
+                    preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name
                     $tmp = explode('_', $file);
                     $idsess = $tmp[1];
                     // We remove session if it's not ourself
@@ -883,7 +883,7 @@ 
 
     $ret = array('nbmodules' => 0, 'errors' => array(), 'nbperms' => 0);
     $modName = $value;
-    $modFile = $modName . ".class.php";
+    $modFile = $modName.".class.php";
 
     // Loop on each directory to fill $modulesdir
     $modulesdir = dolGetModulesDirs();
@@ -891,8 +891,8 @@ 
     // Loop on each modulesdir directories
     $found = false;
     foreach ($modulesdir as $dir) {
-        if (file_exists($dir . $modFile)) {
-            $found = @include_once $dir . $modFile;
+        if (file_exists($dir.$modFile)) {
+            $found = @include_once $dir.$modFile;
             if ($found)
                 break;
         }
@@ -928,7 +928,7 @@ 
         return $ret;
     }
 
-    $result = $objMod->init();    // Enable module
+    $result = $objMod->init(); // Enable module
 
     if ($result <= 0) {
         $ret['errors'][] = $objMod->error;
@@ -939,13 +939,13 @@ 
                 // this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
                 foreach ($objMod->depends as $key => $modulestring) {
                     //var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
-                    if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^' . $mysoc->country_code . '/', $key)) {
-                        dol_syslog("We are not concerned by dependency with key=" . $key . " because our country is " . $mysoc->country_code);
+                    if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key)) {
+                        dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
                         continue;
                     }
                     $activate = false;
                     foreach ($modulesdir as $dir) {
-                        if (file_exists($dir . $modulestring . ".class.php")) {
+                        if (file_exists($dir.$modulestring.".class.php")) {
                             $resarray = activateModule($modulestring);
                             if (empty($resarray['errors'])) {
                                 $activate = true;
@@ -972,7 +972,7 @@ 
                 $num = count($objMod->conflictwith);
                 for ($i = 0; $i < $num; $i++) {
                     foreach ($modulesdir as $dir) {
-                        if (file_exists($dir . $objMod->conflictwith[$i] . ".class.php")) {
+                        if (file_exists($dir.$objMod->conflictwith[$i].".class.php")) {
                             unActivateModule($objMod->conflictwith[$i], 0);
                         }
                     }
@@ -982,7 +982,7 @@ 
     }
 
     if (!count($ret['errors'])) {
-        $ret['nbmodules'] ++;
+        $ret['nbmodules']++;
         if (isset($objMod->rights)) {
             $ret['nbperms'] += count($objMod->rights);
         }
@@ -1008,7 +1008,7 @@ 
 
     $ret = '';
     $modName = $value;
-    $modFile = $modName . ".class.php";
+    $modFile = $modName.".class.php";
 
     // Loop on each directory to fill $modulesdir
     $modulesdir = dolGetModulesDirs();
@@ -1016,8 +1016,8 @@ 
     // Loop on each modulesdir directories
     $found = false;
     foreach ($modulesdir as $dir) {
-        if (file_exists($dir . $modFile)) {
-            $found = @include_once $dir . $modFile;
+        if (file_exists($dir.$modFile)) {
+            $found = @include_once $dir.$modFile;
             if ($found)
                 break;
         }
@@ -1032,12 +1032,12 @@ 
     else {
         //print $dir.$modFile;
         // TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
-        include_once DOL_BASE_PATH . '/core/modules/DolibarrModules.class.php';
+        include_once DOL_BASE_PATH.'/core/modules/DolibarrModules.class.php';
         $genericMod = new DolibarrModules($db);
         $genericMod->name = preg_replace('/^mod/i', '', $modName);
         $genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));
-        $genericMod->const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', $modName));
-        dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
+        $genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
+        dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);
         $genericMod->_remove(array());
     }
 
@@ -1083,16 +1083,16 @@ 
     foreach ($modulesdir as $dir) {
         // Load modules attributes in arrays (name, numero, orders) from dir directory
         //print $dir."\n<br>";
-        dol_syslog("Scan directory " . $dir . " for modules");
+        dol_syslog("Scan directory ".$dir." for modules");
         $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle)) {
             while (($file = readdir($handle)) !== false) {
                 //print "$i ".$file."\n<br>";
-                if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
                     $modName = substr($file, 0, dol_strlen($file) - 10);
 
                     if ($modName) {
-                        include_once $dir . $file;
+                        include_once $dir.$file;
                         $objMod = new $modName($db);
 
                         if ($objMod->numero > 0) {
@@ -1104,7 +1104,7 @@ 
                         $modulequalified = 1;
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
                         if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name)
                             $modulequalified = 0;
                         if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name)
@@ -1123,7 +1123,7 @@ 
 
                             // Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
                             if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries))
-                                $objMod->dictionaries = $objMod->dictionnaries;  // For backward compatibility
+                                $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
 
                             if (!empty($objMod->dictionaries)) {
                                 //var_dump($objMod->dictionaries['tabname']);
@@ -1177,7 +1177,7 @@ 
                                     }
 
                                 if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort) {
-                                    print 'Error in descriptor of module ' . $const_name . '. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
+                                    print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
                                     //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
                                 } else {
                                     $taborder[] = 0; // Add an empty line
@@ -1187,14 +1187,14 @@ 
                             $j++;
                             $i++;
                         } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                            dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
         }
         else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
+            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
 
@@ -1215,21 +1215,21 @@ 
 
     foreach ($modulesdir as $dir) {
         // Load modules attributes in arrays (name, numero, orders) from dir directory
-        dol_syslog("Scan directory " . $dir . " for modules");
+        dol_syslog("Scan directory ".$dir." for modules");
         $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle)) {
             while (($file = readdir($handle)) !== false) {
-                if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
                     $modName = substr($file, 0, dol_strlen($file) - 10);
 
                     if ($modName) {
-                        include_once $dir . $file;
+                        include_once $dir.$file;
                         $objMod = new $modName($db);
 
                         $modulequalified = 1;
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
 
                         if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2)
                             $modulequalified = 0;
@@ -1246,14 +1246,14 @@ 
                                 setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
                             }
                         } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                            dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
         }
         else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
+            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
 
@@ -1285,16 +1285,16 @@ 
     foreach ($modulesdir as $dir) {
         // Load modules attributes in arrays (name, numero, orders) from dir directory
         //print $dir."\n<br>";
-        dol_syslog("Scan directory " . $dir . " for modules");
+        dol_syslog("Scan directory ".$dir." for modules");
         $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle)) {
             while (($file = readdir($handle)) !== false) {
                 //print "$i ".$file."\n<br>";
-                if (is_readable($dir . $file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
+                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
                     $modName = substr($file, 0, dol_strlen($file) - 10);
 
                     if ($modName) {
-                        include_once $dir . $file;
+                        include_once $dir.$file;
                         $objMod = new $modName($db);
 
                         if ($objMod->numero > 0) {
@@ -1306,7 +1306,7 @@ 
                         $modulequalified = 1;
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
                         if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name)
                             $modulequalified = 0;
                         if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name)
@@ -1325,7 +1325,7 @@ 
 
                             $modules[$i] = $objMod;
                             $filename[$i] = $modName;
-                            $orders[$i] = $objMod->family . "_" . $j;   // Sort on family then module number
+                            $orders[$i] = $objMod->family."_".$j; // Sort on family then module number
                             $dirmod[$i] = $dir;
                             //print "x".$modName." ".$orders[$i]."\n<br>";
 
@@ -1336,14 +1336,14 @@ 
                             $j++;
                             $i++;
                         } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                            dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
         }
         else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
+            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
 
@@ -1367,17 +1367,17 @@ 
     $form = new Form($db);
 
     if (!empty($strictw3c) && $strictw3c == 1)
-        print "\n" . '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+        print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td class="titlefield">' . $langs->trans("Description") . '</td>';
+    print '<td class="titlefield">'.$langs->trans("Description").'</td>';
     print '<td>';
     $text = $langs->trans("Value");
     print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
     print '</td>';
     if (empty($strictw3c))
-        print '<td align="center" width="80">' . $langs->trans("Action") . '</td>';
+        print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
     print "</tr>\n";
 
     $label = '';
@@ -1400,13 +1400,13 @@ 
 
         $sql = "SELECT ";
         $sql .= "rowid";
-        $sql .= ", " . $db->decrypt('name') . " as name";
-        $sql .= ", " . $db->decrypt('value') . " as value";
+        $sql .= ", ".$db->decrypt('name')." as name";
+        $sql .= ", ".$db->decrypt('value')." as value";
         $sql .= ", type";
         $sql .= ", note";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "const";
-        $sql .= " WHERE " . $db->decrypt('name') . " = '" . $db->escape($const) . "'";
-        $sql .= " AND entity IN (0, " . $conf->entity . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."const";
+        $sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";
+        $sql .= " AND entity IN (0, ".$conf->entity.")";
         $sql .= " ORDER BY name ASC, entity DESC";
         $result = $db->query($sql);
 
@@ -1419,8 +1419,8 @@ 
             }
 
             if (empty($strictw3c)) {
-                print "\n" . '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             }
 
             print '<tr class="oddeven">';
@@ -1429,29 +1429,29 @@ 
             print '<td>';
             if (empty($strictw3c))
                 print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="rowid' . (empty($strictw3c) ? '' : '[]') . '" value="' . $obj->rowid . '">';
-            print '<input type="hidden" name="constname' . (empty($strictw3c) ? '' : '[]') . '" value="' . $const . '">';
-            print '<input type="hidden" name="constnote_' . $obj->name . '" value="' . nl2br(dol_escape_htmltag($obj->note)) . '">';
-            print '<input type="hidden" name="consttype_' . $obj->name . '" value="' . ($obj->type ? $obj->type : 'string') . '">';
+            print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
+            print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
+            print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+            print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';
 
-            print ($label ? $label : $langs->trans('Desc' . $const));
+            print ($label ? $label : $langs->trans('Desc'.$const));
 
             if ($const == 'ADHERENT_MAILMAN_URL') {
-                print '. ' . $langs->trans("Example") . ': <a href="#" id="exampleclick1">' . img_down() . '</a><br>';
+                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
                 //print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
                 print '<div id="example1" class="hidden">';
                 print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
                 print '</div>';
             }
             if ($const == 'ADHERENT_MAILMAN_UNSUB_URL') {
-                print '. ' . $langs->trans("Example") . ': <a href="#" id="exampleclick2">' . img_down() . '</a><br>';
+                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
                 print '<div id="example2" class="hidden">';
                 print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
                 print '</div>';
                 //print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
             if ($const == 'ADHERENT_MAILMAN_LISTS') {
-                print '. ' . $langs->trans("Example") . ': <a href="#" id="exampleclick3">' . img_down() . '</a><br>';
+                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
                 print '<div id="example3" class="hidden">';
                 print 'mymailmanlist<br>';
                 print 'mymailmanlist1,mymailmanlist2<br>';
@@ -1468,31 +1468,31 @@ 
             if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE') {
                 print '<td>';
                 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
-                require_once DOL_BASE_PATH . '/core/lib/format_cards.lib.php';
+                require_once DOL_BASE_PATH.'/core/lib/format_cards.lib.php';
                 $arrayoflabels = array();
                 foreach (array_keys($_Avery_Labels) as $codecards) {
                     $arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
                 }
-                print $form->selectarray('constvalue' . (empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
+                print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
                 print '<input type="hidden" name="consttype" value="yesno">';
-                print '<input type="hidden" name="constnote' . (empty($strictw3c) ? '' : '[]') . '" value="' . nl2br(dol_escape_htmltag($obj->note)) . '">';
+                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
                 print '</td>';
             } else {
                 print '<td>';
-                print '<input type="hidden" name="consttype' . (empty($strictw3c) ? '' : '[]') . '" value="' . ($obj->type ? $obj->type : 'string') . '">';
-                print '<input type="hidden" name="constnote' . (empty($strictw3c) ? '' : '[]') . '" value="' . nl2br(dol_escape_htmltag($obj->note)) . '">';
+                print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
+                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
                 if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT'))) {
-                    print '<textarea class="flat" name="constvalue' . (empty($strictw3c) ? '' : '[]') . '" cols="50" rows="5" wrap="soft">' . "\n";
+                    print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
                     print $obj->value;
                     print "</textarea>\n";
                 } elseif ($obj->type == 'html') {
-                    require_once DOL_BASE_PATH . '/core/class/doleditor.class.php';
-                    $doleditor = new DolEditor('constvalue_' . $const . (empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+                    require_once DOL_BASE_PATH.'/core/class/doleditor.class.php';
+                    $doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
                     $doleditor->Create();
                 } elseif ($obj->type == 'yesno') {
-                    print $form->selectyesno('constvalue' . (empty($strictw3c) ? '' : '[]'), $obj->value, 1);
+                    print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
                 } elseif (preg_match('/emailtemplate/', $obj->type)) {
-                    include_once DOL_BASE_PATH . '/core/class/html.formmail.class.php';
+                    include_once DOL_BASE_PATH.'/core/class/html.formmail.class.php';
                     $formmail = new FormMail($db);
 
                     $tmp = explode(':', $obj->type);
@@ -1505,23 +1505,23 @@ 
                             //var_dump($modelmail);
                             $moreonlabel = '';
                             if (!empty($arrayofmessagename[$modelmail->label]))
-                                $moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
-                            $arrayofmessagename[$modelmail->label] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
+                                $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+                            $arrayofmessagename[$modelmail->label] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
                         }
                     }
                     //var_dump($arraydefaultmessage);
                     //var_dump($arrayofmessagename);
-                    print $form->selectarray('constvalue_' . $obj->name, $arrayofmessagename, $obj->value, 'None', 1, 0, '', 0, 0, 0, '', '', 1);
+                    print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value, 'None', 1, 0, '', 0, 0, 0, '', '', 1);
                 }
                 else { // type = 'string' ou 'chaine'
-                    print '<input type="text" class="flat" size="48" name="constvalue' . (empty($strictw3c) ? '' : '[]') . '" value="' . dol_escape_htmltag($obj->value) . '">';
+                    print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
                 }
                 print '</td>';
             }
             // Submit
             if (empty($strictw3c)) {
                 print '<td align="center">';
-                print '<input type="submit" class="button" value="' . $langs->trans("Update") . '" name="Button">';
+                print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
                 print "</td>";
             }
             print "</tr>\n";
@@ -1532,7 +1532,7 @@ 
     print '</table>';
 
     if (!empty($strictw3c) && $strictw3c == 1) {
-        print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Update") . '" name="update"></div>';
+        print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
         print "</form>\n";
     }
 }
@@ -1565,7 +1565,7 @@ 
             else
                 $text .= ' ';
             $i++;
-            $text .= $langs->trans('Module' . $module->numero . 'Name');
+            $text .= $langs->trans('Module'.$module->numero.'Name');
         }
     }
     return $text;
@@ -1586,10 +1586,10 @@ 
 
     $db->begin();
 
-    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('" . $db->escape($name) . "','" . $type . "'," . $conf->entity . ", ";
-    $sql .= ($label ? "'" . $db->escape($label) . "'" : 'null') . ", ";
-    $sql .= (!empty($description) ? "'" . $db->escape($description) . "'" : "null");
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+    $sql .= " VALUES ('".$db->escape($name)."','".$type."',".$conf->entity.", ";
+    $sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
+    $sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
     $sql .= ")";
 
     dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
@@ -1617,10 +1617,10 @@ 
 
     $db->begin();
 
-    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "document_model";
-    $sql .= " WHERE nom = '" . $db->escape($name) . "'";
-    $sql .= " AND type = '" . $type . "'";
-    $sql .= " AND entity = " . $conf->entity;
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+    $sql .= " WHERE nom = '".$db->escape($name)."'";
+    $sql .= " AND type = '".$type."'";
+    $sql .= " AND entity = ".$conf->entity;
 
     dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -1671,13 +1671,13 @@ 
     $head = array();
 
     //$head[$h][0] = DOL_URL_ROOT . "/admin/company.php";
-    $head[$h][0] = BASE_URI . '?controller=admin&method=company';
+    $head[$h][0] = BASE_URI.'?controller=admin&method=company';
     $head[$h][1] = $langs->trans("Company");
     $head[$h][2] = 'company';
     $h++;
 
     //$head[$h][0] = DOL_URL_ROOT . "/admin/accountant.php";
-    $head[$h][0] = BASE_URI . '?controller=admin&method=accountant';
+    $head[$h][0] = BASE_URI.'?controller=admin&method=accountant';
     $head[$h][1] = $langs->trans("Accountant");
     $head[$h][2] = 'accountant';
     $h++;
@@ -1700,26 +1700,26 @@ 
     $head = array();
 
     if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
-        $head[$h][0] = DOL_URL_ROOT . "/admin/mails.php";
+        $head[$h][0] = DOL_URL_ROOT."/admin/mails.php";
         $head[$h][1] = $langs->trans("OutGoingEmailSetup");
         $head[$h][2] = 'common';
         $h++;
 
         if ($conf->mailing->enabled) {
-            $head[$h][0] = DOL_URL_ROOT . "/admin/mails_emailing.php";
+            $head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
             $head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing");
             $head[$h][2] = 'common_emailing';
             $h++;
         }
     }
 
-    $head[$h][0] = DOL_URL_ROOT . "/admin/mails_templates.php";
+    $head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
     $head[$h][1] = $langs->trans("EMailTemplates");
     $head[$h][2] = 'templates';
     $h++;
 
     if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && !empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
-        $head[$h][0] = DOL_URL_ROOT . "/admin/mails_senderprofile_list.php";
+        $head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php";
         $head[$h][1] = $langs->trans("EmailSenderProfiles");
         $head[$h][2] = 'senderprofiles';
         $h++;

dolibarr/htdocs/core/boxes/box_task.php

Spacing +26 added lines, -26 removed lines

@@ -33,8 +33,8 @@ 
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode="projet";
-    public $boximg="object_projecttask";
+    public $boxcode = "projet";
+    public $boximg = "object_projecttask";
     public $boxlabel;
     //public $depends = array("projet");
 
@@ -44,7 +44,7 @@ 
     public $db;
 
     public $param;
-    public $enabled = 0;		// Disabled because bugged.
+    public $enabled = 0; // Disabled because bugged.
 
     public $info_box_head = array();
     public $info_box_contents = array();
@@ -56,17 +56,17 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param='')
+    function __construct($db, $param = '')
     {
         global $user, $langs;
 
         // Load translation files required by the page
         $langs->loadLangs(array('boxes', 'projects'));
 
-        $this->boxlabel="Tasks";
+        $this->boxlabel = "Tasks";
         $this->db = $db;
 
-        $this->hidden = ! ($user->rights->projet->lire);
+        $this->hidden = !($user->rights->projet->lire);
     }
 
 	/**
@@ -75,20 +75,20 @@ 
 	 *  @param  int     $max        Maximum number of records to load
 	 *  @return void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		$totalMnt = 0;
 		$totalnb = 0;
-		$totalDuree=0;
-		$totalplannedtot=0;
-		$totaldurationtot=0;
+		$totalDuree = 0;
+		$totalplannedtot = 0;
+		$totaldurationtot = 0;
 		
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
-		$taskstatic=new Task($db);
+		$taskstatic = new Task($db);
 
 
 		$textHead = $langs->trans("Tasks")." ".date("Y");
@@ -98,12 +98,12 @@ 
 		if ($user->rights->projet->lire) {
 			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
 			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
+			$sql .= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
+			$sql .= " AND pt.rowid = ptt.fk_task";
+			$sql .= " GROUP BY pt.fk_statut ";
+			$sql .= " ORDER BY pt.fk_statut DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -115,22 +115,22 @@ 
                     $objp = $db->fetch_object($result);
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
+                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut, 0),
                     );
 
                     $this->info_box_contents[$i][] = array(
                         'td' => 'class="right"',
                         'text' => $objp->nb." ".$langs->trans("Tasks"),
                         //'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
-                        'url' => BASE_URI . "?controller=projet/tasks&method=list&leftmenu=projects&viewstatut=" . $objp->fk_statut,
+                        'url' => BASE_URI."?controller=projet/tasks&method=list&leftmenu=projects&viewstatut=".$objp->fk_statut,
                     );
 					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot, 'all', 25200, 5));
 					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
 					$totaldurationtot += $objp->durationtot;
 
-					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
+					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
 
 					$i++;
 				}
@@ -142,8 +142,8 @@ 
 		// Add the sum at the bottom of the boxes
 		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")." ".$textHead);
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
 		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
 	}
 
@@ -155,7 +155,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-	function showBox($head = null, $contents = null, $nooutput=0)
+	function showBox($head = null, $contents = null, $nooutput = 0)
 	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

dolibarr/htdocs/core/js/lib_foot.js.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 
 session_cache_limiter('public');
 
-require_once DOL_BASE_PATH . '/main.inc.php';
+require_once DOL_BASE_PATH.'/main.inc.php';
 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
@@ -79,7 +79,7 @@ 
 					});
             		jQuery(".classfortooltiponclicktext").dialog(
             			{ closeOnEscape: true, classes: { "ui-dialog": "highlight" },
-						maxHeight: window.innerHeight-60, width: ' . ($conf->browser->layout == 'phone' ? 400 : 700) . ',
+						maxHeight: window.innerHeight-60, width: ' . ($conf->browser->layout == 'phone' ? 400 : 700).',
 						modal: true,
 						autoOpen: false }).css("z-index: 5000");
             		jQuery(".classfortooltiponclick").click(function () {
@@ -140,7 +140,7 @@ 
                 jQuery(document).ready(function () {
 			        jQuery(".documentpreview").click(function () {
             		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
-            		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \'' . dol_escape_js($langs->transnoentities("Preview")) . '\');
+            		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \'' . dol_escape_js($langs->transnoentities("Preview")).'\');
                 		return false;
         			});
         		});

dolibarr/htdocs/core/js/lib_head.js.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 
 session_cache_limiter('public');
 
-require_once DOL_BASE_PATH . '/main.inc.php';
+require_once DOL_BASE_PATH.'/main.inc.php';
 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
@@ -1046,7 +1046,7 @@ 
     }
     if ($thousand == 'Space')
         $thousand = ' ';
-    print "var dec='" . dol_escape_js($dec) . "'; var thousand='" . dol_escape_js($thousand) . "';\n";    // Set var in javascript
+    print "var dec='".dol_escape_js($dec)."'; var thousand='".dol_escape_js($thousand)."';\n"; // Set var in javascript
 
     ?>
 

dolibarr/htdocs/theme/eldy/style.css.php

Spacing +125 added lines, -125 removed lines

@@ -48,18 +48,18 @@ 
 }
 
 // Colors
-$colorbackhmenu1 = '60,70,100';      // topmenu
-$colorbackvmenu1 = '248,248,248';      // vmenu
-$colortopbordertitle1 = '200,200,200';    // top border of title
-$colorbacktitle1 = '220,220,223';      // title of tables,list
-$colorbacktabcard1 = '255,255,255';  // card
+$colorbackhmenu1 = '60,70,100'; // topmenu
+$colorbackvmenu1 = '248,248,248'; // vmenu
+$colortopbordertitle1 = '200,200,200'; // top border of title
+$colorbacktitle1 = '220,220,223'; // title of tables,list
+$colorbacktabcard1 = '255,255,255'; // card
 $colorbacktabactive = '234,234,234';
-$colorbacklineimpair1 = '255,255,255';    // line impair
-$colorbacklineimpair2 = '255,255,255';    // line impair
-$colorbacklinepair1 = '250,250,250';    // line pair
-$colorbacklinepair2 = '250,250,250';    // line pair
+$colorbacklineimpair1 = '255,255,255'; // line impair
+$colorbacklineimpair2 = '255,255,255'; // line impair
+$colorbacklinepair1 = '250,250,250'; // line pair
+$colorbacklinepair2 = '250,250,250'; // line pair
 $colorbacklinepairhover = '230,237,244'; // line hover
-$colorbacklinebreak = '214,218,220';  // line break
+$colorbacklinebreak = '214,218,220'; // line break
 $colorbackbody = '255,255,255';
 $colortexttitlenotab = '100,60,20';
 $colortexttitle = '0,0,0';
@@ -73,8 +73,8 @@ 
 
 session_cache_limiter('public');
 
-require_once DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
 // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
@@ -95,7 +95,7 @@ 
 }
 
 if (GETPOST('theme', 'alpha')) {
-    $conf->theme = GETPOST('theme', 'alpha');  // If theme was forced on URL
+    $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
 }
 if (GETPOST('lang', 'aZ09')) {
     $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
@@ -105,18 +105,18 @@ 
 $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
 $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
-$path = '';     // This value may be used in future for external module to overwrite theme
+$path = ''; // This value may be used in future for external module to overwrite theme
 $theme = 'eldy'; // Value of theme
 if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
-    $path = '/' . $conf->global->MAIN_OVERWRITE_THEME_RES;
+    $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
     $theme = $conf->global->MAIN_OVERWRITE_THEME_RES;
 }
 
 // Define image path files and other constants
-$fontlist = 'roboto,arial,tahoma,verdana,helvetica';    //$fontlist='helvetica, verdana, arial, sans-serif';
+$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
 //$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
 $img_head = '';
-$img_button = dol_buildpath($path . '/theme/' . $theme . '/img/button_bg.png', 1);
+$img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
 $dol_hide_topmenu = $conf->dol_hide_topmenu;
 $dol_hide_leftmenu = $conf->dol_hide_leftmenu;
 $dol_optimize_smallscreen = $conf->dol_optimize_smallscreen;
@@ -151,7 +151,7 @@ 
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
-    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255';     // card
+    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
     $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
     $conf->global->THEME_ELDY_TEXT = '0,0,0';
     $conf->global->THEME_ELDY_FONT_SIZE1 = '0.86em';
@@ -188,7 +188,7 @@ 
 
 //$colortopbordertitle1=$colorbackhmenu1;
 // Set text color to black or white
-$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackhmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460)
@@ -196,7 +196,7 @@ 
 else
     $colortextbackhmenu = '000000';
 
-$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) {
@@ -205,7 +205,7 @@ 
     $colortextbackvmenu = '000000';
 }
 
-$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '') {
     $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
@@ -219,7 +219,7 @@ 
 } else
     $colorshadowtitle = '888888';
 
-$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
 if ($tmpval <= 460) {
@@ -252,9 +252,9 @@ 
 $nbtopmenuentries = $menumanager->showmenu('topnb');
 
 
-$minwidthtmenu = 66;  /* minimum width for one top menu entry */
-$heightmenu = 48;   /* height of top menu, part with image */
-$heightmenu2 = 49;        /* height of top menu, part with login  */
+$minwidthtmenu = 66; /* minimum width for one top menu entry */
+$heightmenu = 48; /* height of top menu, part with image */
+$heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 130;
 if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
@@ -263,32 +263,32 @@ 
     $minwidthtmenu = 0;
 }
 
-print '/*' . "\n";
-print 'colorbackbody=' . $colorbackbody . "\n";
-print 'colorbackvmenu1=' . $colorbackvmenu1 . "\n";
-print 'colorbackhmenu1=' . $colorbackhmenu1 . "\n";
-print 'colorbacktitle1=' . $colorbacktitle1 . "\n";
-print 'colorbacklineimpair1=' . $colorbacklineimpair1 . "\n";
-print 'colorbacklineimpair2=' . $colorbacklineimpair2 . "\n";
-print 'colorbacklinepair1=' . $colorbacklinepair1 . "\n";
-print 'colorbacklinepair2=' . $colorbacklinepair2 . "\n";
-print 'colorbacklinepairhover=' . $colorbacklinepairhover . "\n";
-print 'colorbacklinepairchecked=' . $colorbacklinepairchecked . "\n";
-print '$colortexttitlenotab=' . $colortexttitlenotab . "\n";
-print '$colortexttitle=' . $colortexttitle . "\n";
-print '$colortext=' . $colortext . "\n";
-print '$colortextlink=' . $colortextlink . "\n";
-print '$colortextbackhmenu=' . $colortextbackhmenu . "\n";
-print '$colortextbackvmenu=' . $colortextbackvmenu . "\n";
-print 'dol_hide_topmenu=' . $dol_hide_topmenu . "\n";
-print 'dol_hide_leftmenu=' . $dol_hide_leftmenu . "\n";
-print 'dol_optimize_smallscreen=' . $dol_optimize_smallscreen . "\n";
-print 'dol_no_mouse_hover=' . $dol_no_mouse_hover . "\n";
-print 'dol_screenwidth=' . $_SESSION['dol_screenwidth'] . "\n";
-print 'dol_screenheight=' . $_SESSION['dol_screenheight'] . "\n";
-print 'fontsize=' . $fontsize . "\n";
-print 'nbtopmenuentries=' . $nbtopmenuentries . "\n";
-print '*/' . "\n";
+print '/*'."\n";
+print 'colorbackbody='.$colorbackbody."\n";
+print 'colorbackvmenu1='.$colorbackvmenu1."\n";
+print 'colorbackhmenu1='.$colorbackhmenu1."\n";
+print 'colorbacktitle1='.$colorbacktitle1."\n";
+print 'colorbacklineimpair1='.$colorbacklineimpair1."\n";
+print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
+print 'colorbacklinepair1='.$colorbacklinepair1."\n";
+print 'colorbacklinepair2='.$colorbacklinepair2."\n";
+print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
+print 'colorbacklinepairchecked='.$colorbacklinepairchecked."\n";
+print '$colortexttitlenotab='.$colortexttitlenotab."\n";
+print '$colortexttitle='.$colortexttitle."\n";
+print '$colortext='.$colortext."\n";
+print '$colortextlink='.$colortextlink."\n";
+print '$colortextbackhmenu='.$colortextbackhmenu."\n";
+print '$colortextbackvmenu='.$colortextbackvmenu."\n";
+print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
+print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
+print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
+print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
+print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n";
+print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n";
+print 'fontsize='.$fontsize."\n";
+print 'nbtopmenuentries='.$nbtopmenuentries."\n";
+print '*/'."\n";
 
 ?>
 
@@ -304,14 +304,14 @@ 
         background: rgb(<?php print $colorbackbody; ?>);
     <?php } ?>
     color: rgb(<?php echo $colortext; ?>);
-    font-size: <?php print is_numeric($fontsize) ? $fontsize . 'px' : $fontsize; ?>;
+    font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
     line-height: 1.4;
     font-family: <?php print $fontlist ?>;
     margin-top: 0;
     margin-bottom: 0;
     margin-right: 0;
     margin-left: 0;
-    <?php print 'direction: ' . $langs->trans("DIRECTION") . ";\n"; ?>
+    <?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
     }
 
 .thumbstat { font-weight: bold !important; }
@@ -435,29 +435,29 @@ 
 box-shadow: 1px 1px 8px #bbb;
 }
 input.buttonpaymentcb {
-background-image: url(<?php echo dol_buildpath($path . '/theme/common/credit_card.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png', 1) ?>);
 background-size: 26px;
 background-repeat: no-repeat;
 background-position: 5px 11px;
 }
 input.buttonpaymentcheque {
-background-image: url(<?php echo dol_buildpath($path . '/theme/common/cheque.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png', 1) ?>);
 background-size: 24px;
 background-repeat: no-repeat;
 background-position: 5px 8px;
 }
 input.buttonpaymentpaypal {
-background-image: url(<?php echo dol_buildpath($path . '/paypal/img/object_paypal.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png', 1) ?>);
 background-repeat: no-repeat;
 background-position: 8px 11px;
 }
 input.buttonpaymentpaybox {
-background-image: url(<?php echo dol_buildpath($path . '/paybox/img/object_paybox.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png', 1) ?>);
 background-repeat: no-repeat;
 background-position: 8px 11px;
 }
 input.buttonpaymentstripe {
-background-image: url(<?php echo dol_buildpath($path . '/stripe/img/object_stripe.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png', 1) ?>);
 background-repeat: no-repeat;
 background-position: 8px 11px;
 }
@@ -950,7 +950,7 @@ 
 }
 
 .flexcontainer {
-<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;' . "\n"; ?>
+<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;'."\n"; ?>
 flex-flow: row wrap;
 justify-content: flex-start;
 }
@@ -1076,10 +1076,10 @@ 
 @media only screen and (max-width: 767px)
 {
 body {
-font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3) . 'px' : $fontsize; ?>;
+font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?>;
 }
 div.refidno {
-font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3) . 'px' : $fontsize; ?> !important;
+font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?> !important;
 }
 }
 
@@ -1087,10 +1087,10 @@ 
 @media only screen and (max-width: 570px)
 {
 body {
-font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3) . 'px' : $fontsize; ?>;
+font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?>;
 }
 div.refidno {
-font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3) . 'px' : $fontsize; ?> !important;
+font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?> !important;
 }
 
 .divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
@@ -1119,7 +1119,7 @@ 
 }
 input, input[type=text], input[type=password], select, textarea     {
 min-width: 20px;
-font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3) . 'px' : $fontsize; ?>;
+font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?>;
 /* min-height: 1.4em; */
 /* line-height: 1.4em; */
 /* padding: .4em .1em; */
@@ -1339,8 +1339,8 @@ 
 div.fiche {
 margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
 margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '29' : '6')); ?>px;
-<?php if (!empty($dol_hide_leftmenu)) print 'margin-bottom: 12px;' . "\n"; ?>
-<?php if (!empty($dol_hide_leftmenu)) print 'margin-top: 12px;' . "\n"; ?>
+<?php if (!empty($dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
+<?php if (!empty($dol_hide_leftmenu)) print 'margin-top: 12px;'."\n"; ?>
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
 margin: 20px !important;
@@ -1359,7 +1359,7 @@ 
 div.fichethirdleft {
 <?php
 if ($conf->browser->layout != 'phone') {
-    print "float: " . $left . ";\n";
+    print "float: ".$left.";\n";
 }
 
 ?>
@@ -1379,7 +1379,7 @@ 
 div.fichetwothirdright {
 <?php
 if ($conf->browser->layout != 'phone') {
-    print "float: " . $right . ";\n";
+    print "float: ".$right.";\n";
 }
 
 ?>
@@ -1399,7 +1399,7 @@ 
 div.fichehalfleft {
 <?php
 if ($conf->browser->layout != 'phone') {
-    print "float: " . $left . ";\n";
+    print "float: ".$left.";\n";
 }
 
 ?>
@@ -1413,7 +1413,7 @@ 
 div.fichehalfright {
 <?php
 if ($conf->browser->layout != 'phone') {
-    print "float: " . $right . ";\n";
+    print "float: ".$right.";\n";
 }
 
 ?>
@@ -1427,7 +1427,7 @@ 
 div.ficheaddleft {
 <?php
 if ($conf->browser->layout != 'phone') {
-    print "padding-" . $left . ": 16px;\n";
+    print "padding-".$left.": 16px;\n";
 } else
     print "margin-top: 10px;\n";
 
@@ -1472,7 +1472,7 @@ 
 width: auto;
 }
 div.ficheaddleft {
-<?php print "padding-" . $left . ": 0px;\n"; ?>
+<?php print "padding-".$left.": 0px;\n"; ?>
 margin-top: 10px;
 }
 div.firstcolumn div.box {
@@ -1722,7 +1722,7 @@ 
 ul.tmenu li {	/* We need this to have background color when menu entry wraps on new lines */
 }
 li.tmenu, li.tmenusel {
-<?php print $minwidthtmenu ? 'min-width: ' . $minwidthtmenu . 'px;' : ''; ?>
+<?php print $minwidthtmenu ? 'min-width: '.$minwidthtmenu.'px;' : ''; ?>
 text-align: center;
 vertical-align: bottom;
 <?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
@@ -1802,7 +1802,7 @@ 
 /* For mainmenu, we always load the img */
 
 div.mainmenu.menu {
-background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/menu.png', 1) ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
 <?php print $disableimages ? '' : 'top: 7px'; ?>
 }
 #mainmenutd_menu a.tmenuimage {
@@ -1817,80 +1817,80 @@ 
 <?php if (empty($dol_hide_topmenu)) { ?>
 
     div.mainmenu.home{
-    background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/home_over.png', 1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png', 1) ?>);
     background-position-x: center;
     }
 
         div.mainmenu.billing {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/money_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png', 1) ?>);
         }
 
         div.mainmenu.accountancy {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/money_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png', 1) ?>);
         }
 
         div.mainmenu.agenda {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/agenda_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda_over.png', 1) ?>);
         }
 
         div.mainmenu.bank {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/bank_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank_over.png', 1) ?>);
         }
 
         div.mainmenu.cashdesk {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/pointofsale_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale_over.png', 1) ?>);
         }
 
         div.mainmenu.takepos {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/pointofsale_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale_over.png', 1) ?>);
         }
 
         div.mainmenu.companies {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/company_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company_over.png', 1) ?>);
         }
 
         div.mainmenu.commercial {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/commercial_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial_over.png', 1) ?>);
         }
 
         div.mainmenu.ecm {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/ecm_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm_over.png', 1) ?>);
         }
 
         div.mainmenu.externalsite {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/externalsite_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png', 1) ?>);
         }
 
         div.mainmenu.ftp {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/tools_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png', 1) ?>);
         }
 
         div.mainmenu.hrm {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/holiday_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday_over.png', 1) ?>);
         }
 
         div.mainmenu.members {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/members_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members_over.png', 1) ?>);
         }
 
         div.mainmenu.products {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/products_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products_over.png', 1) ?>);
         }
 
         div.mainmenu.project {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/project_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project_over.png', 1) ?>);
         }
 
         div.mainmenu.ticket {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/ticket_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticket_over.png', 1) ?>);
         }
 
         div.mainmenu.tools {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/tools_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png', 1) ?>);
         }
 
         div.mainmenu.website {
-        background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus/externalsite_over.png', 1) ?>);
+        background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png', 1) ?>);
         }
 
         <?php
@@ -1906,7 +1906,7 @@ 
         );
         $mainmenuused = 'home';
         foreach ($conf->modules as $val) {
-            $mainmenuused .= ',' . (isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
+            $mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
         }
 //var_dump($mainmenuused);
         $mainmenuusedarray = array_unique(explode(',', $mainmenuused));
@@ -1926,31 +1926,31 @@ 
             $found = 0;
             $url = '';
             foreach ($conf->file->dol_document_root as $dirroot) {
-                if (file_exists($dirroot . "/" . $val . "/img/" . $val . "_over.png")) {
-                    $url = dol_buildpath('/' . $val . '/img/' . $val . '_over.png', 1);
+                if (file_exists($dirroot."/".$val."/img/".$val."_over.png")) {
+                    $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
                     $found = 1;
                     break;
                 }
             }
             // Img file not found
             if (!$found) {
-                $url = dol_buildpath($path . '/theme/' . $theme . '/img/menus/generic' . $generic . "_over.png", 1);
+                $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic."_over.png", 1);
                 $found = 1;
                 if ($generic < 4)
                     $generic++;
-                print "/* A mainmenu entry was found but img file " . $val . ".png not found (check /" . $val . "/img/" . $val . ".png), so we use a generic one */\n";
+                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
             }
             if ($found) {
-                print "div.mainmenu." . $val . " {\n";
-                print "	background-image: url(" . $url . ");\n";
+                print "div.mainmenu.".$val." {\n";
+                print "	background-image: url(".$url.");\n";
                 print "}\n";
             }
         }
         $j = 0;
         while ($j++ < 4) {
-            $url = dol_buildpath($path . '/theme/' . $theme . '/img/menus/generic' . $j . "_over.png", 1);
-            print "div.mainmenu.generic" . $j . " {\n";
-            print "	background-image: url(" . $url . ");\n";
+            $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$j."_over.png", 1);
+            print "div.mainmenu.generic".$j." {\n";
+            print "	background-image: url(".$url.");\n";
             print "}\n";
         }
 // End of part to add more div class css
@@ -2114,7 +2114,7 @@ 
 <?php print $right; ?>: 0;
 top: <?php print $disableimages ? '4px' : '0'; ?>;
 font-weight: bold;
-<?php echo (empty($disableimages) && $maxwidthloginblock) ? 'max-width: ' . $maxwidthloginblock . 'px;' : ''; ?>
+<?php echo (empty($disableimages) && $maxwidthloginblock) ? 'max-width: '.$maxwidthloginblock.'px;' : ''; ?>
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
     display: none;
 <?php } ?>
@@ -2210,11 +2210,11 @@ 
 background-color: #FFF;
 }
 .span-icon-user {
-background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/object_user.png', 1); ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 background-repeat: no-repeat;
 }
 .span-icon-password {
-background-image: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/lock.png', 1); ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png', 1); ?>);
 background-repeat: no-repeat;
 }
 
@@ -2271,7 +2271,7 @@ 
 font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print is_numeric($fontsizesmaller) ? ($fontsizesmaller . 'px') : $fontsizesmaller; ?>; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print is_numeric($fontsizesmaller) ? ($fontsizesmaller.'px') : $fontsizesmaller; ?>; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; text-decoration: none; }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -2546,7 +2546,7 @@ 
 a.tab:hover
 {
 /*
-background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
+background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
 color: #<?php echo $colortextbacktab; ?>;
 */
 text-decoration: underline;
@@ -2962,7 +2962,7 @@ 
 padding-top: 3px;
 font-weight: normal;
 color: #444;
-font-size: <?php print is_numeric($fontsize) ? $fontsize . 'px' : $fontsize  ?>;
+font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize  ?>;
 line-height: 21px;
 }
 div.refidno form {
@@ -3736,12 +3736,12 @@ 
 
 .logo_setup
 {
-content:url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/logo_setup.svg', 1) ?>);	/* content is used to best fit the container */
+content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg', 1) ?>);	/* content is used to best fit the container */
 display: inline-block;
 }
 .nographyet
 {
-content:url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/nographyet.svg', 1) ?>);
+content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg', 1) ?>);
 display: inline-block;
 opacity: 0.1;
 background-repeat: no-repeat;
@@ -4127,7 +4127,7 @@ 
 
 .ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff !important; }
 
-.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/working.gif', 1) ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif', 1) ?>) right center no-repeat; }
 .ui-autocomplete {
 position:absolute;
 width:auto;
@@ -4158,14 +4158,14 @@ 
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-background: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/edit.png', 1) ?>) right top no-repeat;
+background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png', 1) ?>) right top no-repeat;
 cursor: pointer;
 margin-right: 3px;
 margin-top: 3px;
 }
 
 .editkey_datepicker {
-background: url(<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/calendar.png', 1) ?>) right center no-repeat;
+background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png', 1) ?>) right center no-repeat;
 margin-right: 3px;
 cursor: pointer;
 margin-right: 3px;
@@ -4659,9 +4659,9 @@ 
 float: right;
 }
 
-.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path . '/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; }
-.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path . '/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/' . $theme . '/img/working.gif', 1); ?>) left top no-repeat; }
+.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
 
 
 /* ============================================================================== */
@@ -4729,10 +4729,10 @@ 
 table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
 background: none !important;
 }
-.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/' . $theme . '/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
-.sorting_desc { background: url('<?php echo dol_buildpath('/theme/' . $theme . '/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
-.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/' . $theme . '/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
-.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/' . $theme . '/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
 .dataTables_paginate {
 margin-top: 8px;
 }
@@ -5255,7 +5255,7 @@ 
 min-width: .4em;
 padding-left: 6px;
 padding-right: 6px;
-font-size: <?php print is_numeric($fontsize) ? $fontsize . 'px' : $fontsize; ?>;
+font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 /* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
 .ui-btn-icon-right .ui-btn-inner {
@@ -5461,10 +5461,10 @@ 
 /* ============================================================================== */
 
 .menu_choix1 a {
-background: url('<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus_black/money.png', 1) ?>') top left no-repeat;
+background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/money.png', 1) ?>') top left no-repeat;
 }
 .menu_choix2 a {
-background: url('<?php echo dol_buildpath($path . '/theme/' . $theme . '/img/menus_black/home.png', 1) ?>') top left no-repeat;
+background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/home.png', 1) ?>') top left no-repeat;
 }
 .menu_choix1,.menu_choix2 {
 font-size: 1.4em;
@@ -5838,7 +5838,7 @@ 
 }
 }
 
-/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize) ? $fontsize . 'px' : $fontsize ?> */
+/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
 @media only screen and (max-width: <?php echo round($nbtopmenuentries * 91, 0) + 24; ?>px)	/* reduction 1 */
 {