alxarafe / alixar

dolibarr/htdocs/comm/index.php

Spacing +119 added lines, -119 removed lines

@@ -27,26 +27,26 @@ 
  * 	\ingroup    commercial
  * 	\brief      Home page of commercial area
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/agenda.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (!empty($conf->contrat->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (!empty($conf->propal->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
 if (!empty($conf->supplier_proposal->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 }
 if (!empty($conf->commande->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (!empty($conf->fournisseur->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
 
 if (!$user->rights->societe->lire) {
@@ -127,18 +127,18 @@ 
     }
 
     if (count($listofsearchfields)) {
-        print '<form method="post" action="' . BASE_URI . '?controller=core&method=search">';
-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        print '<form method="post" action="'.BASE_URI.'?controller=core&method=search">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<table class="noborder nohover centpercent">';
         $i = 0;
         foreach ($listofsearchfields as $key => $value) {
             if ($i == 0) {
-                print '<tr class="liste_titre"><td colspan="3">' . $langs->trans("Search") . '</td></tr>';
+                print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
             }
-            print '<tr ' . $bc[false] . '>';
-            print '<td class="nowrap"><label for="' . $key . '">' . $langs->trans($value["text"]) . '</label></td><td><input type="text" class="flat inputsearch" name="' . $key . '" id="' . $key . '" size="18"></td>';
+            print '<tr '.$bc[false].'>';
+            print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
             if ($i == 0) {
-                print '<td class="noborderbottom" rowspan="' . count($listofsearchfields) . '"><input type="submit" value="' . $langs->trans("Search") . '" class="button "></td>';
+                print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
             }
             print '</tr>';
             $i++;
@@ -158,19 +158,19 @@ 
 
     $sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
     $sql .= ", s.code_client";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "propal as p";
-    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE p.fk_statut = 0";
     $sql .= " AND p.fk_soc = s.rowid";
-    $sql .= " AND p.entity IN (" . getEntity('propal') . ")";
+    $sql .= " AND p.entity IN (".getEntity('propal').")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
 
     $resql = $db->query($sql);
@@ -181,7 +181,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">' . $langs->trans("ProposalsDraft") . ($num ? ' <span class="badge">' . $num . '</span>' : '') . '</th></tr>';
+        print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0) {
             $i = 0;
@@ -206,17 +206,17 @@ 
                 $companystatic->canvas = $obj->canvas;
                 print $companystatic->getNomUrl(1, 'customer', 16);
                 print '</td>';
-                print '<td align="right" class="nowrap">' . price($obj->total_ht) . '</td></tr>';
+                print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
                 $i++;
                 $total += $obj->total_ht;
             }
             if ($total > 0) {
 
-                print '<tr class="liste_total"><td>' . $langs->trans("Total") . '</td><td colspan="2" align="right">' . price($total) . "</td></tr>";
+                print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         } else {
 
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("NoProposal") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table></div><br>";
 
@@ -236,19 +236,19 @@ 
 
     $sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
     $sql .= ", s.code_client";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "supplier_proposal as p";
-    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE p.fk_statut = 0";
     $sql .= " AND p.fk_soc = s.rowid";
-    $sql .= " AND p.entity IN (" . getEntity('supplier_proposal') . ")";
+    $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
 
     $resql = $db->query($sql);
@@ -259,7 +259,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">' . $langs->trans("SupplierProposalsDraft") . ($num ? ' <span class="badge">' . $num . '</span>' : '') . '</th></tr>';
+        print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0) {
             $i = 0;
@@ -283,15 +283,15 @@ 
                 $companystatic->canvas = $obj->canvas;
                 print $companystatic->getNomUrl(1, 'supplier', 16);
                 print '</td>';
-                print '<td align="right" class="nowrap">' . price($obj->total_ht) . '</td></tr>';
+                print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
                 $i++;
                 $total += $obj->total_ht;
             }
             if ($total > 0) {
-                print '<tr class="liste_total"><td>' . $langs->trans("Total") . '</td><td colspan="2" align="right">' . price($total) . "</td></tr>";
+                print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         } else {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("NoProposal") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table></div><br>";
 
@@ -310,19 +310,19 @@ 
 
     $sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
     $sql .= ", s.code_client";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "commande as c";
-    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE c.fk_soc = s.rowid";
     $sql .= " AND c.fk_statut = 0";
-    $sql .= " AND c.entity IN (" . getEntity('commande') . ")";
+    $sql .= " AND c.entity IN (".getEntity('commande').")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND c.fk_soc = " . $socid;
+        $sql .= " AND c.fk_soc = ".$socid;
     }
 
     $resql = $db->query($sql);
@@ -333,7 +333,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">' . $langs->trans("DraftOrders") . ($num ? ' <span class="badge">' . $num . '</span>' : '') . '</th></tr>';
+        print '<th colspan="3">'.$langs->trans("DraftOrders").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0) {
             $i = 0;
@@ -359,20 +359,20 @@ 
                 print $companystatic->getNomUrl(1, 'customer', 16);
                 print '</td>';
                 if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-                    print '<td align="right" class="nowrap">' . price($obj->total_ht) . '</td></tr>';
+                    print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
                 } else {
-                    print '<td align="right" class="nowrap">' . price($obj->total_ttc) . '</td></tr>';
+                    print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
                 }
                 $i++;
                 $total += $obj->total_ttc;
             }
             if ($total > 0) {
 
-                print '<tr class="liste_total"><td>' . $langs->trans("Total") . '</td><td colspan="2" align="right">' . price($total) . "</td></tr>";
+                print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         } else {
 
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("NoOrder") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
         }
         print "</table>";
         print "</div><br>";
@@ -393,19 +393,19 @@ 
     $sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
     $sql .= ", s.code_client";
     $sql .= ", s.code_fournisseur";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "commande_fournisseur as cf";
-    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE cf.fk_soc = s.rowid";
     $sql .= " AND cf.fk_statut = 0";
-    $sql .= " AND cf.entity IN (" . getEntity('supplier_order') . ")";
+    $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND cf.fk_soc = " . $socid;
+        $sql .= " AND cf.fk_soc = ".$socid;
     }
 
     $resql = $db->query($sql);
@@ -416,7 +416,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">' . $langs->trans("DraftSuppliersOrders") . ($num ? ' <span class="badge">' . $num . '</span>' : '') . '</th></tr>';
+        print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0) {
             $i = 0;
@@ -442,20 +442,20 @@ 
                 print $companystatic->getNomUrl(1, 'supplier', 16);
                 print '</td>';
                 if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-                    print '<td align="right" class="nowrap">' . price($obj->total_ht) . '</td></tr>';
+                    print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
                 } else {
-                    print '<td align="right" class="nowrap">' . price($obj->total_ttc) . '</td></tr>';
+                    print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
                 }
                 $i++;
                 $total += $obj->total_ttc;
             }
             if ($total > 0) {
 
-                print '<tr class="liste_total"><td>' . $langs->trans("Total") . '</td><td colspan="2" align="right">' . price($total) . "</td></tr>";
+                print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         } else {
 
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("NoSupplierOrder") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table>";
         print "</div><br>";
@@ -482,14 +482,14 @@ 
 
     $sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas";
     $sql .= ", s.code_client";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE s.client IN (1, 2, 3)";
-    $sql .= " AND s.entity IN (" . getEntity($companystatic->element) . ")";
+    $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
         $sql .= " AND s.rowid = $socid";
@@ -514,7 +514,7 @@ 
             print $langs->trans("BoxTitleLastModifiedCustomers", $max);
         }
         print '</th>';
-        print '<th align="right"><a class="commonlink" href="' . DOL_URL_ROOT . '/societe/list.php?type=p,c">' . $langs->trans("FullList") . '</a></th>';
+        print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=p,c">'.$langs->trans("FullList").'</a></th>';
         print '</tr>';
         if ($num) {
             while ($i < $num) {
@@ -526,18 +526,18 @@ 
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
                 $companystatic->canvas = $objp->canvas;
                 print '<tr class="oddeven">';
-                print '<td class="nowrap">' . $companystatic->getNomUrl(1, 'customer', 48) . '</td>';
+                print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 48).'</td>';
                 print '<td align="right" nowrap>';
                 print $companystatic->getLibCustProspStatut();
                 print "</td>";
-                print '<td align="right" nowrap>' . dol_print_date($db->jdate($objp->tms), 'day') . "</td>";
+                print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
                 print '</tr>';
                 $i++;
             }
 
             $db->free($resql);
         } else {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print "</table>";
         print "</div><br>";
@@ -550,17 +550,17 @@ 
 
     $sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm";
     $sql .= ", s.code_fournisseur";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$user->societe_id) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE s.fournisseur = 1";
-    $sql .= " AND s.entity IN (" . getEntity($companystatic->element) . ")";
+    $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
     if (!$user->rights->societe->client->voir && !$user->societe_id) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
     $sql .= " ORDER BY s.datec DESC";
     $sql .= $db->plimit($max, 0);
@@ -573,8 +573,8 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th>' . $langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)) . '</th>';
-        print '<th align="right"><a class="commonlink" href="' . DOL_URL_ROOT . '/societe/list.php?type=f">' . $langs->trans("FullList") . '</a></th>';
+        print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)).'</th>';
+        print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("FullList").'</a></th>';
         print '</tr>';
         if ($num) {
             while ($i < $num && $i < $max) {
@@ -585,14 +585,14 @@ 
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
                 $companystatic->canvas = $objp->canvas;
                 print '<tr class="oddeven">';
-                print '<td class="nowrap">' . $companystatic->getNomUrl(1, 'supplier', 44) . '</td>';
-                print '<td align="right">' . dol_print_date($db->jdate($objp->dm), 'day') . '</td>';
+                print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 44).'</td>';
+                print '<td align="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
                 print '</tr>';
 
                 $i++;
             }
         } else {
-            print '<tr class="oddeven"><td colspan="2" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+            print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print '</table>';
         print '</div><br>';
@@ -625,20 +625,20 @@ 
     $sql = "SELECT s.nom as name, s.rowid, s.canvas, ";
     $sql .= ", s.code_client";
     $sql .= " c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-    $sql .= ", " . MAIN_DB_PREFIX . "contrat as c";
-    $sql .= ", " . MAIN_DB_PREFIX . "product as p";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql .= ", ".MAIN_DB_PREFIX."contrat as c";
+    $sql .= ", ".MAIN_DB_PREFIX."product as p";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE c.fk_soc = s.rowid";
-    $sql .= " AND c.entity IN (" . getEntity('contract') . ")";
+    $sql .= " AND c.entity IN (".getEntity('contract').")";
     $sql .= " AND c.fk_product = p.rowid";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
     $sql .= " ORDER BY c.tms DESC";
     $sql .= $db->plimit(5, 0);
@@ -650,7 +650,7 @@ 
         if ($num > 0) {
             print '<div class="div-table-responsive-no-min">';
             print '<table class="noborder" width="100%">';
-            print '<tr class="liste_titre"><th colspan="3">' . $langs->trans("LastContracts", 5) . '</th></tr>';
+            print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts", 5).'</th></tr>';
             $i = 0;
 
             $staticcontrat = new Contrat($db);
@@ -665,8 +665,8 @@ 
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
                 $companystatic->canvas = $objp->canvas;
                 print $companystatic->getNomUrl(1, 'customer', 44);
-                print '</td>' . "\n";
-                print "<td align=\"right\">" . $staticcontrat->LibStatut($obj->statut, 3) . "</td></tr>\n";
+                print '</td>'."\n";
+                print "<td align=\"right\">".$staticcontrat->LibStatut($obj->statut, 3)."</td></tr>\n";
 
                 $i++;
             }
@@ -686,19 +686,19 @@ 
 
     $sql = "SELECT s.nom as name, s.rowid, s.code_client";
     $sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-    $sql .= ", " . MAIN_DB_PREFIX . "propal as p";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql .= ", ".MAIN_DB_PREFIX."propal as p";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE p.fk_soc = s.rowid";
-    $sql .= " AND p.entity IN (" . getEntity('propal') . ")";
+    $sql .= " AND p.entity IN (".getEntity('propal').")";
     $sql .= " AND p.fk_statut = 1";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
     $sql .= " ORDER BY p.rowid DESC";
 
@@ -710,7 +710,7 @@ 
         if ($num > 0) {
             print '<div class="div-table-responsive-no-min">';
             print '<table class="noborder" width="100%">';
-            print '<tr class="liste_titre"><th colspan="5">' . $langs->trans("ProposalsOpened") . ' <a href="' . DOL_URL_ROOT . '/comm/propal/list.php?viewstatut=1"><span class="badge">' . $num . '</span></th></tr>';
+            print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
             $nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
             while ($i < $nbofloop) {
@@ -739,8 +739,8 @@ 
                 print '</td>';
                 print '<td width="16" align="center" class="nobordernopadding">';
                 $filename = dol_sanitizeFileName($obj->ref);
-                $filedir = $conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-                $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $obj->propalid;
+                $filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+                $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
                 print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
                 print '</td></tr></table>';
 
@@ -756,21 +756,21 @@ 
                 print $companystatic->getNomUrl(1, 'customer', 44);
                 print '</td>';
                 print '<td align="right">';
-                print dol_print_date($db->jdate($obj->dp), 'day') . '</td>' . "\n";
+                print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
                 if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-                    print '<td align="right">' . price($obj->total_ht) . '</td>';
+                    print '<td align="right">'.price($obj->total_ht).'</td>';
                 } else {
-                    print '<td align="right">' . price($obj->total_ttc) . '</td>';
+                    print '<td align="right">'.price($obj->total_ttc).'</td>';
                 }
-                print '<td align="center" width="14">' . $propalstatic->LibStatut($obj->fk_statut, 3) . '</td>' . "\n";
-                print '</tr>' . "\n";
+                print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
+                print '</tr>'."\n";
                 $i++;
                 $total += $obj->total_ttc;
             }
             if ($num > $nbofloop) {
-                print '<tr class="liste_total"><td colspan="5">' . $langs->trans("XMoreLines", ($num - $nbofloop)) . "</td></tr>";
+                print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
             } else if ($total > 0) {
-                print '<tr class="liste_total"><td colspan="3">' . $langs->trans("Total") . "</td><td align=\"right\">" . price($total) . "</td><td>&nbsp;</td></tr>";
+                print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
             }
             print "</table>";
             print "</div><br>";
@@ -788,19 +788,19 @@ 
 
     $sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
     $sql .= ", s.code_client";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-    $sql .= ", " . MAIN_DB_PREFIX . "commande as c";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql .= ", ".MAIN_DB_PREFIX."commande as c";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     }
     $sql .= " WHERE c.fk_soc = s.rowid";
-    $sql .= " AND c.entity IN (" . getEntity('commande') . ")";
-    $sql .= " AND (c.fk_statut = " . Commande::STATUS_VALIDATED . " or c.fk_statut = " . Commande::STATUS_SHIPMENTONPROCESS . ")";
+    $sql .= " AND c.entity IN (".getEntity('commande').")";
+    $sql .= " AND (c.fk_statut = ".Commande::STATUS_VALIDATED." or c.fk_statut = ".Commande::STATUS_SHIPMENTONPROCESS.")";
     if (!$user->rights->societe->client->voir && !$socid) {
-        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     }
     if ($socid) {
-        $sql .= " AND s.rowid = " . $socid;
+        $sql .= " AND s.rowid = ".$socid;
     }
     $sql .= " ORDER BY c.rowid DESC";
 
@@ -812,7 +812,7 @@ 
         if ($num > 0) {
             print '<div class="div-table-responsive-no-min">';
             print '<table class="noborder" width="100%">';
-            print '<tr class="liste_titre"><th class="liste_titre" colspan="5">' . $langs->trans("OrdersOpened") . ' <a href="' . DOL_URL_ROOT . '/commande/list.php?viewstatut=1"><span class="badge">' . $num . '</span></th></tr>';
+            print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
             $nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
             while ($i < $nbofloop) {
@@ -839,8 +839,8 @@ 
                 print '</td>';
                 print '<td width="16" align="center" class="nobordernopadding">';
                 $filename = dol_sanitizeFileName($obj->ref);
-                $filedir = $conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-                $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $obj->propalid;
+                $filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+                $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
                 print $formfile->getDocumentsLink($orderstatic->element, $filename, $filedir);
                 print '</td></tr></table>';
 
@@ -856,21 +856,21 @@ 
                 print $companystatic->getNomUrl(1, 'customer', 44);
                 print '</td>';
                 print '<td align="right">';
-                print dol_print_date($db->jdate($obj->dp), 'day') . '</td>' . "\n";
+                print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
                 if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-                    print '<td align="right">' . price($obj->total_ht) . '</td>';
+                    print '<td align="right">'.price($obj->total_ht).'</td>';
                 } else {
-                    print '<td align="right">' . price($obj->total_ttc) . '</td>';
+                    print '<td align="right">'.price($obj->total_ttc).'</td>';
                 }
-                print '<td align="center" width="14">' . $orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3) . '</td>' . "\n";
-                print '</tr>' . "\n";
+                print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>'."\n";
+                print '</tr>'."\n";
                 $i++;
                 $total += $obj->total_ttc;
             }
             if ($num > $nbofloop) {
-                print '<tr class="liste_total"><td colspan="5">' . $langs->trans("XMoreLines", ($num - $nbofloop)) . "</td></tr>";
+                print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
             } else if ($total > 0) {
-                print '<tr class="liste_total"><td colspan="3">' . $langs->trans("Total") . "</td><td align=\"right\">" . price($total) . "</td><td>&nbsp;</td></tr>";
+                print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
             }
             print "</table>";
             print "</div><br>";

dolibarr/htdocs/comm/action/list.php

Spacing +94 added lines, -94 removed lines

@@ -33,19 +33,19 @@ 
     define('NOREDIRECTBYMAINTOLOGIN', 1);

 }

 

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

-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';

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

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

-include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';

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

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

+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

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

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

+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

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

 

 // Load translation files required by the page

 $langs->loadLangs(array("users", "companies", "agenda", "commercial"));

 

 $action = Request::getAlpha('action');

-$contextpage = Request::getAz('contextpage', 'aZ') ?? 'actioncommlist';   // To manage different context of search

+$contextpage = Request::getAz('contextpage', 'aZ') ?? 'actioncommlist'; // To manage different context of search

 $resourceid = Request::getNumber("search_resourceid") ?? Request::getNumber("resourceid");

 $pid = Request::getNumber("search_projectid", [INPUT_POST, INPUT_GET]) ?? Request::getNumber("projectid", [INPUT_POST, INPUT_GET]);

 $status = Request::getAlpha("search_status") ?? Request::getAlpha("status");

@@ -154,7 +154,7 @@ 
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {

     foreach ($extrafields->attribute_label as $key => $val) {

         if (!empty($extrafields->attribute_list[$key]))

-            $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], 'checked' => $extrafields->attribute_list[$key], 'position' => $extrafields->attribute_pos[$key], 'enabled' => $extrafields->attribute_perms[$key]);

+            $arrayfields["ef.".$key] = array('label' => $extrafields->attribute_label[$key], 'checked' => $extrafields->attribute_list[$key], 'position' => $extrafields->attribute_pos[$key], 'enabled' => $extrafields->attribute_perms[$key]);

     }

 }

 

@@ -167,21 +167,21 @@ 
     $param = '';

     if (is_array($_POST)) {

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

-            $param .= '&' . $key . '=' . urlencode($val);

+            $param .= '&'.$key.'='.urlencode($val);

         }

     }

     //print $param;

-    header("Location: " . DOL_URL_ROOT . '/comm/action/index.php?' . $param);

+    header("Location: ".DOL_URL_ROOT.'/comm/action/index.php?'.$param);

     exit;

 }

 

 $parameters = array('id' => $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');

 

 // Selection of new fields

-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

     //$actioncode='';

@@ -204,7 +204,7 @@ 
 

 $nav = '';

 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);

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

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

 

 $now = dol_now();

 

@@ -216,54 +216,54 @@ 
 

 $param = '';

 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])

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

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

 if ($limit > 0 && $limit != $conf->liste_limit)

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

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

 if ($actioncode != '') {

     if (is_array($actioncode)) {

         foreach ($actioncode as $str_action)

-            $param .= "&search_actioncode[]=" . urlencode($str_action);

+            $param .= "&search_actioncode[]=".urlencode($str_action);

     } else

-        $param .= "&search_actioncode=" . urlencode($actioncode);

+        $param .= "&search_actioncode=".urlencode($actioncode);

 }

 if ($resourceid > 0)

-    $param .= "&search_resourceid=" . urlencode($resourceid);

+    $param .= "&search_resourceid=".urlencode($resourceid);

 if ($status != '' && $status > -1)

-    $param .= "&search_status=" . urlencode($status);

+    $param .= "&search_status=".urlencode($status);

 if ($filter)

-    $param .= "&search_filter=" . urlencode($filter);

+    $param .= "&search_filter=".urlencode($filter);

 if ($filtert)

-    $param .= "&search_filtert=" . urlencode($filtert);

+    $param .= "&search_filtert=".urlencode($filtert);

 if ($socid)

-    $param .= "&search_socid=" . urlencode($socid);

+    $param .= "&search_socid=".urlencode($socid);

 if ($showbirthday)

     $param .= "&search_showbirthday=1";

 if ($pid)

-    $param .= "&search_projectid=" . urlencode($pid);

+    $param .= "&search_projectid=".urlencode($pid);

 if ($type)

-    $param .= "&search_type=" . urlencode($type);

+    $param .= "&search_type=".urlencode($type);

 if ($usergroup)

-    $param .= "&search_usergroup=" . urlencode($usergroup);

+    $param .= "&search_usergroup=".urlencode($usergroup);

 if ($search_id != '')

-    $param .= '&search_title=' . urlencode($search_id);

+    $param .= '&search_title='.urlencode($search_id);

 if ($search_title != '')

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

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

 if (GETPOST('datestartday', 'int'))

-    $param .= '&datestartday=' . GETPOST('datestartday', 'int');

+    $param .= '&datestartday='.GETPOST('datestartday', 'int');

 if (GETPOST('datestartmonth', 'int'))

-    $param .= '&datestartmonth=' . GETPOST('datestartmonth', 'int');

+    $param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');

 if (GETPOST('datestartyear', 'int'))

-    $param .= '&datestartyear=' . GETPOST('datestartyear', 'int');

+    $param .= '&datestartyear='.GETPOST('datestartyear', 'int');

 if (GETPOST('dateendday', 'int'))

-    $param .= '&dateendday=' . GETPOST('dateendday', 'int');

+    $param .= '&dateendday='.GETPOST('dateendday', 'int');

 if (GETPOST('dateendmonth', 'int'))

-    $param .= '&dateendmonth=' . GETPOST('dateendmonth', 'int');

+    $param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');

 if (GETPOST('dateendyear', 'int'))

-    $param .= '&dateendyear=' . GETPOST('dateendyear', 'int');

+    $param .= '&dateendyear='.GETPOST('dateendyear', 'int');

 if ($optioncss != '')

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

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

 // Add $param from extra fields

-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';

+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

 

 $sql = "SELECT";

 if ($usergroup > 0)

@@ -277,24 +277,24 @@ 
 $sql .= " sp.lastname, sp.firstname, sp.email, sp.phone, sp.address, sp.phone as phone_pro, sp.phone_mobile, sp.phone_perso, sp.fk_pays as country_id";

 // Add fields from extrafields

 foreach ($extrafields->attribute_label as $key => $val)

-    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');

-$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";

-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";

+    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');

+$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";

+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";

 if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON a.fk_soc = s.rowid";

-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople as sp ON a.fk_contact = sp.rowid";

-$sql .= " ," . MAIN_DB_PREFIX . "c_actioncomm as c";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";

+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";

+$sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";

 // We must filter on resource table

 if ($resourceid > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";

+    $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";

 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";

+    $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";

 if ($usergroup > 0)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

 $sql .= " WHERE c.id = a.fk_action";

-$sql .= ' AND a.entity IN (' . getEntity('agenda') . ')';

+$sql .= ' AND a.entity IN ('.getEntity('agenda').')';

 // Condition on actioncode

 if (!empty($actioncode)) {

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

@@ -316,26 +316,26 @@ 
             $sql .= " AND c.type = 'systemauto'";

         else {

             if (is_array($actioncode)) {

-                $sql .= " AND c.code IN ('" . implode("','", $actioncode) . "')";

+                $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";

             } else {

-                $sql .= " AND c.code IN ('" . implode("','", explode(',', $actioncode)) . "')";

+                $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";

             }

         }

     }

 }

 if ($resourceid > 0)

-    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);

+    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);

 if ($pid)

-    $sql .= " AND a.fk_project=" . $db->escape($pid);

+    $sql .= " AND a.fk_project=".$db->escape($pid);

 if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";

+    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";

 if ($socid > 0)

-    $sql .= " AND s.rowid = " . $socid;

+    $sql .= " AND s.rowid = ".$socid;

 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0)

     $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";

 if ($type)

-    $sql .= " AND c.id = " . $type;

+    $sql .= " AND c.id = ".$type;

 if ($status == '0') {

     $sql .= " AND a.percent = 0";

 }

@@ -362,21 +362,21 @@ 
 if ($filtert > 0 || $usergroup > 0) {

     $sql .= " AND (";

     if ($filtert > 0)

-        $sql .= "(ar.fk_element = " . $filtert . " OR (ar.fk_element IS NULL AND a.fk_user_action=" . $filtert . "))"; // The OR is for backward compatibility

+        $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility

     if ($usergroup > 0)

-        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;

+        $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;

     $sql .= ")";

 }

 

 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)

 if ($dateselect > 0)

-    $sql .= " AND ((a.datep2 >= '" . $db->idate($dateselect) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "') OR (a.datep2 IS NULL AND a.datep > '" . $db->idate($dateselect - 3600) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "'))";

+    $sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";

 if ($datestart > 0)

-    $sql .= " AND a.datep BETWEEN '" . $db->idate($datestart) . "' AND '" . $db->idate($datestart + 3600 * 24 - 1) . "'";

+    $sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";

 if ($dateend > 0)

-    $sql .= " AND a.datep2 BETWEEN '" . $db->idate($dateend) . "' AND '" . $db->idate($dateend + 3600 * 24 - 1) . "'";

+    $sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";

 // Add where from extra fields

-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';

+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

 

 $sql .= $db->order($sortfield, $sortorder);

 

@@ -402,30 +402,30 @@ 
     $num = $db->num_rows($resql);

 

     // Local calendar

-    $newtitle = '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda") . ' &nbsp; </div>';

+    $newtitle = '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';

     //$newtitle=$langs->trans($title);

 

     $tabactive = 'cardlist';

 

     $head = calendars_prepare_head($param);

 

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

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

 

     if ($optioncss != '')

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

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

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

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

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

     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="type" value="' . $type . '">';

+    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="type" value="'.$type.'">';

     $nav = '';

 

     //if ($actioncode)    $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';

     //if ($resourceid)      $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';

     if ($filter)

-        $nav .= '<input type="hidden" name="search_filter" value="' . $filter . '">';

+        $nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';

     //if ($filtert)         $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';

     //if ($socid)           $nav.='<input type="hidden" name="socid" value="'.$socid.'">';

     if ($showbirthday)

@@ -471,16 +471,16 @@ 
     if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {

         $tmpforcreatebutton = dol_getdate(dol_now(), true);

 

-        $newparam .= '&month=' . str_pad($month, 2, "0", STR_PAD_LEFT) . '&year=' . $tmpforcreatebutton['year'];

+        $newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];

 

         //$param='month='.$monthshown.'&year='.$year;

         $hourminsec = '100000';

-        $newcardbutton = '<a class="butActionNew" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&datep=' . sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']) . $hourminsec . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . ($newparam ? '?' . $newparam : '')) . '"><span class="valignmiddle">' . $langs->trans("AddAction") . '</span>';

+        $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')).'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';

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

         $newcardbutton .= '</a>';

     }

 

-    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav . $newcardbutton, '', $limit);

+    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit);

 

     $moreforfilter = '';

 

@@ -490,17 +490,17 @@ 
         $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

     $i = 0;

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

-    print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

 

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

     if (!empty($arrayfields['a.id']['checked']))

-        print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="' . $search_id . '"></td>';

+        print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';

     if (!empty($arrayfields['owner']['checked']))

         print '<td class="liste_titre"></td>';

     if (!empty($arrayfields['c.libelle']['checked']))

         print '<td class="liste_titre"></td>';

     if (!empty($arrayfields['a.label']['checked']))

-        print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="' . $search_title . '"></td>';

+        print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';

     if (!empty($arrayfields['a.datep']['checked'])) {

         print '<td class="liste_titre nowraponall" align="center">';

         print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0);

@@ -520,11 +520,11 @@ 
         print '<td class="liste_titre"></td>';

 

     // Extra fields

-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';

 

     // Fields from hook

     $parameters = array('arrayfields' => $arrayfields);

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

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

     print $hookmanager->resPrint;

 

     if (!empty($arrayfields['a.datec']['checked']))

@@ -566,11 +566,11 @@ 
         print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "a.fk_element", $param, "", "", $sortfield, $sortorder);

 

     // Extra fields

-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

 

     // Hook fields

     $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);

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

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

     print $hookmanager->resPrint;

 

     if (!empty($arrayfields['a.datec']['checked']))

@@ -587,7 +587,7 @@ 
     $now = dol_now();

     $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;

 

-    require_once DOL_DOCUMENT_ROOT . '/comm/action/class/cactioncomm.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

     $caction = new CActionComm($db);

     $arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);

 

@@ -618,7 +618,7 @@ 
 

         // User owner

         if (!empty($arrayfields['owner']['checked'])) {

-            print '<td class="' . ($conf->browser->name != 'chrome' ? '' : 'tdoverflowmax100') . '">'; // With edge and chrom the td overflow is not supported correctly when content is not full text.

+            print '<td class="'.($conf->browser->name != 'chrome' ? '' : 'tdoverflowmax100').'">'; // With edge and chrom the td overflow is not supported correctly when content is not full text.

             if ($obj->fk_user_action > 0) {

                 $userstatic->fetch($obj->fk_user_action);

                 print $userstatic->getNomUrl(-1);

@@ -635,17 +635,17 @@ 
                     print img_picto('', $actionstatic->type_picto);

                 else {

                     if ($actionstatic->type_code == 'AC_RDV')

-                        print img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';

                     elseif ($actionstatic->type_code == 'AC_TEL')

-                        print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';

                     elseif ($actionstatic->type_code == 'AC_FAX')

-                        print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';

                     elseif ($actionstatic->type_code == 'AC_EMAIL')

-                        print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';

                     elseif ($actionstatic->type_code == 'AC_INT')

-                        print img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';

                     elseif (!preg_match('/_AUTO/', $actionstatic->type_code))

-                        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright') . ' ';

+                        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';

                 }

             }

             $labeltype = $obj->type_code;

@@ -678,7 +678,7 @@ 
             if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning))

                 $late = 1;

             if ($late)

-                print img_warning($langs->trans("Late")) . ' ';

+                print img_warning($langs->trans("Late")).' ';

             print '</td>';

         }

 

@@ -728,7 +728,7 @@ 
             print '<td>';

             //var_dump($obj->fkelement.' '.$obj->elementtype);

             if ($obj->fk_element > 0 && !empty($obj->elementtype)) {

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

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

                 print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);

             } else {

                 print "&nbsp;";

@@ -737,25 +737,25 @@ 
         }

 

         // Extra fields

-        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';

+        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

         // Fields from hook

         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);

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

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

         print $hookmanager->resPrint;

 

         // Date creation

         if (!empty($arrayfields['a.datec']['checked'])) {

             // Status/Percent

-            print '<td align="center" class="nowrap">' . dol_print_date($obj->datec, 'dayhour') . '</td>';

+            print '<td align="center" class="nowrap">'.dol_print_date($obj->datec, 'dayhour').'</td>';

         }

         // Date update

         if (!empty($arrayfields['a.tms']['checked'])) {

-            print '<td align="center" class="nowrap">' . dol_print_date($obj->datem, 'dayhour') . '</td>';

+            print '<td align="center" class="nowrap">'.dol_print_date($obj->datem, 'dayhour').'</td>';

         }

         if (!empty($arrayfields['a.percent']['checked'])) {

             // Status/Percent

             $datep = $db->jdate($obj->datep);

-            print '<td align="center" class="nowrap">' . $actionstatic->LibStatut($obj->percent, 3, 0, $datep) . '</td>';

+            print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 3, 0, $datep).'</td>';

         }

         print '<td></td>';

 

Braces +285 added lines, -200 removed lines

@@ -58,10 +58,10 @@ 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)

 if (GETPOST('search_actioncode', 'array')) {

     $actioncode = GETPOST('search_actioncode', 'array', 3);

-    if (!count($actioncode))

-        $actioncode = '0';

-}

-else {

+    if (!count($actioncode)) {
+            $actioncode = '0';
+    }
+    } else {

     $actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));

 }

 if ($actioncode == '' && empty($actioncodearray)) {

@@ -108,30 +108,36 @@ 
 $offset = $limit * $page;

 if (!$sortorder) {

     $sortorder = "DESC";

-    if ($status == 'todo')

-        $sortorder = "DESC";

+    if ($status == 'todo') {
+            $sortorder = "DESC";
+    }
     //if ($status == 'done') $sortorder="DESC";

 }

 if (!$sortfield) {

     $sortfield = "a.datep";

-    if ($status == 'todo')

-        $sortfield = "a.datep";

+    if ($status == 'todo') {
+            $sortfield = "a.datep";
+    }
     //if ($status == 'done') $sortfield="a.datep2";

 }

 

 // Security check

 $socid = GETPOST("search_socid", 'int') ? GETPOST("search_socid", 'int') : GETPOST("socid", 'int');

-if ($user->societe_id)

-    $socid = $user->societe_id;

+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');

-if ($socid < 0)

-    $socid = '';

+if ($socid < 0) {
+    $socid = '';
+}
 

 $canedit = 1;

-if (!$user->rights->agenda->myactions->read)

-    accessforbidden();

-if (!$user->rights->agenda->allactions->read)

-    $canedit = 0;

+if (!$user->rights->agenda->myactions->read) {
+    accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+    $canedit = 0;
+}
 if (!$user->rights->agenda->allactions->read || $filter == 'mine') { // If no permission to see all, we show only affected to me

     $filtert = $user->id;

 }

@@ -153,8 +159,9 @@ 
 // Extra fields

 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {

     foreach ($extrafields->attribute_label as $key => $val) {

-        if (!empty($extrafields->attribute_list[$key]))

-            $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], 'checked' => $extrafields->attribute_list[$key], 'position' => $extrafields->attribute_pos[$key], 'enabled' => $extrafields->attribute_perms[$key]);

+        if (!empty($extrafields->attribute_list[$key])) {
+                    $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], 'checked' => $extrafields->attribute_list[$key], 'position' => $extrafields->attribute_pos[$key], 'enabled' => $extrafields->attribute_perms[$key]);
+        }
     }

 }

 

@@ -177,8 +184,9 @@ 
 

 $parameters = array('id' => $socid);

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

-if ($reshook < 0)

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

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

 // Selection of new fields

 include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';

@@ -215,59 +223,82 @@ 
 $listofextcals = array();

 

 $param = '';

-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])

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

-if ($limit > 0 && $limit != $conf->liste_limit)

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

+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param .= '&contextpage=' . urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param .= '&limit=' . urlencode($limit);
+}
 if ($actioncode != '') {

     if (is_array($actioncode)) {

-        foreach ($actioncode as $str_action)

-            $param .= "&search_actioncode[]=" . urlencode($str_action);

-    } else

-        $param .= "&search_actioncode=" . urlencode($actioncode);

-}

-if ($resourceid > 0)

-    $param .= "&search_resourceid=" . urlencode($resourceid);

-if ($status != '' && $status > -1)

-    $param .= "&search_status=" . urlencode($status);

-if ($filter)

-    $param .= "&search_filter=" . urlencode($filter);

-if ($filtert)

-    $param .= "&search_filtert=" . urlencode($filtert);

-if ($socid)

-    $param .= "&search_socid=" . urlencode($socid);

-if ($showbirthday)

-    $param .= "&search_showbirthday=1";

-if ($pid)

-    $param .= "&search_projectid=" . urlencode($pid);

-if ($type)

-    $param .= "&search_type=" . urlencode($type);

-if ($usergroup)

-    $param .= "&search_usergroup=" . urlencode($usergroup);

-if ($search_id != '')

-    $param .= '&search_title=' . urlencode($search_id);

-if ($search_title != '')

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

-if (GETPOST('datestartday', 'int'))

-    $param .= '&datestartday=' . GETPOST('datestartday', 'int');

-if (GETPOST('datestartmonth', 'int'))

-    $param .= '&datestartmonth=' . GETPOST('datestartmonth', 'int');

-if (GETPOST('datestartyear', 'int'))

-    $param .= '&datestartyear=' . GETPOST('datestartyear', 'int');

-if (GETPOST('dateendday', 'int'))

-    $param .= '&dateendday=' . GETPOST('dateendday', 'int');

-if (GETPOST('dateendmonth', 'int'))

-    $param .= '&dateendmonth=' . GETPOST('dateendmonth', 'int');

-if (GETPOST('dateendyear', 'int'))

-    $param .= '&dateendyear=' . GETPOST('dateendyear', 'int');

-if ($optioncss != '')

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

+        foreach ($actioncode as $str_action) {
+                    $param .= "&search_actioncode[]=" . urlencode($str_action);
+        }
+    } else {
+            $param .= "&search_actioncode=" . urlencode($actioncode);
+    }
+    }

+if ($resourceid > 0) {
+    $param .= "&search_resourceid=" . urlencode($resourceid);
+}
+if ($status != '' && $status > -1) {
+    $param .= "&search_status=" . urlencode($status);
+}
+if ($filter) {
+    $param .= "&search_filter=" . urlencode($filter);
+}
+if ($filtert) {
+    $param .= "&search_filtert=" . urlencode($filtert);
+}
+if ($socid) {
+    $param .= "&search_socid=" . urlencode($socid);
+}
+if ($showbirthday) {
+    $param .= "&search_showbirthday=1";
+}
+if ($pid) {
+    $param .= "&search_projectid=" . urlencode($pid);
+}
+if ($type) {
+    $param .= "&search_type=" . urlencode($type);
+}
+if ($usergroup) {
+    $param .= "&search_usergroup=" . urlencode($usergroup);
+}
+if ($search_id != '') {
+    $param .= '&search_title=' . urlencode($search_id);
+}
+if ($search_title != '') {
+    $param .= '&search_title=' . urlencode($search_title);
+}
+if (GETPOST('datestartday', 'int')) {
+    $param .= '&datestartday=' . GETPOST('datestartday', 'int');
+}
+if (GETPOST('datestartmonth', 'int')) {
+    $param .= '&datestartmonth=' . GETPOST('datestartmonth', 'int');
+}
+if (GETPOST('datestartyear', 'int')) {
+    $param .= '&datestartyear=' . GETPOST('datestartyear', 'int');
+}
+if (GETPOST('dateendday', 'int')) {
+    $param .= '&dateendday=' . GETPOST('dateendday', 'int');
+}
+if (GETPOST('dateendmonth', 'int')) {
+    $param .= '&dateendmonth=' . GETPOST('dateendmonth', 'int');
+}
+if (GETPOST('dateendyear', 'int')) {
+    $param .= '&dateendyear=' . GETPOST('dateendyear', 'int');
+}
+if ($optioncss != '') {
+    $param .= '&optioncss=' . urlencode($optioncss);
+}
 // Add $param from extra fields

 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';

 

 $sql = "SELECT";

-if ($usergroup > 0)

-    $sql .= " DISTINCT";

+if ($usergroup > 0) {
+    $sql .= " DISTINCT";
+}
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";

 $sql .= " a.id, a.label, a.datep as dp, a.datep2 as dp2,";

 $sql .= ' a.fk_user_author,a.fk_user_action,';

@@ -276,45 +307,51 @@ 
 $sql .= " c.code as type_code, c.libelle as type_label,";

 $sql .= " sp.lastname, sp.firstname, sp.email, sp.phone, sp.address, sp.phone as phone_pro, sp.phone_mobile, sp.phone_perso, sp.fk_pays as country_id";

 // Add fields from extrafields

-foreach ($extrafields->attribute_label as $key => $val)

-    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');

+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');
+}
 $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";

 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";

-if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON a.fk_soc = s.rowid";

 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople as sp ON a.fk_contact = sp.rowid";

 $sql .= " ," . MAIN_DB_PREFIX . "c_actioncomm as c";

 // We must filter on resource table

-if ($resourceid > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";

+if ($resourceid > 0) {
+    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";
+}
 // We must filter on assignement table

-if ($filtert > 0 || $usergroup > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";

-if ($usergroup > 0)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

+if ($filtert > 0 || $usergroup > 0) {
+    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= " WHERE c.id = a.fk_action";

 $sql .= ' AND a.entity IN (' . getEntity('agenda') . ')';

 // Condition on actioncode

 if (!empty($actioncode)) {

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

-        if ($actioncode == 'AC_NON_AUTO')

-            $sql .= " AND c.type != 'systemauto'";

-        elseif ($actioncode == 'AC_ALL_AUTO')

-            $sql .= " AND c.type = 'systemauto'";

-        else {

-            if ($actioncode == 'AC_OTH')

-                $sql .= " AND c.type != 'systemauto'";

-            if ($actioncode == 'AC_OTH_AUTO')

-                $sql .= " AND c.type = 'systemauto'";

+        if ($actioncode == 'AC_NON_AUTO') {
+                    $sql .= " AND c.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+                    $sql .= " AND c.type = 'systemauto'";
+        } else {

+            if ($actioncode == 'AC_OTH') {
+                            $sql .= " AND c.type != 'systemauto'";
+            }
+            if ($actioncode == 'AC_OTH_AUTO') {
+                            $sql .= " AND c.type = 'systemauto'";
+            }
         }

-    }

-    else {

-        if ($actioncode == 'AC_NON_AUTO')

-            $sql .= " AND c.type != 'systemauto'";

-        elseif ($actioncode == 'AC_ALL_AUTO')

-            $sql .= " AND c.type = 'systemauto'";

-        else {

+    } else {

+        if ($actioncode == 'AC_NON_AUTO') {
+                    $sql .= " AND c.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+                    $sql .= " AND c.type = 'systemauto'";
+        } else {

             if (is_array($actioncode)) {

                 $sql .= " AND c.code IN ('" . implode("','", $actioncode) . "')";

             } else {

@@ -323,19 +360,25 @@ 
         }

     }

 }

-if ($resourceid > 0)

-    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);

-if ($pid)

-    $sql .= " AND a.fk_project=" . $db->escape($pid);

-if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";

-if ($socid > 0)

-    $sql .= " AND s.rowid = " . $socid;

+if ($resourceid > 0) {
+    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);
+}
+if ($pid) {
+    $sql .= " AND a.fk_project=" . $db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
+}
+if ($socid > 0) {
+    $sql .= " AND s.rowid = " . $socid;
+}
 // We must filter on assignement table

-if ($filtert > 0 || $usergroup > 0)

-    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";

-if ($type)

-    $sql .= " AND c.id = " . $type;

+if ($filtert > 0 || $usergroup > 0) {
+    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
+if ($type) {
+    $sql .= " AND c.id = " . $type;
+}
 if ($status == '0') {

     $sql .= " AND a.percent = 0";

 }

@@ -354,27 +397,35 @@ 
 if ($status == 'todo') {

     $sql .= " AND (a.percent >= 0 AND a.percent < 100)";

 }

-if ($search_id)

-    $sql .= natural_search("a.id", $search_id, 1);

-if ($search_title)

-    $sql .= natural_search("a.label", $search_title);

+if ($search_id) {
+    $sql .= natural_search("a.id", $search_id, 1);
+}
+if ($search_title) {
+    $sql .= natural_search("a.label", $search_title);
+}
 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0) {

     $sql .= " AND (";

-    if ($filtert > 0)

-        $sql .= "(ar.fk_element = " . $filtert . " OR (ar.fk_element IS NULL AND a.fk_user_action=" . $filtert . "))"; // The OR is for backward compatibility

-    if ($usergroup > 0)

-        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;

+    if ($filtert > 0) {
+            $sql .= "(ar.fk_element = " . $filtert . " OR (ar.fk_element IS NULL AND a.fk_user_action=" . $filtert . "))";
+    }
+    // The OR is for backward compatibility

+    if ($usergroup > 0) {
+            $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;
+    }
     $sql .= ")";

 }

 

 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)

-if ($dateselect > 0)

-    $sql .= " AND ((a.datep2 >= '" . $db->idate($dateselect) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "') OR (a.datep2 IS NULL AND a.datep > '" . $db->idate($dateselect - 3600) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "'))";

-if ($datestart > 0)

-    $sql .= " AND a.datep BETWEEN '" . $db->idate($datestart) . "' AND '" . $db->idate($datestart + 3600 * 24 - 1) . "'";

-if ($dateend > 0)

-    $sql .= " AND a.datep2 BETWEEN '" . $db->idate($dateend) . "' AND '" . $db->idate($dateend + 3600 * 24 - 1) . "'";

+if ($dateselect > 0) {
+    $sql .= " AND ((a.datep2 >= '" . $db->idate($dateselect) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "') OR (a.datep2 IS NULL AND a.datep > '" . $db->idate($dateselect - 3600) . "' AND a.datep <= '" . $db->idate($dateselect + 3600 * 24 - 1) . "'))";
+}
+if ($datestart > 0) {
+    $sql .= " AND a.datep BETWEEN '" . $db->idate($datestart) . "' AND '" . $db->idate($datestart + 3600 * 24 - 1) . "'";
+}
+if ($dateend > 0) {
+    $sql .= " AND a.datep2 BETWEEN '" . $db->idate($dateend) . "' AND '" . $db->idate($dateend + 3600 * 24 - 1) . "'";
+}
 // Add where from extra fields

 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';

 

@@ -411,8 +462,9 @@ 
 

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

 

-    if ($optioncss != '')

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

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

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

     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

@@ -424,12 +476,14 @@ 
 

     //if ($actioncode)    $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';

     //if ($resourceid)      $nav.='<input type="hidden" name="resourceid" value="'.$resourceid.'">';

-    if ($filter)

-        $nav .= '<input type="hidden" name="search_filter" value="' . $filter . '">';

+    if ($filter) {
+            $nav .= '<input type="hidden" name="search_filter" value="' . $filter . '">';
+    }
     //if ($filtert)         $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';

     //if ($socid)           $nav.='<input type="hidden" name="socid" value="'.$socid.'">';

-    if ($showbirthday)

-        $nav .= '<input type="hidden" name="search_showbirthday" value="1">';

+    if ($showbirthday) {
+            $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+    }
     //if ($pid)             $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';

     //if ($usergroup)       $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';

     print $nav;

@@ -486,21 +540,26 @@ 
 

     $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

     $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

-    if ($massactionbutton)

-        $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

+    if ($massactionbutton) {
+            $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+    }
     $i = 0;

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

     print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

 

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

-    if (!empty($arrayfields['a.id']['checked']))

-        print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="' . $search_id . '"></td>';

-    if (!empty($arrayfields['owner']['checked']))

-        print '<td class="liste_titre"></td>';

-    if (!empty($arrayfields['c.libelle']['checked']))

-        print '<td class="liste_titre"></td>';

-    if (!empty($arrayfields['a.label']['checked']))

-        print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="' . $search_title . '"></td>';

+    if (!empty($arrayfields['a.id']['checked'])) {
+            print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="' . $search_id . '"></td>';
+    }
+    if (!empty($arrayfields['owner']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
+    if (!empty($arrayfields['c.libelle']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
+    if (!empty($arrayfields['a.label']['checked'])) {
+            print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="' . $search_title . '"></td>';
+    }
     if (!empty($arrayfields['a.datep']['checked'])) {

         print '<td class="liste_titre nowraponall" align="center">';

         print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0);

@@ -514,10 +573,12 @@ 
     if (!empty($arrayfields['s.nom']['checked'])) {

         print '<td class="liste_titre"></td>';

     }

-    if (!empty($arrayfields['a.fk_contact']['checked']))

-        print '<td class="liste_titre"></td>';

-    if (!empty($arrayfields['a.fk_element']['checked']))

-        print '<td class="liste_titre"></td>';

+    if (!empty($arrayfields['a.fk_contact']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
+    if (!empty($arrayfields['a.fk_element']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
 

     // Extra fields

     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';

@@ -527,10 +588,12 @@ 
     $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook

     print $hookmanager->resPrint;

 

-    if (!empty($arrayfields['a.datec']['checked']))

-        print '<td class="liste_titre"></td>';

-    if (!empty($arrayfields['a.tms']['checked']))

-        print '<td class="liste_titre"></td>';

+    if (!empty($arrayfields['a.datec']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
+    if (!empty($arrayfields['a.tms']['checked'])) {
+            print '<td class="liste_titre"></td>';
+    }
     if (!empty($arrayfields['a.percent']['checked'])) {

         print '<td class="liste_titre center">';

         print $formactions->form_select_status_action('formaction', $status, 1, 'status', 1, 2);

@@ -545,25 +608,34 @@ 
     print "</tr>\n";

 

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

-    if (!empty($arrayfields['a.id']['checked']))

-        print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);

-    if (!empty($arrayfields['owner']['checked']))

-        print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);

-    if (!empty($arrayfields['c.libelle']['checked']))

-        print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);

-    if (!empty($arrayfields['a.label']['checked']))

-        print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);

+    if (!empty($arrayfields['a.id']['checked'])) {
+            print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['owner']['checked'])) {
+            print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['c.libelle']['checked'])) {
+            print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['a.label']['checked'])) {
+            print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+    }
     //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))

-    if (!empty($arrayfields['a.datep']['checked']))

-        print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep", $param, '', 'align="center"', $sortfield, $sortorder);

-    if (!empty($arrayfields['a.datep2']['checked']))

-        print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);

-    if (!empty($arrayfields['s.nom']['checked']))

-        print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);

-    if (!empty($arrayfields['a.fk_contact']['checked']))

-        print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "a.fk_contact", $param, "", "", $sortfield, $sortorder);

-    if (!empty($arrayfields['a.fk_element']['checked']))

-        print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "a.fk_element", $param, "", "", $sortfield, $sortorder);

+    if (!empty($arrayfields['a.datep']['checked'])) {
+            print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep", $param, '', 'align="center"', $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['a.datep2']['checked'])) {
+            print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['s.nom']['checked'])) {
+            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['a.fk_contact']['checked'])) {
+            print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "a.fk_contact", $param, "", "", $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['a.fk_element']['checked'])) {
+            print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "a.fk_element", $param, "", "", $sortfield, $sortorder);
+    }
 

     // Extra fields

     include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';

@@ -573,13 +645,16 @@ 
     $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook

     print $hookmanager->resPrint;

 

-    if (!empty($arrayfields['a.datec']['checked']))

-        print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);

-    if (!empty($arrayfields['a.tms']['checked']))

-        print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);

+    if (!empty($arrayfields['a.datec']['checked'])) {
+            print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+    }
+    if (!empty($arrayfields['a.tms']['checked'])) {
+            print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+    }
 

-    if (!empty($arrayfields['a.percent']['checked']))

-        print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);

+    if (!empty($arrayfields['a.percent']['checked'])) {
+            print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+    }
     print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');

     print "</tr>\n";

 

@@ -622,8 +697,9 @@ 
             if ($obj->fk_user_action > 0) {

                 $userstatic->fetch($obj->fk_user_action);

                 print $userstatic->getNomUrl(-1);

-            } else

-                print '&nbsp;';

+            } else {
+                            print '&nbsp;';
+            }
             print '</td>';

         }

 

@@ -631,28 +707,31 @@ 
         if (!empty($arrayfields['c.libelle']['checked'])) {

             print '<td>';

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

-                if ($actionstatic->type_picto)

-                    print img_picto('', $actionstatic->type_picto);

-                else {

-                    if ($actionstatic->type_code == 'AC_RDV')

-                        print img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright') . ' ';

-                    elseif ($actionstatic->type_code == 'AC_TEL')

-                        print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright') . ' ';

-                    elseif ($actionstatic->type_code == 'AC_FAX')

-                        print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright') . ' ';

-                    elseif ($actionstatic->type_code == 'AC_EMAIL')

-                        print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright') . ' ';

-                    elseif ($actionstatic->type_code == 'AC_INT')

-                        print img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright') . ' ';

-                    elseif (!preg_match('/_AUTO/', $actionstatic->type_code))

-                        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright') . ' ';

+                if ($actionstatic->type_picto) {
+                                    print img_picto('', $actionstatic->type_picto);
+                } else {

+                    if ($actionstatic->type_code == 'AC_RDV') {
+                                            print img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright') . ' ';
+                    } elseif ($actionstatic->type_code == 'AC_TEL') {
+                                            print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright') . ' ';
+                    } elseif ($actionstatic->type_code == 'AC_FAX') {
+                                            print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright') . ' ';
+                    } elseif ($actionstatic->type_code == 'AC_EMAIL') {
+                                            print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright') . ' ';
+                    } elseif ($actionstatic->type_code == 'AC_INT') {
+                                            print img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright') . ' ';
+                    } elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) {
+                                            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright') . ' ';
+                    }
                 }

             }

             $labeltype = $obj->type_code;

-            if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype]))

-                $labeltype = 'AC_OTH';

-            if (!empty($arraylist[$labeltype]))

-                $labeltype = $arraylist[$labeltype];

+            if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+                            $labeltype = 'AC_OTH';
+            }
+            if (!empty($arraylist[$labeltype])) {
+                            $labeltype = $arraylist[$labeltype];
+            }
             print dol_trunc($labeltype, 28);

             print '</td>';

         }

@@ -669,16 +748,21 @@ 
             print '<td align="center">';

             print dol_print_date($db->jdate($obj->dp), "dayhour");

             $late = 0;

-            if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning))

-                $late = 1;

-            if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning))

-                $late = 1;

-            if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning))

-                $late = 1;

-            if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning))

-                $late = 1;

-            if ($late)

-                print img_warning($langs->trans("Late")) . ' ';

+            if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+                            $late = 1;
+            }
+            if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+                            $late = 1;
+            }
+            if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) {
+                            $late = 1;
+            }
+            if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+                            $late = 1;
+            }
+            if ($late) {
+                            print img_warning($langs->trans("Late")) . ' ';
+            }
             print '</td>';

         }

 

@@ -699,8 +783,9 @@ 
                 $societestatic->email = $obj->socemail;

 

                 print $societestatic->getNomUrl(1, '', 28);

-            } else

-                print '&nbsp;';

+            } else {
+                            print '&nbsp;';
+            }
             print '</td>';

         }

 

dolibarr/htdocs/comm/action/index.php

Spacing +200 added lines, -200 removed lines

@@ -32,15 +32,15 @@ 
  *  \ingroup    agenda

  *  \brief      Home page of calendar events

  */

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

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

 

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

-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';

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

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

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

+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

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

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

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

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

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

 }

 

 if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW))

@@ -97,7 +97,7 @@ 
 $week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");

 $day = GETPOST("day", "int") ? GETPOST("day", "int") : date("d");

 $pid = GETPOST("search_projectid", "int", 3) ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);

-$status = GETPOST("search_status", 'aZ09') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');  // status may be 0, 50, 100, 'todo'

+$status = GETPOST("search_status", 'aZ09') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo'

 $type = GETPOST("search_type", 'az09') ? GETPOST("search_type", 'az09') : GETPOST("type", 'az09');

 $maxprint = (isset($_GET["maxprint"]) ? GETPOST("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);

 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)

@@ -152,11 +152,11 @@ 
         foreach ($_POST as $key => $val) {

             if ($key == 'token')

                 continue;

-            $param .= '&' . $key . '=' . urlencode($val);

+            $param .= '&'.$key.'='.urlencode($val);

         }

     }

     //print $param;

-    header("Location: " . DOL_URL_ROOT . '/comm/action/list.php?' . $param);

+    header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);

     exit;

 }

 

@@ -166,11 +166,11 @@ 
         foreach ($_POST as $key => $val) {

             if ($key == 'token')

                 continue;

-            $param .= '&' . $key . '=' . urlencode($val);

+            $param .= '&'.$key.'='.urlencode($val);

         }

     }

     //print $param;

-    header("Location: " . DOL_URL_ROOT . '/comm/action/peruser.php?' . $param);

+    header("Location: ".DOL_URL_ROOT.'/comm/action/peruser.php?'.$param);

     exit;

 }

 

@@ -205,11 +205,11 @@ 
     $i = 0;

     while ($i < $MAXAGENDA) {

         $i++;

-        $source = 'AGENDA_EXT_SRC' . $i;

-        $name = 'AGENDA_EXT_NAME' . $i;

-        $offsettz = 'AGENDA_EXT_OFFSETTZ' . $i;

-        $color = 'AGENDA_EXT_COLOR' . $i;

-        $buggedfile = 'AGENDA_EXT_BUGGEDFILE' . $i;

+        $source = 'AGENDA_EXT_SRC'.$i;

+        $name = 'AGENDA_EXT_NAME'.$i;

+        $offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;

+        $color = 'AGENDA_EXT_COLOR'.$i;

+        $buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;

         if (!empty($conf->global->$source) && !empty($conf->global->$name)) {

             // Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'

             $listofextcals[] = array('src' => $conf->global->$source, 'name' => $conf->global->$name, 'offsettz' => $conf->global->$offsettz, 'color' => $conf->global->$color, 'buggedfile' => (isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0));

@@ -221,12 +221,12 @@ 
     $i = 0;

     while ($i < $MAXAGENDA) {

         $i++;

-        $source = 'AGENDA_EXT_SRC_' . $user->id . '_' . $i;

-        $name = 'AGENDA_EXT_NAME_' . $user->id . '_' . $i;

-        $offsettz = 'AGENDA_EXT_OFFSETTZ_' . $user->id . '_' . $i;

-        $color = 'AGENDA_EXT_COLOR_' . $user->id . '_' . $i;

-        $enabled = 'AGENDA_EXT_ENABLED_' . $user->id . '_' . $i;

-        $buggedfile = 'AGENDA_EXT_BUGGEDFILE_' . $user->id . '_' . $i;

+        $source = 'AGENDA_EXT_SRC_'.$user->id.'_'.$i;

+        $name = 'AGENDA_EXT_NAME_'.$user->id.'_'.$i;

+        $offsettz = 'AGENDA_EXT_OFFSETTZ_'.$user->id.'_'.$i;

+        $color = 'AGENDA_EXT_COLOR_'.$user->id.'_'.$i;

+        $enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;

+        $buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;

         if (!empty($user->conf->$source) && !empty($user->conf->$name)) {

             // Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'

             $listofextcals[] = array('src' => $user->conf->$source, 'name' => $user->conf->$name, 'offsettz' => $user->conf->$offsettz, 'color' => $user->conf->$color, 'buggedfile' => (isset($user->conf->buggedfile) ? $user->conf->buggedfile : 0));

@@ -242,10 +242,10 @@ 
     $next_year = $next['year'];

     $next_month = $next['month'];

 

-    $max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year));  // Nb of days in previous month

-    $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));                 // Nb of days in next month

+    $max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year)); // Nb of days in previous month

+    $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month

     // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)

-    $tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2;  // date('w') is 0 fo sunday

+    $tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2; // date('w') is 0 fo sunday

     $tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);

     if ($tmpday >= 1)

         $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.

@@ -312,60 +312,60 @@ 
 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {

     if (is_array($actioncode)) {

         foreach ($actioncode as $str_action)

-            $param .= "&search_actioncode[]=" . urlencode($str_action);

+            $param .= "&search_actioncode[]=".urlencode($str_action);

     } else

-        $param .= "&search_actioncode=" . urlencode($actioncode);

+        $param .= "&search_actioncode=".urlencode($actioncode);

 }

 if ($resourceid > 0)

-    $param .= "&search_resourceid=" . urlencode($resourceid);

+    $param .= "&search_resourceid=".urlencode($resourceid);

 if ($status || isset($_GET['status']) || isset($_POST['status']))

-    $param .= "&search_status=" . urlencode($status);

+    $param .= "&search_status=".urlencode($status);

 if ($filter)

-    $param .= "&search_filter=" . urlencode($filter);

+    $param .= "&search_filter=".urlencode($filter);

 if ($filtert)

-    $param .= "&search_filtert=" . urlencode($filtert);

+    $param .= "&search_filtert=".urlencode($filtert);

 if ($usergroup)

-    $param .= "&search_usergroup=" . urlencode($usergroup);

+    $param .= "&search_usergroup=".urlencode($usergroup);

 if ($socid)

-    $param .= "&search_socid=" . urlencode($socid);

+    $param .= "&search_socid=".urlencode($socid);

 if ($showbirthday)

     $param .= "&search_showbirthday=1";

 if ($pid)

-    $param .= "&search_projectid=" . urlencode($pid);

+    $param .= "&search_projectid=".urlencode($pid);

 if ($type)

-    $param .= "&search_type=" . urlencode($type);

+    $param .= "&search_type=".urlencode($type);

 if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month')

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

-$param .= "&maxprint=" . urlencode($maxprint);

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

+$param .= "&maxprint=".urlencode($maxprint);

 

 // Show navigation bar

 if (empty($action) || $action == 'show_month') {

-    $nav = "<a href=\"?year=" . $prev_year . "&amp;month=" . $prev_month . $param . "\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";

-    $nav .= " <span id=\"month_name\">" . dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");

+    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";

+    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");

     $nav .= " </span>\n";

-    $nav .= " &nbsp; <a href=\"?year=" . $next_year . "&amp;month=" . $next_month . $param . "\"><i class=\"fa fa-chevron-right\"></i></a>\n";

-    $nav .= " &nbsp; (<a href=\"?year=" . $nowyear . "&amp;month=" . $nowmonth . $param . "\">" . $langs->trans("Today") . "</a>)";

+    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";

+    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";

     $picto = 'calendar';

 }

 if ($action == 'show_week') {

-    $nav = "<a href=\"?year=" . $prev_year . "&amp;month=" . $prev_month . "&amp;day=" . $prev_day . $param . "\"><i class=\"fa fa-chevron-left\" title=\"" . dol_escape_htmltag($langs->trans("Previous")) . "\"></i></a> &nbsp;\n";

-    $nav .= " <span id=\"month_name\">" . dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y") . ", " . $langs->trans("Week") . " " . $week;

+    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";

+    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;

     $nav .= " </span>\n";

-    $nav .= " &nbsp; <a href=\"?year=" . $next_year . "&amp;month=" . $next_month . "&amp;day=" . $next_day . $param . "\"><i class=\"fa fa-chevron-right\" title=\"" . dol_escape_htmltag($langs->trans("Next")) . "\"></i></a>\n";

-    $nav .= " &nbsp; (<a href=\"?year=" . $nowyear . "&amp;month=" . $nowmonth . "&amp;day=" . $nowday . $param . "\">" . $langs->trans("Today") . "</a>)";

+    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";

+    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";

     $picto = 'calendarweek';

 }

 if ($action == 'show_day') {

-    $nav = "<a href=\"?year=" . $prev_year . "&amp;month=" . $prev_month . "&amp;day=" . $prev_day . $param . "\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";

-    $nav .= " <span id=\"month_name\">" . dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");

+    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";

+    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");

     $nav .= " </span>\n";

-    $nav .= " &nbsp; <a href=\"?year=" . $next_year . "&amp;month=" . $next_month . "&amp;day=" . $next_day . $param . "\"><i class=\"fa fa-chevron-right\"></i></a>\n";

-    $nav .= " &nbsp; (<a href=\"?year=" . $nowyear . "&amp;month=" . $nowmonth . "&amp;day=" . $nowday . $param . "\">" . $langs->trans("Today") . "</a>)";

+    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";

+    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";

     $picto = 'calendarday';

 }

 

 // Must be after the nav definition

-$param .= '&year=' . $year . '&month=' . $month . ($day ? '&day=' . $day : '');

+$param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');

 //print 'x'.$param;

 

 

@@ -385,10 +385,10 @@ 
 

 $head = calendars_prepare_head($paramnoaction);

 

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

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

 if ($optioncss != '')

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

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

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

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

 

 dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');

 print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);

@@ -402,50 +402,50 @@ 
 $showextcals = $listofextcals;

 

 if (!empty($conf->use_javascript_ajax)) { // If javascript on

-    $s .= "\n" . '<!-- Div to calendars selectors -->' . "\n";

-    $s .= '<script type="text/javascript">' . "\n";

-    $s .= 'jQuery(document).ready(function () {' . "\n";

-    $s .= 'jQuery("#check_birthday").click(function() { console.log("Toggle birthday"); jQuery(".family_birthday").toggle(); });' . "\n";

-    $s .= 'jQuery(".family_birthday").toggle();' . "\n";

+    $s .= "\n".'<!-- Div to calendars selectors -->'."\n";

+    $s .= '<script type="text/javascript">'."\n";

+    $s .= 'jQuery(document).ready(function () {'."\n";

+    $s .= 'jQuery("#check_birthday").click(function() { console.log("Toggle birthday"); jQuery(".family_birthday").toggle(); });'."\n";

+    $s .= 'jQuery(".family_birthday").toggle();'."\n";

     if ($action == "show_week" || $action == "show_month" || empty($action)) {

         // Code to enable drag and drop

-        $s .= 'jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {' . "\n";

+        $s .= 'jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {'."\n";

         // Code to submit form

-        $s .= 'console.log("submit form to record new event");' . "\n";

+        $s .= 'console.log("submit form to record new event");'."\n";

         //$s.='console.log(event.target);';

-        $s .= 'var newval = jQuery(event.target).closest("div.dayevent").attr("id");' . "\n";

-        $s .= 'console.log("found parent div.dayevent with id = "+newval);' . "\n";

-        $s .= 'var frm=jQuery("#searchFormList");' . "\n";

-        $s .= 'var newurl = ui.item.find("a.cal_event").attr("href");' . "\n";

-        $s .= 'console.log(newurl);' . "\n";

-        $s .= 'frm.attr("action", newurl).children("#newdate").val(newval);frm.submit();}' . "\n";

-        $s .= '});' . "\n";

+        $s .= 'var newval = jQuery(event.target).closest("div.dayevent").attr("id");'."\n";

+        $s .= 'console.log("found parent div.dayevent with id = "+newval);'."\n";

+        $s .= 'var frm=jQuery("#searchFormList");'."\n";

+        $s .= 'var newurl = ui.item.find("a.cal_event").attr("href");'."\n";

+        $s .= 'console.log(newurl);'."\n";

+        $s .= 'frm.attr("action", newurl).children("#newdate").val(newval);frm.submit();}'."\n";

+        $s .= '});'."\n";

     }

-    $s .= '});' . "\n";

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

+    $s .= '});'."\n";

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

 

     // Local calendar

-    $s .= '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda") . ' &nbsp; </div>';

+    $s .= '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';

 

     // External calendars

     if (is_array($showextcals) && count($showextcals) > 0) {

-        $s .= '<script type="text/javascript">' . "\n";

+        $s .= '<script type="text/javascript">'."\n";

         $s .= 'jQuery(document).ready(function () {

 				jQuery("table input[name^=\"check_ext\"]").click(function() {

 					var name = $(this).attr("name");

 					jQuery(".family_ext" + name.replace("check_ext", "")).toggle();

 				});

 			});' . "\n";

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

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

 

         foreach ($showextcals as $val) {

             $htmlname = md5($val['name']);

-            $s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val['name'] . ' &nbsp; </div>';

+            $s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val['name'].' &nbsp; </div>';

         }

     }

 

     // Birthdays

-    $s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday"> ' . $langs->trans("AgendaShowBirthdayEvents") . ' &nbsp; </div>';

+    $s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';

 

     // Calendars from hooks

     $parameters = array();

@@ -457,12 +457,12 @@ 
         $s = $hookmanager->resPrint;

     }

 } else {          // If javascript off

-    $newparam = $param;   // newparam is for birthday links

-    $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday=' . (empty($showbirthday) ? 1 : 0), $newparam);

+    $newparam = $param; // newparam is for birthday links

+    $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);

     if (!preg_match('/showbirthday=/i', $newparam))

         $newparam .= '&showbirthday=1';

-    $link = '<a href="' . dol_escape_htmltag($_SERVER['PHP_SELF']);

-    $link .= '?' . dol_escape_htmltag($newparam);

+    $link = '<a href="'.dol_escape_htmltag($_SERVER['PHP_SELF']);

+    $link .= '?'.dol_escape_htmltag($newparam);

     $link .= '">';

     if (empty($showbirthday))

         $link .= $langs->trans("AgendaShowBirthdayEvents");

@@ -471,7 +471,7 @@ 
     $link .= '</a>';

 }

 

-print load_fiche_titre($s, $link . ' &nbsp; &nbsp; ' . $nav, '', 0, 0, 'tablelistofcalendars');

+print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav, '', 0, 0, 'tablelistofcalendars');

 

 

 // Load events from database into $eventarray

@@ -489,19 +489,19 @@ 
 $sql .= ' a.fk_soc, a.fk_contact,';

 $sql .= ' a.fk_element, a.elementtype,';

 $sql .= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color';

-$sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_actioncomm as ca, ' . MAIN_DB_PREFIX . "actioncomm as a";

+$sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";

 if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

 // We must filter on resource table

 if ($resourceid > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";

+    $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";

 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";

+    $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";

 if ($usergroup > 0)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

 $sql .= ' WHERE a.fk_action = ca.id';

-$sql .= ' AND a.entity IN (' . getEntity('agenda') . ')';

+$sql .= ' AND a.entity IN ('.getEntity('agenda').')';

 // Condition on actioncode

 if (!empty($actioncode)) {

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

@@ -523,50 +523,50 @@ 
             $sql .= " AND ca.type = 'systemauto'";

         else {

             if (is_array($actioncode)) {

-                $sql .= " AND ca.code IN ('" . implode("','", $actioncode) . "')";

+                $sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";

             } else {

-                $sql .= " AND ca.code IN ('" . implode("','", explode(',', $actioncode)) . "')";

+                $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";

             }

         }

     }

 }

 if ($resourceid > 0)

-    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);

+    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);

 if ($pid)

-    $sql .= " AND a.fk_project=" . $db->escape($pid);

+    $sql .= " AND a.fk_project=".$db->escape($pid);

 if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";

+    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";

 if ($socid > 0)

-    $sql .= ' AND a.fk_soc = ' . $socid;

+    $sql .= ' AND a.fk_soc = '.$socid;

 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0)

     $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";

 if ($action == 'show_day') {

     $sql .= " AND (";

-    $sql .= " (a.datep BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month, $day, $year)) . "'";

-    $sql .= " AND '" . $db->idate(dol_mktime(23, 59, 59, $month, $day, $year)) . "')";

+    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";

+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";

     $sql .= " OR ";

-    $sql .= " (a.datep2 BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month, $day, $year)) . "'";

-    $sql .= " AND '" . $db->idate(dol_mktime(23, 59, 59, $month, $day, $year)) . "')";

+    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";

+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";

     $sql .= " OR ";

-    $sql .= " (a.datep < '" . $db->idate(dol_mktime(0, 0, 0, $month, $day, $year)) . "'";

-    $sql .= " AND a.datep2 > '" . $db->idate(dol_mktime(23, 59, 59, $month, $day, $year)) . "')";

+    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";

+    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";

     $sql .= ')';

 } else {

     // To limit array

     $sql .= " AND (";

-    $sql .= " (a.datep BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7)) . "'";   // Start 7 days before

-    $sql .= " AND '" . $db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10)) . "')";            // End 7 days after + 3 to go from 28 to 31

+    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before

+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')"; // End 7 days after + 3 to go from 28 to 31

     $sql .= " OR ";

-    $sql .= " (a.datep2 BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7)) . "'";

-    $sql .= " AND '" . $db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10)) . "')";

+    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";

+    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";

     $sql .= " OR ";

-    $sql .= " (a.datep < '" . $db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7)) . "'";

-    $sql .= " AND a.datep2 > '" . $db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10)) . "')";

+    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";

+    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";

     $sql .= ')';

 }

 if ($type)

-    $sql .= " AND ca.id = " . $type;

+    $sql .= " AND ca.id = ".$type;

 if ($status == '0') {

     $sql .= " AND a.percent = 0";

 }

@@ -586,9 +586,9 @@ 
 if ($filtert > 0 || $usergroup > 0) {

     $sql .= " AND (";

     if ($filtert > 0)

-        $sql .= "ar.fk_element = " . $filtert;

+        $sql .= "ar.fk_element = ".$filtert;

     if ($usergroup > 0)

-        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;

+        $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;

     $sql .= ")";

 }

 // Sort on date

@@ -601,7 +601,7 @@ 
 if ($resql) {

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

 

-    $MAXONSAMEPAGE = 10000;   // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)

+    $MAXONSAMEPAGE = 10000; // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)

     $i = 0;

     while ($i < $num && $i < $MAXONSAMEPAGE) {

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

@@ -616,7 +616,7 @@ 
         $event = new ActionComm($db);

         $event->id = $obj->id;

 

-        $event->datep = $db->jdate($obj->datep);      // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin

+        $event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin

         $event->datef = $db->jdate($obj->datep2);

         //var_dump($obj->datep);

         //var_dump($event->datep);

@@ -628,9 +628,9 @@ 
         $event->libelle = $obj->label;

         $event->label = $obj->label;

         $event->percentage = $obj->percent;

-        $event->authorid = $obj->fk_user_author;  // user id of creator

+        $event->authorid = $obj->fk_user_author; // user id of creator

         $event->userownerid = $obj->fk_user_action; // user id of owner

-        $event->fetch_userassigned();    // This load $event->userassigned

+        $event->fetch_userassigned(); // This load $event->userassigned

         $event->priority = $obj->priority;

         $event->fulldayevent = $obj->fulldayevent;

         $event->location = $obj->location;

@@ -710,14 +710,14 @@ 
 if ($showbirthday) {

     // Add events in array

     $sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';

-    $sql .= ' FROM ' . MAIN_DB_PREFIX . 'socpeople as sp';

-    $sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat=' . $user->id . '))';

-    $sql .= " AND sp.entity IN (" . getEntity('socpeople') . ")";

+    $sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';

+    $sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';

+    $sql .= " AND sp.entity IN (".getEntity('socpeople').")";

     if ($action == 'show_day') {

-        $sql .= ' AND MONTH(birthday) = ' . $month;

-        $sql .= ' AND DAY(birthday) = ' . $day;

+        $sql .= ' AND MONTH(birthday) = '.$month;

+        $sql .= ' AND DAY(birthday) = '.$day;

     } else {

-        $sql .= ' AND MONTH(birthday) = ' . $month;

+        $sql .= ' AND MONTH(birthday) = '.$month;

     }

     $sql .= ' ORDER BY birthday';

 

@@ -733,10 +733,10 @@ 
             $datebirth = dol_stringtotime($obj->birthday, 1);

             //print 'ee'.$obj->birthday.'-'.$datebirth;

             $datearray = dol_getdate($datebirth, true);

-            $event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true);    // For full day events, date are also GMT but they wont but converted during output

+            $event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output

             $event->datef = $event->datep;

             $event->type_code = 'BIRTHDAY';

-            $event->libelle = $langs->trans("Birthday") . ' ' . dolGetFirstLastname($obj->firstname, $obj->lastname);

+            $event->libelle = $langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);

             $event->percentage = 100;

             $event->fulldayevent = 1;

 

@@ -769,9 +769,9 @@ 
 

 // Complete $eventarray with external import Ical

 if (count($listofextcals)) {

-    require_once DOL_DOCUMENT_ROOT . '/comm/action/class/ical.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';

     foreach ($listofextcals as $extcal) {

-        $url = $extcal['src'];    // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics

+        $url = $extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics

         $namecal = $extcal['name'];

         $offsettz = $extcal['offsettz'];

         $colorcal = $extcal['color'];

@@ -784,9 +784,9 @@ 
         //var_dump($ical->cal); exit;

         $icalevents = array();

         if (is_array($ical->get_event_list()))

-            $icalevents = array_merge($icalevents, $ical->get_event_list());        // Add $ical->cal['VEVENT']

+            $icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']

         if (is_array($ical->get_freebusy_list()))

-            $icalevents = array_merge($icalevents, $ical->get_freebusy_list());  // Add $ical->cal['VFREEBUSY']

+            $icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']

 

         if (count($icalevents) > 0) {

             // Duplicate all repeatable events into new entries

@@ -797,7 +797,7 @@ 
                     //if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1);

                     if ($icalevent['DTSTART;VALUE=DATE']) { //fullday event

                         $datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);

-                        $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1;  // We remove one second to get last second of day

+                        $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day

                     } else if (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) {

                         $datecurstart = $icalevent['DTSTART']['unixtime'];

                         $datecurend = $icalevent['DTEND']['unixtime'];

@@ -832,9 +832,9 @@ 
                     $until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);

                     $maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];

                     if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow)

-                        continue;  // We discard repeatable event that end before start date to show

+                        continue; // We discard repeatable event that end before start date to show

                     if ($datecurstart >= $lastdaytoshow)

-                        continue;                                   // We discard repeatable event that start after end date to show

+                        continue; // We discard repeatable event that start after end date to show

 

                     $numofevent = 0;

                     while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) {

@@ -869,7 +869,7 @@ 
                         }

                         // Test to avoid infinite loop ($datecurstart must increase)

                         if ($savdatecurstart >= $datecurstart) {

-                            dol_syslog("Found a rule freq " . $icalevent['RRULE']['FREQ'] . " not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);

+                            dol_syslog("Found a rule freq ".$icalevent['RRULE']['FREQ']." not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);

                             $datecurstart += 3600 * 24 * 7;

                             $datecurend += 3600 * 24 * 7;

                         }

@@ -883,7 +883,7 @@ 
                 //var_dump($icalevent);

                 //print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;

                 if (!empty($icalevent['RRULE']))

-                    continue;    // We found a repeatable event. It was already split into unitary events, so we discard general rule.

+                    continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.

 

 

                     

@@ -893,7 +893,7 @@ 
                 if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event

                     // For full day events, date are also GMT but they wont but converted using tz during output

                     $datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);

-                    $dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1;  // We remove one second to get last second of day

+                    $dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day

                     //print 'x'.$datestart.'-'.$dateend;exit;

                     //print dol_print_date($dateend,'dayhour','gmt');

                     $event->fulldayevent = 1;

@@ -938,7 +938,7 @@ 
                     $event->id = $icalevent['UID'];

                     $event->icalname = $namecal;

                     $event->icalcolor = $colorcal;

-                    $usertime = 0;    // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.

+                    $usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.

                     $event->datep = $datestart + $usertime;

                     $event->datef = $dateend + $usertime;

                     $event->type_code = "ICALEVENT";

@@ -991,7 +991,7 @@ 
                             //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';

                             $eventarray[$daykey][] = $event;

                             $daykey += 60 * 60 * 24;

-                            $daykeygmt += 60 * 60 * 24;   // Add one day

+                            $daykeygmt += 60 * 60 * 24; // Add one day

                             if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar)

                                 $loop = false;

                         }

@@ -1026,7 +1026,7 @@ 
 $cacheusers = array();

 

 // Define theme_datacolor array

-$color_file = DOL_DOCUMENT_ROOT . "/theme/" . $conf->theme . "/graph-color.php";

+$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";

 if (is_readable($color_file)) {

     include_once $color_file;

 }

@@ -1035,7 +1035,7 @@ 
 

 

 if (empty($action) || $action == 'show_month') {      // View by month

-    $newparam = $param;   // newparam is for birthday links

+    $newparam = $param; // newparam is for birthday links

     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done

     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);

     $newparam = preg_replace('/action=show_week&?/i', '', $newparam);

@@ -1058,11 +1058,11 @@ 
             $labelshort = array(0 => 'SundayMin', 1 => 'MondayMin', 2 => 'TuesdayMin', 3 => 'WednesdayMin', 4 => 'ThursdayMin', 5 => 'FridayMin', 6 => 'SaturdayMin');

             print $langs->trans($labelshort[$numdayinweek]);

         } else

-            print $langs->trans("Day" . $numdayinweek);

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

+            print $langs->trans("Day".$numdayinweek);

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

         $i++;

     }

-    echo ' </tr>' . "\n";

+    echo ' </tr>'."\n";

 

     $todayarray = dol_getdate($now, 'fast');

     $todaytms = dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);

@@ -1077,7 +1077,7 @@ 
                 $style = 'cal_other_month cal_past';

                 if ($iter_day == 6)

                     $style .= ' cal_other_month_right';

-                echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

+                echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';

                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

                 echo "  </td>\n";

             }

@@ -1095,7 +1095,7 @@ 
                 if ($curtime < $todaytms)

                     $style .= ' cal_past';

                 //var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);

-                echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

+                echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';

                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

                 echo "  </td>\n";

             }

@@ -1104,7 +1104,7 @@ 
                 $style = 'cal_other_month';

                 if ($iter_day == 6)

                     $style .= ' cal_other_month_right';

-                echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

+                echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';

                 show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

                 echo "</td>\n";

             }

@@ -1116,11 +1116,11 @@ 
     print '</div>';

 

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

-    print '<input type="hidden" name="backtopage" value="' . dol_escape_htmltag($_SERVER['PHP_SELF']) . '?' . dol_escape_htmltag($_SERVER['QUERY_STRING']) . '">';

+    print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';

     print '<input type="hidden" name="newdate" id="newdate">';

 }

 elseif ($action == 'show_week') { // View by week

-    $newparam = $param;   // newparam is for birthday links

+    $newparam = $param; // newparam is for birthday links

     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done

     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);

     $newparam = preg_replace('/action=show_week&?/i', '', $newparam);

@@ -1136,7 +1136,7 @@ 
     print ' <tr class="liste_titre">';

     $i = 0;

     while ($i < 7) {

-        echo '  <td align="center">' . $langs->trans("Day" . (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)) . "</td>\n";

+        echo '  <td align="center">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))."</td>\n";

         $i++;

     }

     echo " </tr>\n";

@@ -1161,7 +1161,7 @@ 
         if ($today)

             $style = 'cal_today';

 

-        echo '  <td class="' . $style . '" width="14%" valign="top">';

+        echo '  <td class="'.$style.'" width="14%" valign="top">';

         show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);

         echo "  </td>\n";

     }

@@ -1171,11 +1171,11 @@ 
     print '</div>';

 

     echo '<input type="hidden" name="actionmove" value="mupdate">';

-    echo '<input type="hidden" name="backtopage" value="' . dol_escape_htmltag($_SERVER['PHP_SELF']) . '?' . dol_escape_htmltag($_SERVER['QUERY_STRING']) . '">';

+    echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';

     echo '<input type="hidden" name="newdate" id="newdate">';

 }

 else {    // View by day

-    $newparam = $param;   // newparam is for birthday links

+    $newparam = $param; // newparam is for birthday links

     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);

     $newparam = preg_replace('/action=show_week&?/i', '', $newparam);

     $newparam = preg_replace('/viewday=[0-9]+&?/i', '', $newparam);

@@ -1196,7 +1196,7 @@ 
 

     echo ' <tr class="tagtr liste_titre">';

     echo '  <td class="tagtd width100"></td>';

-    echo '  <td class="tagtd center">' . $langs->trans("Day" . $arraytimestamp['wday']) . "</td>\n";

+    echo '  <td class="tagtd center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";

     echo " </td>\n";

 

     /*

@@ -1213,11 +1213,11 @@ 
     /* WIP View per hour */

     $useviewhour = 0;

     if ($useviewhour) {

-        print '<div class="div-table-responsive-no-min borderbottom">';  // You can use div-table-responsive-no-min if you dont need reserved height for your table

+        print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

 

         $maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file

 

-        echo '<div style="max-height: ' . $maxheightwin . 'px;">';

+        echo '<div style="max-height: '.$maxheightwin.'px;">';

         echo '<div class="tagtable centpercent calendarviewcontainer">';

 

         $maxnbofchar = 80;

@@ -1236,9 +1236,9 @@ 
         $i = 0;

         $j = 0;

         while ($i < 24) {

-            echo ' <div class="tagtr calendarviewcontainertr">' . "\n";

-            echo '  <div class="tagtd width100 tdtop">' . dol_print_date($i * 3600, 'hour', 'gmt') . '</div>';

-            echo '  <div class="tagtd ' . $style . ' tdtop">';

+            echo ' <div class="tagtr calendarviewcontainertr">'."\n";

+            echo '  <div class="tagtd width100 tdtop">'.dol_print_date($i * 3600, 'hour', 'gmt').'</div>';

+            echo '  <div class="tagtd '.$style.' tdtop">';

             echo "  </div>\n";

             echo " </div>\n";

             $i++;

@@ -1251,7 +1251,7 @@ 
 

         print '</div>';

     } else {

-        print '<div class="div-table-responsive-no-min">';  // You can use div-table-responsive-no-min if you dont need reserved height for your table

+        print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

 

         show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);

 

@@ -1259,7 +1259,7 @@ 
     }

 }

 

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

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

 

 // End of page

 llxFooter();

@@ -1290,18 +1290,18 @@ 
     global $theme_datacolor;

     global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;

 

-    $dateint = sprintf("%04d", $year) . sprintf("%02d", $month) . sprintf("%02d", $day);

+    $dateint = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);

 

     print "\n";

 

     // Line with title of day

     $curtime = dol_mktime(0, 0, 0, $month, $day, $year);

-    print '<div id="dayevent_' . $dateint . '" class="dayevent tagtable centpercent nobordernopadding">' . "\n";

+    print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";

 

     if ($nonew <= 0) {

         print '<div class="tagtr"><div class="nowrap float">';

-        print '<a style="color: #666" href="' . DOL_URL_ROOT . '/comm/action/index.php?';

-        print 'action=show_day&day=' . str_pad($day, 2, "0", STR_PAD_LEFT) . '&month=' . str_pad($month, 2, "0", STR_PAD_LEFT) . '&year=' . $year;

+        print '<a style="color: #666" href="'.DOL_URL_ROOT.'/comm/action/index.php?';

+        print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;

         print $newparam;

         print '">';

         if ($showinfo)

@@ -1311,15 +1311,15 @@ 
         print '</a>';

         print '</div><div class="floatright nowrap">';

         if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {

-            $newparam .= '&month=' . str_pad($month, 2, "0", STR_PAD_LEFT) . '&year=' . $year;

+            $newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;

 

             //$param='month='.$monthshown.'&year='.$year;

             $hourminsec = '100000';

-            print '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&datep=' . sprintf("%04d%02d%02d", $year, $month, $day) . $hourminsec . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . ($newparam ? '?' . $newparam : '')) . '">';

+            print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')).'">';

             print img_picto($langs->trans("NewAction"), 'edit_add.png');

             print '</a>';

         }

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

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

     }

 

     if ($nonew < 0) {

@@ -1337,9 +1337,9 @@ 
     $numbirthday = 0;

     $numical = 0;

     $numicals = array();

-    $ymd = sprintf("%04d", $year) . sprintf("%02d", $month) . sprintf("%02d", $day);

+    $ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);

 

-    $colorindexused[$user->id] = 0;   // Color index for current user (user->id) is always 0

+    $colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0

     $nextindextouse = is_array($colorindexused) ? count($colorindexused) : 0; // At first run this is 0, so fist user has 0, next 1, ...

     //var_dump($colorindexused);

 

@@ -1376,11 +1376,11 @@ 
                             if (!isset($numicals[dol_string_nospecial($event->icalname)])) {

                                 $numicals[dol_string_nospecial($event->icalname)] = 0;

                             }

-                            $numicals[dol_string_nospecial($event->icalname)] ++;

+                            $numicals[dol_string_nospecial($event->icalname)]++;

                         }

 

                         $color = ($event->icalcolor ? $event->icalcolor : -1);

-                        $cssclass = (!empty($event->icalname) ? 'family_ext' . md5($event->icalname) : 'family_other');

+                        $cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');

                     } else if ($event->type_code == 'BIRTHDAY') {

                         $numbirthday++;

                         $colorindex = 2;

@@ -1389,7 +1389,7 @@ 
                     } else {

                         $numother++;

                         $color = ($event->icalcolor ? $event->icalcolor : -1);

-                        $cssclass = (!empty($event->icalname) ? 'family_ext' . md5($event->icalname) : 'family_other');

+                        $cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');

 

                         if (empty($cacheusers[$event->userownerid])) {

                             $newuser = new User($db);

@@ -1417,7 +1417,7 @@ 
                         // Define color

                         $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);

                     }

-                    $cssclass = $cssclass . ' ' . $cssclass . '_day_' . $ymd;

+                    $cssclass = $cssclass.' '.$cssclass.'_day_'.$ymd;

 

                     // Defined style to disable drag and drop feature

                     if ($event->type_code == 'AC_OTH_AUTO') {

@@ -1453,8 +1453,8 @@ 
 

                     // Show rect of event

                     print "\n";

-                    print '<!-- start event ' . $i . ' -->' . "\n";

-                    print '<div id="event_' . $ymd . '_' . $i . '" class="event ' . $cssclass . '"';

+                    print '<!-- start event '.$i.' -->'."\n";

+                    print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';

                     //print ' style="height: 100px;';

                     //print ' position: absolute; top: 40px; width: 50%;';

                     //print '"';

@@ -1462,12 +1462,12 @@ 
 

                     //var_dump($event->userassigned);

                     //var_dump($event->transparency);

-                    print '<table class="centpercent cal_event' . (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy') . '" style="' . $h;

+                    print '<table class="centpercent cal_event'.(empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy').'" style="'.$h;

                     if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {

-                        print 'border: 2px solid #' . $color . ';';

+                        print 'border: 2px solid #'.$color.';';

                     } else {

-                        print 'background: #' . $color . ';';

-                        print 'background: -webkit-gradient(linear, left top, left bottom, from(#' . dol_color_minus($color, -3) . '), to(#' . dol_color_minus($color, -1) . '));';

+                        print 'background: #'.$color.';';

+                        print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';

                     }

                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';

                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';

@@ -1475,7 +1475,7 @@ 
                     //print 'border: 1px solid #ccc" width="100%"';

                     print '">';

                     print '<tr>';

-                    print '<td class="tdoverflow nobottom centpercent ' . ($nowrapontd ? 'nowrap ' : '') . 'cal_event' . ($event->type_code == 'BIRTHDAY' ? ' cal_event_birthday' : '') . '">';

+                    print '<td class="tdoverflow nobottom centpercent '.($nowrapontd ? 'nowrap ' : '').'cal_event'.($event->type_code == 'BIRTHDAY' ? ' cal_event_birthday' : '').'">';

 

                     $daterange = '';

 

@@ -1520,13 +1520,13 @@ 
                         }

                         else {

                             if ($showinfo) {

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

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

                             }

                         }

 

                         // Show title

                         $titletoshow = $daterange;

-                        $titletoshow .= ($titletoshow ? ' ' : '') . $event->libelle;

+                        $titletoshow .= ($titletoshow ? ' ' : '').$event->libelle;

 

                         if ($event->type_code == 'ICALEVENT')

                             print $titletoshow;

@@ -1557,7 +1557,7 @@ 
                         print $listofusertoshow;

 

                         if ($event->type_code == 'ICALEVENT')

-                            print '<br>(' . dol_trunc($event->icalname, $maxnbofchar) . ')';

+                            print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';

 

                         // If action related to company / contact

                         $linerelatedto = '';

@@ -1584,20 +1584,20 @@ 
                                 $linerelatedto .= $contact->getNomUrl(1, '', 0);

                         }

                         if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {

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

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

                             if ($linerelatedto)

                                 $linerelatedto .= '<br>';

                             $linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);

                         }

                         if ($linerelatedto)

-                            print '<br>' . $linerelatedto;

+                            print '<br>'.$linerelatedto;

                     }

 

                     // Show location

                     if ($showinfo) {

                         if ($event->location) {

                             print '<br>';

-                            print $langs->trans("Location") . ': ' . $event->location;

+                            print $langs->trans("Location").': '.$event->location;

                         }

                     }

 

@@ -1609,23 +1609,23 @@ 
                         if ($event->percentage >= 0)

                             $withstatus = 2;

                     }

-                    print '<td class="nobottom right nowrap cal_event_right' . ($withstatus >= 2 ? ' cal_event_right_status' : '') . '">';

+                    print '<td class="nobottom right nowrap cal_event_right'.($withstatus >= 2 ? ' cal_event_right_status' : '').'">';

                     if ($withstatus)

                         print $event->getLibStatut(3, 1);

                     else

                         print '&nbsp;';

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

-                    print '</div><!-- end event ' . $i . ' -->' . "\n";

+                    print '</div><!-- end event '.$i.' -->'."\n";

                     $i++;

                 }

                 else {

-                    print '<a href="' . DOL_URL_ROOT . '/comm/action/index.php?action=' . $action . '&maxprint=0&month=' . $monthshown . '&year=' . $year;

-                    print ($status ? '&status=' . $status : '') . ($filter ? '&filter=' . $filter : '');

-                    print ($filtert ? '&filtert=' . $filtert : '');

-                    print ($usergroup ? '&usergroup=' . $usergroup : '');

-                    print ($actioncode != '' ? '&actioncode=' . $actioncode : '');

-                    print '">' . img_picto("all", "1downarrow_selected.png") . ' ...';

-                    print ' +' . (count($eventarray[$daykey]) - $maxprint);

+                    print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;

+                    print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');

+                    print ($filtert ? '&filtert='.$filtert : '');

+                    print ($usergroup ? '&usergroup='.$usergroup : '');

+                    print ($actioncode != '' ? '&actioncode='.$actioncode : '');

+                    print '">'.img_picto("all", "1downarrow_selected.png").' ...';

+                    print ' +'.(count($eventarray[$daykey]) - $maxprint);

                     print '</a>';

                     break;

                     //$ok=false;        // To avoid to show twice the link

@@ -1639,26 +1639,26 @@ 
         print '&nbsp;';

 

     if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint) {

-        print '<div id="more_' . $ymd . '">' . img_picto("all", "1downarrow_selected.png") . ' +' . $langs->trans("More") . '...</div>';

+        print '<div id="more_'.$ymd.'">'.img_picto("all", "1downarrow_selected.png").' +'.$langs->trans("More").'...</div>';

         //print ' +'.(count($eventarray[$daykey])-$maxprint);

-        print '<script type="text/javascript">' . "\n";

-        print 'jQuery(document).ready(function () {' . "\n";

-        print 'jQuery("#more_' . $ymd . '").click(function() { reinit_day_' . $ymd . '(); });' . "\n";

+        print '<script type="text/javascript">'."\n";

+        print 'jQuery(document).ready(function () {'."\n";

+        print 'jQuery("#more_'.$ymd.'").click(function() { reinit_day_'.$ymd.'(); });'."\n";

 

-        print 'function reinit_day_' . $ymd . '() {' . "\n";

-        print 'var nb=0;' . "\n";

+        print 'function reinit_day_'.$ymd.'() {'."\n";

+        print 'var nb=0;'."\n";

         // TODO Loop on each element of day $ymd and start to toggle once $maxprint has been reached

-        print 'jQuery(".family_mytasks_day_' . $ymd . '").toggle();';

-        print '}' . "\n";

+        print 'jQuery(".family_mytasks_day_'.$ymd.'").toggle();';

+        print '}'."\n";

 

-        print '});' . "\n";

+        print '});'."\n";

 

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

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

     }

 

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

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

 

-    print '</div>';             // table

+    print '</div>'; // table

     print "\n";

 }

 

Braces +359 added lines, -260 removed lines

@@ -43,11 +43,13 @@ 
     require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';

 }

 

-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW))

-    $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;

+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+    $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 

-if (empty($conf->global->AGENDA_EXT_NB))

-    $conf->global->AGENDA_EXT_NB = 5;

+if (empty($conf->global->AGENDA_EXT_NB)) {
+    $conf->global->AGENDA_EXT_NB = 5;
+}
 $MAXAGENDA = $conf->global->AGENDA_EXT_NB;

 

 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);

@@ -68,24 +70,30 @@ 
 }     // If $page is not defined, or '' or -1

 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

 $offset = $limit * $page;

-if (!$sortorder)

-    $sortorder = "ASC";

-if (!$sortfield)

-    $sortfield = "a.datec";

+if (!$sortorder) {
+    $sortorder = "ASC";
+}
+if (!$sortfield) {
+    $sortfield = "a.datec";
+}
 

 // Security check

 $socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");

-if ($user->societe_id)

-    $socid = $user->societe_id;

+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');

-if ($socid < 0)

-    $socid = '';

+if ($socid < 0) {
+    $socid = '';
+}
 

 $canedit = 1;

-if (!$user->rights->agenda->myactions->read)

-    accessforbidden();

-if (!$user->rights->agenda->allactions->read)

-    $canedit = 0;

+if (!$user->rights->agenda->myactions->read) {
+    accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+    $canedit = 0;
+}
 if (!$user->rights->agenda->allactions->read || $filter == 'mine') {  // If no permission to see all, we show only affected to me

     $filtert = $user->id;

 }

@@ -103,22 +111,25 @@ 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)

 if (GETPOST('search_actioncode', 'array')) {

     $actioncode = GETPOST('search_actioncode', 'array', 3);

-    if (!count($actioncode))

-        $actioncode = '0';

-}

-else {

+    if (!count($actioncode)) {
+            $actioncode = '0';
+    }
+    } else {

     $actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));

 }

-if ($actioncode == '' && empty($actioncodearray))

-    $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);

+if ($actioncode == '' && empty($actioncodearray)) {
+    $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 

-if ($status == '' && !GETPOSTISSET('search_status'))

-    $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);

+if ($status == '' && !GETPOSTISSET('search_status')) {
+    $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
 

 $defaultview = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);

 $defaultview = (empty($user->conf->AGENDA_DEFAULT_VIEW) ? $defaultview : $user->conf->AGENDA_DEFAULT_VIEW);

-if (empty($action) && !GETPOSTISSET('action'))

-    $action = $defaultview;

+if (empty($action) && !GETPOSTISSET('action')) {
+    $action = $defaultview;
+}
 if ($action == 'default') { // When action is default, we want a calendar view and not the list

     $action = (($defaultview != 'show_list') ? $defaultview : 'show_month');

 }

@@ -150,8 +161,9 @@ 
     $param = '';

     if (is_array($_POST)) {

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

-            if ($key == 'token')

-                continue;

+            if ($key == 'token') {
+                            continue;
+            }
             $param .= '&' . $key . '=' . urlencode($val);

         }

     }

@@ -164,8 +176,9 @@ 
     $param = '';

     if (is_array($_POST)) {

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

-            if ($key == 'token')

-                continue;

+            if ($key == 'token') {
+                            continue;
+            }
             $param .= '&' . $key . '=' . urlencode($val);

         }

     }

@@ -247,15 +260,18 @@ 
     // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)

     $tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2;  // date('w') is 0 fo sunday

     $tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);

-    if ($tmpday >= 1)

-        $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.

+    if ($tmpday >= 1) {
+            $tmpday -= 7;
+    }
+    // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.

 

         

 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)

     $firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year);

     $next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;

-    if ($next_day < 6)

-        $next_day += 7;

+    if ($next_day < 6) {
+            $next_day += 7;
+    }
     $lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);

 }

 if ($action == 'show_week') {

@@ -303,39 +319,53 @@ 
 //print dol_print_date($lastdaytoshow,'day');

 

 $title = $langs->trans("DoneAndToDoActions");

-if ($status == 'done')

-    $title = $langs->trans("DoneActions");

-if ($status == 'todo')

-    $title = $langs->trans("ToDoActions");

+if ($status == 'done') {
+    $title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+    $title = $langs->trans("ToDoActions");
+}
 

 $param = '';

 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {

     if (is_array($actioncode)) {

-        foreach ($actioncode as $str_action)

-            $param .= "&search_actioncode[]=" . urlencode($str_action);

-    } else

-        $param .= "&search_actioncode=" . urlencode($actioncode);

-}

-if ($resourceid > 0)

-    $param .= "&search_resourceid=" . urlencode($resourceid);

-if ($status || isset($_GET['status']) || isset($_POST['status']))

-    $param .= "&search_status=" . urlencode($status);

-if ($filter)

-    $param .= "&search_filter=" . urlencode($filter);

-if ($filtert)

-    $param .= "&search_filtert=" . urlencode($filtert);

-if ($usergroup)

-    $param .= "&search_usergroup=" . urlencode($usergroup);

-if ($socid)

-    $param .= "&search_socid=" . urlencode($socid);

-if ($showbirthday)

-    $param .= "&search_showbirthday=1";

-if ($pid)

-    $param .= "&search_projectid=" . urlencode($pid);

-if ($type)

-    $param .= "&search_type=" . urlencode($type);

-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month')

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

+        foreach ($actioncode as $str_action) {
+                    $param .= "&search_actioncode[]=" . urlencode($str_action);
+        }
+    } else {
+            $param .= "&search_actioncode=" . urlencode($actioncode);
+    }
+    }

+if ($resourceid > 0) {
+    $param .= "&search_resourceid=" . urlencode($resourceid);
+}
+if ($status || isset($_GET['status']) || isset($_POST['status'])) {
+    $param .= "&search_status=" . urlencode($status);
+}
+if ($filter) {
+    $param .= "&search_filter=" . urlencode($filter);
+}
+if ($filtert) {
+    $param .= "&search_filtert=" . urlencode($filtert);
+}
+if ($usergroup) {
+    $param .= "&search_usergroup=" . urlencode($usergroup);
+}
+if ($socid) {
+    $param .= "&search_socid=" . urlencode($socid);
+}
+if ($showbirthday) {
+    $param .= "&search_showbirthday=1";
+}
+if ($pid) {
+    $param .= "&search_projectid=" . urlencode($pid);
+}
+if ($type) {
+    $param .= "&search_type=" . urlencode($type);
+}
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month') {
+    $param .= '&action=' . urlencode($action);
+}
 $param .= "&maxprint=" . urlencode($maxprint);

 

 // Show navigation bar

@@ -372,22 +402,27 @@ 
 

 

 $tabactive = '';

-if ($action == 'show_month')

-    $tabactive = 'cardmonth';

-if ($action == 'show_week')

-    $tabactive = 'cardweek';

-if ($action == 'show_day')

-    $tabactive = 'cardday';

-if ($action == 'show_list')

-    $tabactive = 'cardlist';

+if ($action == 'show_month') {
+    $tabactive = 'cardmonth';
+}
+if ($action == 'show_week') {
+    $tabactive = 'cardweek';
+}
+if ($action == 'show_day') {
+    $tabactive = 'cardday';
+}
+if ($action == 'show_list') {
+    $tabactive = 'cardlist';
+}
 

 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);

 

 $head = calendars_prepare_head($paramnoaction);

 

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

-if ($optioncss != '')

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

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

 

 dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');

@@ -459,15 +494,17 @@ 
 } else {          // If javascript off

     $newparam = $param;   // newparam is for birthday links

     $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday=' . (empty($showbirthday) ? 1 : 0), $newparam);

-    if (!preg_match('/showbirthday=/i', $newparam))

-        $newparam .= '&showbirthday=1';

+    if (!preg_match('/showbirthday=/i', $newparam)) {
+            $newparam .= '&showbirthday=1';
+    }
     $link = '<a href="' . dol_escape_htmltag($_SERVER['PHP_SELF']);

     $link .= '?' . dol_escape_htmltag($newparam);

     $link .= '">';

-    if (empty($showbirthday))

-        $link .= $langs->trans("AgendaShowBirthdayEvents");

-    else

-        $link .= $langs->trans("AgendaHideBirthdayEvents");

+    if (empty($showbirthday)) {
+            $link .= $langs->trans("AgendaShowBirthdayEvents");
+    } else {
+            $link .= $langs->trans("AgendaHideBirthdayEvents");
+    }
     $link .= '</a>';

 }

 

@@ -478,8 +515,9 @@ 
 $eventarray = array();

 

 $sql = 'SELECT ';

-if ($usergroup > 0)

-    $sql .= " DISTINCT";

+if ($usergroup > 0) {
+    $sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';

 $sql .= ' a.datep,';

 $sql .= ' a.datep2,';

@@ -490,38 +528,43 @@ 
 $sql .= ' a.fk_element, a.elementtype,';

 $sql .= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color';

 $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_actioncomm as ca, ' . MAIN_DB_PREFIX . "actioncomm as a";

-if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";

+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 // We must filter on resource table

-if ($resourceid > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";

+if ($resourceid > 0) {
+    $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";
+}
 // We must filter on assignement table

-if ($filtert > 0 || $usergroup > 0)

-    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";

-if ($usergroup > 0)

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";

+if ($filtert > 0 || $usergroup > 0) {
+    $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= ' WHERE a.fk_action = ca.id';

 $sql .= ' AND a.entity IN (' . getEntity('agenda') . ')';

 // Condition on actioncode

 if (!empty($actioncode)) {

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

-        if ($actioncode == 'AC_NON_AUTO')

-            $sql .= " AND ca.type != 'systemauto'";

-        elseif ($actioncode == 'AC_ALL_AUTO')

-            $sql .= " AND ca.type = 'systemauto'";

-        else {

-            if ($actioncode == 'AC_OTH')

-                $sql .= " AND ca.type != 'systemauto'";

-            if ($actioncode == 'AC_OTH_AUTO')

-                $sql .= " AND ca.type = 'systemauto'";

+        if ($actioncode == 'AC_NON_AUTO') {
+                    $sql .= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+                    $sql .= " AND ca.type = 'systemauto'";
+        } else {

+            if ($actioncode == 'AC_OTH') {
+                            $sql .= " AND ca.type != 'systemauto'";
+            }
+            if ($actioncode == 'AC_OTH_AUTO') {
+                            $sql .= " AND ca.type = 'systemauto'";
+            }
         }

-    }

-    else {

-        if ($actioncode == 'AC_NON_AUTO')

-            $sql .= " AND ca.type != 'systemauto'";

-        elseif ($actioncode == 'AC_ALL_AUTO')

-            $sql .= " AND ca.type = 'systemauto'";

-        else {

+    } else {

+        if ($actioncode == 'AC_NON_AUTO') {
+                    $sql .= " AND ca.type != 'systemauto'";
+        } elseif ($actioncode == 'AC_ALL_AUTO') {
+                    $sql .= " AND ca.type = 'systemauto'";
+        } else {

             if (is_array($actioncode)) {

                 $sql .= " AND ca.code IN ('" . implode("','", $actioncode) . "')";

             } else {

@@ -530,17 +573,22 @@ 
         }

     }

 }

-if ($resourceid > 0)

-    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);

-if ($pid)

-    $sql .= " AND a.fk_project=" . $db->escape($pid);

-if (!$user->rights->societe->client->voir && !$socid)

-    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";

-if ($socid > 0)

-    $sql .= ' AND a.fk_soc = ' . $socid;

+if ($resourceid > 0) {
+    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);
+}
+if ($pid) {
+    $sql .= " AND a.fk_project=" . $db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
+}
+if ($socid > 0) {
+    $sql .= ' AND a.fk_soc = ' . $socid;
+}
 // We must filter on assignement table

-if ($filtert > 0 || $usergroup > 0)

-    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";

+if ($filtert > 0 || $usergroup > 0) {
+    $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 if ($action == 'show_day') {

     $sql .= " AND (";

     $sql .= " (a.datep BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month, $day, $year)) . "'";

@@ -565,8 +613,9 @@ 
     $sql .= " AND a.datep2 > '" . $db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10)) . "')";

     $sql .= ')';

 }

-if ($type)

-    $sql .= " AND ca.id = " . $type;

+if ($type) {
+    $sql .= " AND ca.id = " . $type;
+}
 if ($status == '0') {

     $sql .= " AND a.percent = 0";

 }

@@ -585,10 +634,12 @@ 
 // We must filter on assignement table

 if ($filtert > 0 || $usergroup > 0) {

     $sql .= " AND (";

-    if ($filtert > 0)

-        $sql .= "ar.fk_element = " . $filtert;

-    if ($usergroup > 0)

-        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;

+    if ($filtert > 0) {
+            $sql .= "ar.fk_element = " . $filtert;
+    }
+    if ($usergroup > 0) {
+            $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . $usergroup;
+    }
     $sql .= ")";

 }

 // Sort on date

@@ -647,17 +698,18 @@ 
         // They are date start and end of action but modified to not be outside calendar view.

         if ($event->percentage <= 0) {

             $event->date_start_in_calendar = $event->datep;

-            if ($event->datef != '' && $event->datef >= $event->datep)

-                $event->date_end_in_calendar = $event->datef;

-            else

-                $event->date_end_in_calendar = $event->datep;

-        }

-        else {

+            if ($event->datef != '' && $event->datef >= $event->datep) {
+                            $event->date_end_in_calendar = $event->datef;
+            } else {
+                            $event->date_end_in_calendar = $event->datep;
+            }
+        } else {

             $event->date_start_in_calendar = $event->datep;

-            if ($event->datef != '' && $event->datef >= $event->datep)

-                $event->date_end_in_calendar = $event->datef;

-            else

-                $event->date_end_in_calendar = $event->datep;

+            if ($event->datef != '' && $event->datef >= $event->datep) {
+                            $event->date_end_in_calendar = $event->datef;
+            } else {
+                            $event->date_end_in_calendar = $event->datep;
+            }
         }

         // Define ponctual property

         if ($event->date_start_in_calendar == $event->date_end_in_calendar) {

@@ -669,10 +721,12 @@ 
             $event->date_start_in_calendar >= $lastdaytoshow) {

             // This record is out of visible range

         } else {

-            if ($event->date_start_in_calendar < $firstdaytoshow)

-                $event->date_start_in_calendar = $firstdaytoshow;

-            if ($event->date_end_in_calendar >= $lastdaytoshow)

-                $event->date_end_in_calendar = ($lastdaytoshow - 1);

+            if ($event->date_start_in_calendar < $firstdaytoshow) {
+                            $event->date_start_in_calendar = $firstdaytoshow;
+            }
+            if ($event->date_end_in_calendar >= $lastdaytoshow) {
+                            $event->date_end_in_calendar = ($lastdaytoshow - 1);
+            }
 

             // Add an entry in actionarray for each day

             $daycursor = $event->date_start_in_calendar;

@@ -691,8 +745,9 @@ 
                 $j++;

 

                 $daykey += 60 * 60 * 24;

-                if ($daykey > $event->date_end_in_calendar)

-                    $loop = false;

+                if ($daykey > $event->date_end_in_calendar) {
+                                    $loop = false;
+                }
             }

             while ($loop);

 

@@ -701,8 +756,7 @@ 
         }

         $i++;

     }

-}

-else {

+} else {

     dol_print_error($db);

 }

 

@@ -755,14 +809,14 @@ 
             do {

                 $eventarray[$daykey][] = $event;

                 $daykey += 60 * 60 * 24;

-                if ($daykey > $event->date_end_in_calendar)

-                    $loop = false;

+                if ($daykey > $event->date_end_in_calendar) {
+                                    $loop = false;
+                }
             }

             while ($loop);

             $i++;

         }

-    }

-    else {

+    } else {

         dol_print_error($db);

     }

 }

@@ -783,10 +837,14 @@ 
         // After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...

         //var_dump($ical->cal); exit;

         $icalevents = array();

-        if (is_array($ical->get_event_list()))

-            $icalevents = array_merge($icalevents, $ical->get_event_list());        // Add $ical->cal['VEVENT']

-        if (is_array($ical->get_freebusy_list()))

-            $icalevents = array_merge($icalevents, $ical->get_freebusy_list());  // Add $ical->cal['VFREEBUSY']

+        if (is_array($ical->get_event_list())) {
+                    $icalevents = array_merge($icalevents, $ical->get_event_list());
+        }
+        // Add $ical->cal['VEVENT']

+        if (is_array($ical->get_freebusy_list())) {
+                    $icalevents = array_merge($icalevents, $ical->get_freebusy_list());
+        }
+        // Add $ical->cal['VFREEBUSY']

 

         if (count($icalevents) > 0) {

             // Duplicate all repeatable events into new entries

@@ -809,19 +867,20 @@ 
                             $tmpdaylightend = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['STANDARD']['DTSTART'];

                             //var_dump($tmpcurstart);var_dump($tmpcurend); var_dump($ical->cal['DAYLIGHT']['DTSTART']);var_dump($ical->cal['STANDARD']['DTSTART']);

                             // Edit datecurstart and datecurend

-                            if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend)

-                                $datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;

-                            else

-                                $datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;

-                            if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend)

-                                $datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;

-                            else

-                                $datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;

+                            if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+                                                            $datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+                            } else {
+                                                            $datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+                            }
+                            if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+                                                            $datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+                            } else {
+                                                            $datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+                            }
                         }

                         // datecurstart and datecurend are now GMT date

                         //var_dump($datecurstart); var_dump($datecurend); exit;

-                    }

-                    else {

+                    } else {

                         // Not a recongized record

                         dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);

                         continue;

@@ -831,10 +890,14 @@ 
                     $interval = (empty($icalevent['RRULE']['INTERVAL']) ? 1 : $icalevent['RRULE']['INTERVAL']);

                     $until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);

                     $maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];

-                    if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow)

-                        continue;  // We discard repeatable event that end before start date to show

-                    if ($datecurstart >= $lastdaytoshow)

-                        continue;                                   // We discard repeatable event that start after end date to show

+                    if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) {
+                                            continue;
+                    }
+                    // We discard repeatable event that end before start date to show

+                    if ($datecurstart >= $lastdaytoshow) {
+                                            continue;
+                    }
+                    // We discard repeatable event that start after end date to show

 

                     $numofevent = 0;

                     while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) {

@@ -882,8 +945,10 @@ 
             foreach ($icalevents as $icalevent) {

                 //var_dump($icalevent);

                 //print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;

-                if (!empty($icalevent['RRULE']))

-                    continue;    // We found a repeatable event. It was already split into unitary events, so we discard general rule.

+                if (!empty($icalevent['RRULE'])) {
+                                    continue;
+                }
+                // We found a repeatable event. It was already split into unitary events, so we discard general rule.

 

 

                     

@@ -943,19 +1008,21 @@ 
                     $event->datef = $dateend + $usertime;

                     $event->type_code = "ICALEVENT";

 

-                    if ($icalevent['SUMMARY'])

-                        $event->libelle = $icalevent['SUMMARY'];

-                    elseif ($icalevent['DESCRIPTION'])

-                        $event->libelle = dol_nl2br($icalevent['DESCRIPTION'], 1);

-                    else

-                        $event->libelle = $langs->trans("ExtSiteNoLabel");

+                    if ($icalevent['SUMMARY']) {
+                                            $event->libelle = $icalevent['SUMMARY'];
+                    } elseif ($icalevent['DESCRIPTION']) {
+                                            $event->libelle = dol_nl2br($icalevent['DESCRIPTION'], 1);
+                    } else {
+                                            $event->libelle = $langs->trans("ExtSiteNoLabel");
+                    }
 

                     $event->date_start_in_calendar = $event->datep;

 

-                    if ($event->datef != '' && $event->datef >= $event->datep)

-                        $event->date_end_in_calendar = $event->datef;

-                    else

-                        $event->date_end_in_calendar = $event->datep;

+                    if ($event->datef != '' && $event->datef >= $event->datep) {
+                                            $event->date_end_in_calendar = $event->datef;
+                    } else {
+                                            $event->date_end_in_calendar = $event->datep;
+                    }
 

                     // Define ponctual property

                     if ($event->date_start_in_calendar == $event->date_end_in_calendar) {

@@ -970,10 +1037,12 @@ 
                         //print 'x'.$datestart.'-'.$dateend;exit;

                         // This record is out of visible range

                     } else {

-                        if ($event->date_start_in_calendar < $firstdaytoshow)

-                            $event->date_start_in_calendar = $firstdaytoshow;

-                        if ($event->date_end_in_calendar >= $lastdaytoshow)

-                            $event->date_end_in_calendar = ($lastdaytoshow - 1);

+                        if ($event->date_start_in_calendar < $firstdaytoshow) {
+                                                    $event->date_start_in_calendar = $firstdaytoshow;
+                        }
+                        if ($event->date_end_in_calendar >= $lastdaytoshow) {
+                                                    $event->date_end_in_calendar = ($lastdaytoshow - 1);
+                        }
 

                         // Add an entry in actionarray for each day

                         $daycursor = $event->date_start_in_calendar;

@@ -992,8 +1061,9 @@ 
                             $eventarray[$daykey][] = $event;

                             $daykey += 60 * 60 * 24;

                             $daykeygmt += 60 * 60 * 24;   // Add one day

-                            if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar)

-                                $loop = false;

+                            if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) {
+                                                            $loop = false;
+                            }
                         }

                         while ($loop);

                     }

@@ -1030,8 +1100,9 @@ 
 if (is_readable($color_file)) {

     include_once $color_file;

 }

-if (!is_array($theme_datacolor))

-    $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));

+if (!is_array($theme_datacolor)) {
+    $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 

 

 if (empty($action) || $action == 'show_month') {      // View by month

@@ -1057,8 +1128,9 @@ 
         if (!empty($conf->dol_optimize_smallscreen)) {

             $labelshort = array(0 => 'SundayMin', 1 => 'MondayMin', 2 => 'TuesdayMin', 3 => 'WednesdayMin', 4 => 'ThursdayMin', 5 => 'FridayMin', 6 => 'SaturdayMin');

             print $langs->trans($labelshort[$numdayinweek]);

-        } else

-            print $langs->trans("Day" . $numdayinweek);

+        } else {
+                    print $langs->trans("Day" . $numdayinweek);
+        }
         print '  </td>' . "\n";

         $i++;

     }

@@ -1075,8 +1147,9 @@ 
             /* Show days before the beginning of the current month (previous month)  */

             if ($tmpday <= 0) {

                 $style = 'cal_other_month cal_past';

-                if ($iter_day == 6)

-                    $style .= ' cal_other_month_right';

+                if ($iter_day == 6) {
+                                    $style .= ' cal_other_month_right';
+                }
                 echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

                 echo "  </td>\n";

@@ -1085,15 +1158,19 @@ 
             elseif ($tmpday <= $max_day_in_month) {

                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);

                 $style = 'cal_current_month';

-                if ($iter_day == 6)

-                    $style .= ' cal_current_month_right';

+                if ($iter_day == 6) {
+                                    $style .= ' cal_current_month_right';
+                }
                 $today = 0;

-                if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year)

-                    $today = 1;

-                if ($today)

-                    $style = 'cal_today';

-                if ($curtime < $todaytms)

-                    $style .= ' cal_past';

+                if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) {
+                                    $today = 1;
+                }
+                if ($today) {
+                                    $style = 'cal_today';
+                }
+                if ($curtime < $todaytms) {
+                                    $style .= ' cal_past';
+                }
                 //var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);

                 echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

@@ -1102,8 +1179,9 @@ 
             /* Show days after the current month (next month) */

             else {

                 $style = 'cal_other_month';

-                if ($iter_day == 6)

-                    $style .= ' cal_other_month_right';

+                if ($iter_day == 6) {
+                                    $style .= ' cal_other_month_right';
+                }
                 echo '  <td class="' . $style . ' nowrap" width="14%" valign="top">';

                 show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);

                 echo "</td>\n";

@@ -1118,8 +1196,7 @@ 
     print '<input type="hidden" name="actionmove" value="mupdate">';

     print '<input type="hidden" name="backtopage" value="' . dol_escape_htmltag($_SERVER['PHP_SELF']) . '?' . dol_escape_htmltag($_SERVER['QUERY_STRING']) . '">';

     print '<input type="hidden" name="newdate" id="newdate">';

-}

-elseif ($action == 'show_week') { // View by week

+} elseif ($action == 'show_week') { // View by week

     $newparam = $param;   // newparam is for birthday links

     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done

     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);

@@ -1152,14 +1229,17 @@ 
         $tmpyear = $tmparray['year'];

 

         $style = 'cal_current_month';

-        if ($iter_day == 6)

-            $style .= ' cal_other_month_right';

+        if ($iter_day == 6) {
+                    $style .= ' cal_other_month_right';
+        }
         $today = 0;

         $todayarray = dol_getdate($now, 'fast');

-        if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear)

-            $today = 1;

-        if ($today)

-            $style = 'cal_today';

+        if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+                    $today = 1;
+        }
+        if ($today) {
+                    $style = 'cal_today';
+        }
 

         echo '  <td class="' . $style . '" width="14%" valign="top">';

         show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);

@@ -1173,8 +1253,7 @@ 
     echo '<input type="hidden" name="actionmove" value="mupdate">';

     echo '<input type="hidden" name="backtopage" value="' . dol_escape_htmltag($_SERVER['PHP_SELF']) . '?' . dol_escape_htmltag($_SERVER['QUERY_STRING']) . '">';

     echo '<input type="hidden" name="newdate" id="newdate">';

-}

-else {    // View by day

+} else {    // View by day

     $newparam = $param;   // newparam is for birthday links

     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);

     $newparam = preg_replace('/action=show_week&?/i', '', $newparam);

@@ -1184,8 +1263,9 @@ 
     $style = 'cal_current_month cal_current_month_oneday';

     $today = 0;

     $todayarray = dol_getdate($now, 'fast');

-    if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year)

-        $today = 1;

+    if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) {
+            $today = 1;
+    }
     //if ($today) $style='cal_today';

 

     $timestamp = dol_mktime(12, 0, 0, $month, $day, $year);

@@ -1225,10 +1305,12 @@ 
         $tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);

         $minhour = round($tmp[0], 0);

         $maxhour = round($tmp[1], 0);

-        if ($minhour > 23)

-            $minhour = 23;

-        if ($maxhour < 1)

-            $maxhour = 1;

+        if ($minhour > 23) {
+                    $minhour = 23;
+        }
+        if ($maxhour < 1) {
+                    $maxhour = 1;
+        }
         if ($maxhour <= $minhour) {

             $maxhour = $minhour + 1;

         }

@@ -1304,10 +1386,11 @@ 
         print 'action=show_day&day=' . str_pad($day, 2, "0", STR_PAD_LEFT) . '&month=' . str_pad($month, 2, "0", STR_PAD_LEFT) . '&year=' . $year;

         print $newparam;

         print '">';

-        if ($showinfo)

-            print dol_print_date($curtime, 'daytextshort');

-        else

-            print dol_print_date($curtime, '%d');

+        if ($showinfo) {
+                    print dol_print_date($curtime, 'daytextshort');
+        } else {
+                    print dol_print_date($curtime, '%d');
+        }
         print '</a>';

         print '</div><div class="floatright nowrap">';

         if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {

@@ -1367,10 +1450,10 @@ 
                         }

                         //var_dump($cacheusers[$event->userownerid]->color);

                         // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)

-                        if (!empty($cacheusers[$event->userownerid]->color))

-                            $color = $cacheusers[$event->userownerid]->color;

-                    }

-                    else if ($event->type_code == 'ICALEVENT') {      // Event come from external ical file

+                        if (!empty($cacheusers[$event->userownerid]->color)) {
+                                                    $color = $cacheusers[$event->userownerid]->color;
+                        }
+                    } else if ($event->type_code == 'ICALEVENT') {      // Event come from external ical file

                         $numical++;

                         if (!empty($event->icalname)) {

                             if (!isset($numicals[dol_string_nospecial($event->icalname)])) {

@@ -1398,8 +1481,9 @@ 
                         }

                         //var_dump($cacheusers[$event->userownerid]->color);

                         // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)

-                        if (!empty($cacheusers[$event->userownerid]->color))

-                            $color = $cacheusers[$event->userownerid]->color;

+                        if (!empty($cacheusers[$event->userownerid]->color)) {
+                                                    $color = $cacheusers[$event->userownerid]->color;
+                        }
                     }

 

                     if ($color < 0) { // Color was not set on user card. Set color according to color index.

@@ -1410,8 +1494,10 @@ 
                         } else {

                             $colorindex = $nextindextouse;

                             $colorindexused[$idusertouse] = $colorindex;

-                            if (!empty($theme_datacolor[$nextindextouse + 1]))

-                                $nextindextouse++; // Prepare to use next color

+                            if (!empty($theme_datacolor[$nextindextouse + 1])) {
+                                                            $nextindextouse++;
+                            }
+                            // Prepare to use next color

                         }

                         //print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';

                         // Define color

@@ -1501,8 +1587,9 @@ 
                             if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour) {

                                 $daterange .= dol_print_date($event->date_start_in_calendar, '%H:%M'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user

                                 if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {

-                                    if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)

-                                        $daterange .= '-';

+                                    if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend) {
+                                                                            $daterange .= '-';
+                                    }
                                     //else

                                     //print '...';

                                 }

@@ -1514,11 +1601,12 @@ 
                             }

                             // Hour end

                             if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {

-                                if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)

-                                    $daterange .= dol_print_date($event->date_end_in_calendar, '%H:%M'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user

+                                if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) {
+                                                                    $daterange .= dol_print_date($event->date_end_in_calendar, '%H:%M');
+                                }
+                                // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user

                             }

-                        }

-                        else {

+                        } else {

                             if ($showinfo) {

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

                             }

@@ -1528,9 +1616,9 @@ 
                         $titletoshow = $daterange;

                         $titletoshow .= ($titletoshow ? ' ' : '') . $event->libelle;

 

-                        if ($event->type_code == 'ICALEVENT')

-                            print $titletoshow;

-                        else {

+                        if ($event->type_code == 'ICALEVENT') {
+                                                    print $titletoshow;
+                        } else {

                             $savlabel = $event->label ? $event->label : $event->libelle;

                             $event->label = $titletoshow;

                             $event->libelle = $titletoshow;

@@ -1543,8 +1631,9 @@ 
                         $listofusertoshow = '';

                         $posuserassigned = 0;

                         foreach ($event->userassigned as $tmpid => $tmpdata) {

-                            if (!$posuserassigned && $titletoshow)

-                                $listofusertoshow .= '<br>';

+                            if (!$posuserassigned && $titletoshow) {
+                                                            $listofusertoshow .= '<br>';
+                            }
                             $posuserassigned++;

                             if (empty($cacheusers[$tmpid])) {

                                 $newuser = new User($db);

@@ -1556,8 +1645,9 @@ 
                         }

                         print $listofusertoshow;

 

-                        if ($event->type_code == 'ICALEVENT')

-                            print '<br>(' . dol_trunc($event->icalname, $maxnbofchar) . ')';

+                        if ($event->type_code == 'ICALEVENT') {
+                                                    print '<br>(' . dol_trunc($event->icalname, $maxnbofchar) . ')';
+                        }
 

                         // If action related to company / contact

                         $linerelatedto = '';

@@ -1566,31 +1656,38 @@ 
                                 $thirdparty = new Societe($db);

                                 $thirdparty->fetch($event->societe->id);

                                 $cachethirdparties[$event->societe->id] = $thirdparty;

-                            } else

-                                $thirdparty = $cachethirdparties[$event->societe->id];

-                            if (!empty($thirdparty->id))

-                                $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);

+                            } else {
+                                                            $thirdparty = $cachethirdparties[$event->societe->id];
+                            }
+                            if (!empty($thirdparty->id)) {
+                                                            $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+                            }
                         }

                         if (!empty($event->contact->id) && $event->contact->id > 0) {

                             if (!is_object($cachecontacts[$event->contact->id])) {

                                 $contact = new Contact($db);

                                 $contact->fetch($event->contact->id);

                                 $cachecontacts[$event->contact->id] = $contact;

-                            } else

-                                $contact = $cachecontacts[$event->contact->id];

-                            if ($linerelatedto)

-                                $linerelatedto .= '&nbsp;';

-                            if (!empty($contact->id))

-                                $linerelatedto .= $contact->getNomUrl(1, '', 0);

+                            } else {
+                                                            $contact = $cachecontacts[$event->contact->id];
+                            }
+                            if ($linerelatedto) {
+                                                            $linerelatedto .= '&nbsp;';
+                            }
+                            if (!empty($contact->id)) {
+                                                            $linerelatedto .= $contact->getNomUrl(1, '', 0);
+                            }
                         }

                         if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {

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

-                            if ($linerelatedto)

-                                $linerelatedto .= '<br>';

+                            if ($linerelatedto) {
+                                                            $linerelatedto .= '<br>';
+                            }
                             $linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);

                         }

-                        if ($linerelatedto)

-                            print '<br>' . $linerelatedto;

+                        if ($linerelatedto) {
+                                                    print '<br>' . $linerelatedto;
+                        }
                     }

 

                     // Show location

@@ -1606,19 +1703,20 @@ 
                     $withstatus = 0;

                     if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') {

                         $withstatus = 1;

-                        if ($event->percentage >= 0)

-                            $withstatus = 2;

+                        if ($event->percentage >= 0) {
+                                                    $withstatus = 2;
+                        }
                     }

                     print '<td class="nobottom right nowrap cal_event_right' . ($withstatus >= 2 ? ' cal_event_right_status' : '') . '">';

-                    if ($withstatus)

-                        print $event->getLibStatut(3, 1);

-                    else

-                        print '&nbsp;';

+                    if ($withstatus) {
+                                            print $event->getLibStatut(3, 1);
+                    } else {
+                                            print '&nbsp;';
+                    }
                     print '</td></tr></table>';

                     print '</div><!-- end event ' . $i . ' -->' . "\n";

                     $i++;

-                }

-                else {

+                } else {

                     print '<a href="' . DOL_URL_ROOT . '/comm/action/index.php?action=' . $action . '&maxprint=0&month=' . $monthshown . '&year=' . $year;

                     print ($status ? '&status=' . $status : '') . ($filter ? '&filter=' . $filter : '');

                     print ($filtert ? '&filtert=' . $filtert : '');

@@ -1635,8 +1733,9 @@ 
             break;

         }

     }

-    if (!$i)

-        print '&nbsp;';

+    if (!$i) {
+            print '&nbsp;';
+    }
 

     if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint) {

         print '<div id="more_' . $ymd . '">' . img_picto("all", "1downarrow_selected.png") . ' +' . $langs->trans("More") . '...</div>';

dolibarr/htdocs/admin/dict.php

Spacing +263 added lines, -263 removed lines

@@ -26,24 +26,24 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
 /**
  * 	    \file       htdocs/admin/dict.php
  * 		\ingroup    setup
  * 		\brief      Page to administer data tables
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.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/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 if (!empty($conf->accounting->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
 // Load translation files required by the page
@@ -58,11 +58,11 @@ 
 
 $allowed = $user->admin;
 if ($id == 7 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;     // Tax page allowed to manager of chart account
+    $allowed = 1; // Tax page allowed to manager of chart account
 }if ($id == 10 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;    // Vat page allowed to manager of chart account
+    $allowed = 1; // Vat page allowed to manager of chart account
 }if ($id == 17 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;    // Dictionary with type of expense report and accounting account allowed to manager of chart account
+    $allowed = 1; // Dictionary with type of expense report and accounting account allowed to manager of chart account
 }if (!$allowed) {
     accessforbidden();
 }
@@ -102,42 +102,42 @@ 
 
 // Name of SQL tables of dictionaries
 $tabname = array();
-$tabname[1] = MAIN_DB_PREFIX . "c_forme_juridique";
-$tabname[2] = MAIN_DB_PREFIX . "c_departements";
-$tabname[3] = MAIN_DB_PREFIX . "c_regions";
-$tabname[4] = MAIN_DB_PREFIX . "c_country";
-$tabname[5] = MAIN_DB_PREFIX . "c_civility";
-$tabname[6] = MAIN_DB_PREFIX . "c_actioncomm";
-$tabname[7] = MAIN_DB_PREFIX . "c_chargesociales";
-$tabname[8] = MAIN_DB_PREFIX . "c_typent";
-$tabname[9] = MAIN_DB_PREFIX . "c_currencies";
-$tabname[10] = MAIN_DB_PREFIX . "c_tva";
-$tabname[11] = MAIN_DB_PREFIX . "c_type_contact";
-$tabname[12] = MAIN_DB_PREFIX . "c_payment_term";
-$tabname[13] = MAIN_DB_PREFIX . "c_paiement";
-$tabname[14] = MAIN_DB_PREFIX . "c_ecotaxe";
-$tabname[15] = MAIN_DB_PREFIX . "c_paper_format";
-$tabname[16] = MAIN_DB_PREFIX . "c_prospectlevel";
-$tabname[17] = MAIN_DB_PREFIX . "c_type_fees";
-$tabname[18] = MAIN_DB_PREFIX . "c_shipment_mode";
-$tabname[19] = MAIN_DB_PREFIX . "c_effectif";
-$tabname[20] = MAIN_DB_PREFIX . "c_input_method";
-$tabname[21] = MAIN_DB_PREFIX . "c_availability";
-$tabname[22] = MAIN_DB_PREFIX . "c_input_reason";
-$tabname[23] = MAIN_DB_PREFIX . "c_revenuestamp";
-$tabname[24] = MAIN_DB_PREFIX . "c_type_resource";
-$tabname[25] = MAIN_DB_PREFIX . "c_type_container";
-$tabname[26] = MAIN_DB_PREFIX . "c_units";
-$tabname[27] = MAIN_DB_PREFIX . "c_stcomm";
-$tabname[28] = MAIN_DB_PREFIX . "c_holiday_types";
-$tabname[29] = MAIN_DB_PREFIX . "c_lead_status";
-$tabname[30] = MAIN_DB_PREFIX . "c_format_cards";
+$tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
+$tabname[2] = MAIN_DB_PREFIX."c_departements";
+$tabname[3] = MAIN_DB_PREFIX."c_regions";
+$tabname[4] = MAIN_DB_PREFIX."c_country";
+$tabname[5] = MAIN_DB_PREFIX."c_civility";
+$tabname[6] = MAIN_DB_PREFIX."c_actioncomm";
+$tabname[7] = MAIN_DB_PREFIX."c_chargesociales";
+$tabname[8] = MAIN_DB_PREFIX."c_typent";
+$tabname[9] = MAIN_DB_PREFIX."c_currencies";
+$tabname[10] = MAIN_DB_PREFIX."c_tva";
+$tabname[11] = MAIN_DB_PREFIX."c_type_contact";
+$tabname[12] = MAIN_DB_PREFIX."c_payment_term";
+$tabname[13] = MAIN_DB_PREFIX."c_paiement";
+$tabname[14] = MAIN_DB_PREFIX."c_ecotaxe";
+$tabname[15] = MAIN_DB_PREFIX."c_paper_format";
+$tabname[16] = MAIN_DB_PREFIX."c_prospectlevel";
+$tabname[17] = MAIN_DB_PREFIX."c_type_fees";
+$tabname[18] = MAIN_DB_PREFIX."c_shipment_mode";
+$tabname[19] = MAIN_DB_PREFIX."c_effectif";
+$tabname[20] = MAIN_DB_PREFIX."c_input_method";
+$tabname[21] = MAIN_DB_PREFIX."c_availability";
+$tabname[22] = MAIN_DB_PREFIX."c_input_reason";
+$tabname[23] = MAIN_DB_PREFIX."c_revenuestamp";
+$tabname[24] = MAIN_DB_PREFIX."c_type_resource";
+$tabname[25] = MAIN_DB_PREFIX."c_type_container";
+$tabname[26] = MAIN_DB_PREFIX."c_units";
+$tabname[27] = MAIN_DB_PREFIX."c_stcomm";
+$tabname[28] = MAIN_DB_PREFIX."c_holiday_types";
+$tabname[29] = MAIN_DB_PREFIX."c_lead_status";
+$tabname[30] = MAIN_DB_PREFIX."c_format_cards";
 //$tabname[31]= MAIN_DB_PREFIX."accounting_system";
 //$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
-$tabname[33] = MAIN_DB_PREFIX . "c_hrm_department";
-$tabname[34] = MAIN_DB_PREFIX . "c_hrm_function";
-$tabname[35] = MAIN_DB_PREFIX . "c_exp_tax_cat";
-$tabname[36] = MAIN_DB_PREFIX . "c_exp_tax_range";
+$tabname[33] = MAIN_DB_PREFIX."c_hrm_department";
+$tabname[34] = MAIN_DB_PREFIX."c_hrm_function";
+$tabname[35] = MAIN_DB_PREFIX."c_exp_tax_cat";
+$tabname[36] = MAIN_DB_PREFIX."c_exp_tax_range";
 
 // Dictionary labels
 $tablib = array();
@@ -180,42 +180,42 @@ 
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM " . MAIN_DB_PREFIX . "c_forme_juridique as f, " . MAIN_DB_PREFIX . "c_country as c WHERE f.fk_pays=c.rowid";
-$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM " . MAIN_DB_PREFIX . "c_departements as d, " . MAIN_DB_PREFIX . "c_regions as r, " . MAIN_DB_PREFIX . "c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
-$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM " . MAIN_DB_PREFIX . "c_regions as r, " . MAIN_DB_PREFIX . "c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
-$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM " . MAIN_DB_PREFIX . "c_country AS c";
-$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM " . MAIN_DB_PREFIX . "c_civility AS c";
-$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM " . MAIN_DB_PREFIX . "c_actioncomm AS a";
-$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM " . MAIN_DB_PREFIX . "c_chargesociales AS a, " . MAIN_DB_PREFIX . "c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
-$tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM " . MAIN_DB_PREFIX . "c_typent as t LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON t.fk_country=c.rowid";
-$tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM " . MAIN_DB_PREFIX . "c_currencies AS c";
-$tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c WHERE t.fk_pays=c.rowid";
-$tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM " . MAIN_DB_PREFIX . "c_type_contact AS t";
-$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM " . MAIN_DB_PREFIX . "c_payment_term AS c WHERE c.entity = " . getEntity($tabname[12]);
-$tabsql[13] = "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM " . MAIN_DB_PREFIX . "c_paiement AS c WHERE c.entity = " . getEntity($tabname[13]);
-$tabsql[14] = "SELECT e.rowid as rowid, e.code as code, e.label, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM " . MAIN_DB_PREFIX . "c_ecotaxe AS e, " . MAIN_DB_PREFIX . "c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
-$tabsql[15] = "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM " . MAIN_DB_PREFIX . "c_paper_format";
-$tabsql[16] = "SELECT code, label as libelle, sortorder, active FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
-$tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FROM " . MAIN_DB_PREFIX . "c_type_fees";
-$tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM " . MAIN_DB_PREFIX . "c_shipment_mode";
-$tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_effectif";
-$tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_availability AS c";
-$tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_input_reason";
-$tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM " . MAIN_DB_PREFIX . "c_revenuestamp as t, " . MAIN_DB_PREFIX . "c_country as c WHERE t.fk_pays=c.rowid";
-$tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_type_resource";
-$tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM " . MAIN_DB_PREFIX . "c_type_container as t WHERE t.entity IN (" . getEntity('c_type_container') . ")";
-$tabsql[26] = "SELECT rowid   as rowid, code, label, short_label, active FROM " . MAIN_DB_PREFIX . "c_units";
-$tabsql[27] = "SELECT id      as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_stcomm";
-$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM " . MAIN_DB_PREFIX . "c_holiday_types as h LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON h.fk_country=c.rowid";
-$tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM " . MAIN_DB_PREFIX . "c_lead_status";
-$tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM " . MAIN_DB_PREFIX . "c_format_cards";
+$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid";
+$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
+$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
+$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM ".MAIN_DB_PREFIX."c_country AS c";
+$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
+$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
+$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
+$tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
+$tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
+$tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
+$tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
+$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = ".getEntity($tabname[12]);
+$tabsql[13] = "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = ".getEntity($tabname[13]);
+$tabsql[14] = "SELECT e.rowid as rowid, e.code as code, e.label, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
+$tabsql[15] = "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
+$tabsql[16] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+$tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FROM ".MAIN_DB_PREFIX."c_type_fees";
+$tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+$tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
+$tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
+$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
+$tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
+$tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
+$tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity IN (".getEntity('c_type_container').")";
+$tabsql[26] = "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
+$tabsql[27] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
+$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
+$tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
+$tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
 //$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s";
 //$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
-$tabsql[33] = "SELECT rowid, pos, code, label, active FROM " . MAIN_DB_PREFIX . "c_hrm_department";
-$tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM " . MAIN_DB_PREFIX . "c_hrm_function";
-$tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM " . MAIN_DB_PREFIX . "c_exp_tax_cat c";
-$tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM " . MAIN_DB_PREFIX . "c_exp_tax_range r";
+$tabsql[33] = "SELECT rowid, pos, code, label, active FROM ".MAIN_DB_PREFIX."c_hrm_department";
+$tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM ".MAIN_DB_PREFIX."c_hrm_function";
+$tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_cat c";
+$tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_range r";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -226,7 +226,7 @@ 
 $tabsqlsort[5] = "label ASC";
 $tabsqlsort[6] = "a.type ASC, a.module ASC, a.position ASC, a.code ASC";
 $tabsqlsort[7] = "country ASC, code ASC, a.libelle ASC";
-$tabsqlsort[8] = "country DESC," . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ' t.position ASC,' : '') . " libelle ASC";
+$tabsqlsort[8] = "country DESC,".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ' t.position ASC,' : '')." libelle ASC";
 $tabsqlsort[9] = "label ASC";
 $tabsqlsort[10] = "country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
 $tabsqlsort[11] = "t.element ASC, t.source ASC, t.position ASC, t.code ASC";
@@ -259,13 +259,13 @@ 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
 $tabfield[1] = "code,libelle,country";
-$tabfield[2] = "code,libelle,region_id,region,country";   // "code,libelle,region,country_code-country"
+$tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,region,country_code-country"
 $tabfield[3] = "code,libelle,country_id,country";
 $tabfield[4] = "code,label";
 $tabfield[5] = "code,label";
 $tabfield[6] = "code,libelle,type,color,position";
 $tabfield[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfield[8] = "code,libelle,country_id,country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfield[8] = "code,libelle,country_id,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfield[9] = "code,label,unicode";
 $tabfield[10] = "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11] = "element,source,code,libelle,position";
@@ -298,13 +298,13 @@ 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
 $tabfieldvalue[1] = "code,libelle,country";
-$tabfieldvalue[2] = "code,libelle,region";   // "code,libelle,region"
+$tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region"
 $tabfieldvalue[3] = "code,libelle,country";
 $tabfieldvalue[4] = "code,label";
 $tabfieldvalue[5] = "code,label";
 $tabfieldvalue[6] = "code,libelle,type,color,position";
 $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfieldvalue[8] = "code,libelle,country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfieldvalue[8] = "code,libelle,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11] = "element,source,code,libelle,position";
@@ -343,7 +343,7 @@ 
 $tabfieldinsert[5] = "code,label";
 $tabfieldinsert[6] = "code,libelle,type,color,position";
 $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
-$tabfieldinsert[8] = "code,libelle,fk_country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfieldinsert[8] = "code,libelle,fk_country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10] = "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11] = "element,source,code,libelle,position";
@@ -585,12 +585,12 @@ 
 if ($id == 10) {
     $localtax_typeList = array(
         "0" => $langs->trans("No"),
-        "1" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 1)", //$langs->trans("%ageOnAllWithoutVAT"),
-        "2" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 2)", //$langs->trans("%ageOnAllBeforeVAT"),
-        "3" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
-        "4" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
-        "5" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
-        "6" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 6)" //$langs->trans("%ageOnServiceBeforeVAT"),
+        "1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)", //$langs->trans("%ageOnAllWithoutVAT"),
+        "2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)", //$langs->trans("%ageOnAllBeforeVAT"),
+        "3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
+        "4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
+        "5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
+        "6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)" //$langs->trans("%ageOnServiceBeforeVAT"),
     );
 }
 
@@ -616,9 +616,9 @@ 
     $ok = 1;
     foreach ($listfield as $f => $value) {
         if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory')))
-            continue;  // For some pages, country is not mandatory
+            continue; // For some pages, country is not mandatory
         if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp')))
-            continue;  // For some pages, country is not mandatory
+            continue; // For some pages, country is not mandatory
         if ($value == 'localtax1' && empty($_POST['localtax1_type']))
             continue;
         if ($value == 'localtax2' && empty($_POST['localtax2_type']))
@@ -628,7 +628,7 @@ 
         if ($value == 'formula' && empty($_POST['formula']))
             continue;
         if ($value == 'sortorder')
-            continue;  // For a column name 'sortorder', we use the field name 'position'
+            continue; // For a column name 'sortorder', we use the field name 'position'
         if ((!isset($_POST[$value]) || $_POST[$value] == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
             && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
             )
@@ -671,7 +671,7 @@ 
         }
     }
     // Other checks
-    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
+    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
         $ok = 0;
         setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
     }
@@ -719,7 +719,7 @@ 
         if ($tabrowid[$id]) {
             // Recupere id libre pour insertion
             $newid = 0;
-            $sql = "SELECT max(" . $tabrowid[$id] . ") newid from " . $tabname[$id];
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
             $result = $db->query($sql);
             if ($result) {
                 $obj = $db->fetch_object($result);
@@ -730,17 +730,17 @@ 
         }
 
         // Add new entry
-        $sql = "INSERT INTO " . $tabname[$id] . " (";
+        $sql = "INSERT INTO ".$tabname[$id]." (";
         // List of fields
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $tabrowid[$id] . ",";
+            $sql .= $tabrowid[$id].",";
         $sql .= $tabfieldinsert[$id];
         $sql .= ",active)";
         $sql .= " VALUES(";
 
         // List of values
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $newid . ",";
+            $sql .= $newid.",";
         $i = 0;
         foreach ($listfieldinsert as $f => $value) {
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -751,11 +751,11 @@ 
             if ($i)
                 $sql .= ",";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
-                $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
+                $sql .= "'".(int) $db->escape($_POST['position'])."'";
             } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
+                $sql .= "null"; // For vat, we want/accept code = ''
             else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+                $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
             $i++;
         }
         $sql .= ",1)";
@@ -783,11 +783,11 @@ 
         }
 
         // Modify entry
-        $sql = "UPDATE " . $tabname[$id] . " SET ";
+        $sql = "UPDATE ".$tabname[$id]." SET ";
         // Modifie valeur des champs
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-            $sql .= $tabrowid[$id] . "=";
-            $sql .= "'" . $db->escape($rowid) . "', ";
+            $sql .= $tabrowid[$id]."=";
+            $sql .= "'".$db->escape($rowid)."', ";
         }
         $i = 0;
         foreach ($listfieldmodify as $field) {
@@ -798,18 +798,18 @@ 
             }
             if ($i)
                 $sql .= ",";
-            $sql .= $field . "=";
+            $sql .= $field."=";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
-                $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
+                $sql .= "'".(int) $db->escape($_POST['position'])."'";
             } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
+                $sql .= "null"; // For vat, we want/accept code = ''
             else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+                $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
             $i++;
         }
-        $sql .= " WHERE " . $rowidcol . " = '" . $rowid . "'";
+        $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
         if (in_array('entity', $listfieldmodify))
-            $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+            $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -832,7 +832,7 @@ 
         $rowidcol = "rowid";
     }
 
-    $sql = "DELETE FROM " . $tabname[$id] . " WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
     dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
@@ -854,9 +854,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 1 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 1 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -874,9 +874,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 0 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 0 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -894,9 +894,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 1 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 1 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -914,9 +914,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 0 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 0 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -938,9 +938,9 @@ 
 $titre = $langs->trans("DictionarySetup");
 $linkback = '';
 if ($id) {
-    $titre .= ' - ' . $langs->trans($tablib[$id]);
+    $titre .= ' - '.$langs->trans($tablib[$id]);
     // $linkback = '<a href="' . $_SERVER['PHP_SELF'] . '">' . $langs->trans("BackToDictionaryList") . '</a>';
-    $linkback = '<a href="' . BASE_URI . '?controller=admin&method=dict">' . $langs->trans("BackToDictionaryList") . '</a>';
+    $linkback = '<a href="'.BASE_URI.'?controller=admin&method=dict">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto = 'title_setup';
 if ($id == 10 && GETPOST('from') == 'accountancy') {
@@ -956,30 +956,30 @@ 
 
 if (empty($id)) {
     print $langs->trans("DictionaryDesc");
-    print " " . $langs->trans("OnlyActiveElementsAreShown") . "<br>\n";
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
     print '<br>';
 }
 
 
-$param = '&id=' . urlencode($id);
+$param = '&id='.urlencode($id);
 if ($search_country_id > 0)
-    $param .= '&search_country_id=' . urlencode($search_country_id);
+    $param .= '&search_country_id='.urlencode($search_country_id);
 if ($search_code != '')
-    $param .= '&search_code=' . urlencode($search_country_id);
+    $param .= '&search_code='.urlencode($search_country_id);
 if ($entity != '')
-    $param .= '&entity=' . (int) $entity;
+    $param .= '&entity='.(int) $entity;
 $paramwithsearch = $param;
 if ($sortorder)
-    $paramwithsearch .= '&sortorder=' . urlencode($sortorder);
+    $paramwithsearch .= '&sortorder='.urlencode($sortorder);
 if ($sortfield)
-    $paramwithsearch .= '&sortfield=' . urlencode($sortfield);
+    $paramwithsearch .= '&sortfield='.urlencode($sortfield);
 if (GETPOST('from'))
-    $paramwithsearch .= '&from=' . urlencode(GETPOST('from', 'alpha'));
+    $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
 
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete') {
-    print $form->formconfirm($_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'rowid=' . $rowid . '&code=' . urlencode($code) . $paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.$rowid.'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -993,7 +993,7 @@ 
     if (!preg_match('/ WHERE /', $sql))
         $sql .= " WHERE 1 = 1";
     if ($search_country_id > 0)
-        $sql .= " AND c.rowid = " . $search_country_id;
+        $sql .= " AND c.rowid = ".$search_country_id;
     if ($search_code != '' && $id != 9)
         $sql .= natural_search("code", $search_code);
     if ($search_code != '' && $id == 9)
@@ -1003,14 +1003,14 @@ 
         // If sort order is "country", we use country_code instead
         if ($sortfield == 'country')
             $sortfield = 'country_code';
-        $sql .= " ORDER BY " . $db->escape($sortfield);
+        $sql .= " ORDER BY ".$db->escape($sortfield);
         if ($sortorder) {
-            $sql .= " " . strtoupper($db->escape($sortorder));
+            $sql .= " ".strtoupper($db->escape($sortorder));
         }
         $sql .= ", ";
         // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?' . $sortfield . ' ' . $sortorder . ',/i', '', $tabsqlsort[$id]);
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?' . $sortfield . ',/i', '', $tabsqlsort[$id]);
+        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
     } else {
         $sql .= " ORDER BY ";
     }
@@ -1019,15 +1019,15 @@ 
     //print $sql;
 
     if (empty($tabfield[$id])) {
-        dol_print_error($db, 'The table with id ' . $id . ' has no array tabfield defined');
+        dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
         exit;
     }
     $fieldlist = explode(',', $tabfield[$id]);
 
     // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<form href="' . BASE_URI . '?controller=admin&method=dict&id=' . $id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-    print '<input type="hidden" name="from" value="' . dol_escape_htmltag(GETPOST('from', 'alpha')) . '">';
+    print '<form href="'.BASE_URI.'?controller=admin&method=dict&id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
     if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION)) {
         print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
@@ -1055,8 +1055,8 @@ 
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]);   // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow);   // try to translate
+            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+            $valuetoshow = $langs->trans($valuetoshow); // try to translate
             $class = '';
             if ($fieldlist[$field] == 'source') {
                 $valuetoshow = $langs->trans("Contact");
@@ -1065,28 +1065,28 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
+                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp")
                     $valuetoshow = $langs->trans("Rate");
                 else
                     $valuetoshow = $langs->trans("Amount");
                 $class = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 2";
+                $valuetoshow = $langs->trans("UseLocalTax")." 2";
                 $class = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax1') {
-                $valuetoshow = $langs->trans("Rate") . " 2";
+                $valuetoshow = $langs->trans("Rate")." 2";
                 $class = "center";
             }
             if ($fieldlist[$field] == 'localtax2_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 3";
+                $valuetoshow = $langs->trans("UseLocalTax")." 3";
                 $class = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2') {
-                $valuetoshow = $langs->trans("Rate") . " 3";
+                $valuetoshow = $langs->trans("Rate")." 3";
                 $class = "center";
             }
             if ($fieldlist[$field] == 'organization') {
@@ -1096,7 +1096,7 @@ 
                 $valuetoshow = $langs->trans("Language");
             }
             if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement")
+                if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement")
                     $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
                 else
                     $valuetoshow = $langs->trans("Type");
@@ -1241,15 +1241,15 @@ 
                     $showfield = 1;
                 }
                 if ($fieldlist[$field] == 'region') {
-                    $valuetoshow = $langs->trans("Country") . '/' . $langs->trans("Region");
+                    $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region");
                     $showfield = 1;
                 }
             }
 
             if ($valuetoshow != '') {
-                print '<td' . ($class ? ' class="' . $class . '"' : '') . '>';
+                print '<td'.($class ? ' class="'.$class.'"' : '').'>';
                 if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value]))
-                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
+                    print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
                 else if (!empty($tabhelp[$id][$value]))
                     print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
                 else
@@ -1263,9 +1263,9 @@ 
         if ($id == 4)
             print '<td></td>';
         print '<td>';
-        print '<input type="hidden" name="id" value="' . $id . '">';
+        print '<input type="hidden" name="id" value="'.$id.'">';
         if (!is_null($withentity))
-            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+            print '<input type="hidden" name="entity" value="'.$withentity.'">';
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1285,7 +1285,7 @@ 
 
         $tmpaction = 'create';
         $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
         $error = $hookmanager->error;
         $errors = $hookmanager->errors;
 
@@ -1300,7 +1300,7 @@ 
             print '<td></td>';
         print '<td colspan="3" align="center">';
         if ($action != 'edit') {
-            print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
+            print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
         }
         print '</td>';
         print "</tr>";
@@ -1318,9 +1318,9 @@ 
     print '<br>';
 
     // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<form href="' . BASE_URI . '?controller=admin&method=dict&id=' . $id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-    print '<input type="hidden" name="from" value="' . dol_escape_htmltag(GETPOST('from', 'alpha')) . '">';
+    print '<form href="'.BASE_URI.'?controller=admin&method=dict&id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
@@ -1331,7 +1331,7 @@ 
 
         // There is several pages
         if ($num > $listlimit || $page) {
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>');
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
             print '<div class="clearboth"></div>';
         }
 
@@ -1359,7 +1359,7 @@ 
                     $filterfound++;
                 } elseif ($value == 'code') {
                     print '<td class="liste_titre">';
-                    print '<input type="text" class="maxwidth100" name="search_code" value="' . dol_escape_htmltag($search_code) . '">';
+                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
                 } else {
@@ -1387,7 +1387,7 @@ 
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
-            $showfield = 1;          // By defaut
+            $showfield = 1; // By defaut
             $align = "left";
             $sortable = 1;
             $valuetoshow = '';
@@ -1398,8 +1398,8 @@ 
               $align=$tmp['align'];
               $sortable=$tmp['sortable'];
              */
-            $valuetoshow = ucfirst($fieldlist[$field]);   // By defaut
-            $valuetoshow = $langs->trans($valuetoshow);   // try to translate
+            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+            $valuetoshow = $langs->trans($valuetoshow); // try to translate
             if ($fieldlist[$field] == 'source') {
                 $valuetoshow = $langs->trans("Contact");
             }
@@ -1407,29 +1407,29 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
+                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp")
                     $valuetoshow = $langs->trans("Rate");
                 else
                     $valuetoshow = $langs->trans("Amount");
                 $align = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 2";
+                $valuetoshow = $langs->trans("UseLocalTax")." 2";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax1') {
-                $valuetoshow = $langs->trans("Rate") . " 2";
+                $valuetoshow = $langs->trans("Rate")." 2";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 3";
+                $valuetoshow = $langs->trans("UseLocalTax")." 3";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2') {
-                $valuetoshow = $langs->trans("Rate") . " 3";
+                $valuetoshow = $langs->trans("Rate")." 3";
                 $align = "center";
                 $sortable = 0;
             }
@@ -1579,14 +1579,14 @@ 
 
             // Affiche nom du champ
             if ($showfield) {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page=' . $page . '&' : ''), $param, "align=" . $align, $sortfield, $sortorder);
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
             }
         }
         // Favorite - Only activated on country dictionary
         if ($id == 4)
-            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 
-        print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
         print getTitleFieldOfList('');
         print getTitleFieldOfList('');
         print '</tr>';
@@ -1596,11 +1596,11 @@ 
             while ($i < $num) {
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr class="oddeven" id="rowid-' . $obj->rowid . '">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
                     $tmpaction = 'edit';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
                     $error = $hookmanager->error;
                     $errors = $hookmanager->errors;
 
@@ -1610,19 +1610,19 @@ 
                     }
 
                     print '<td colspan="3" align="center">';
-                    print '<div name="' . (!empty($obj->rowid) ? $obj->rowid : $obj->code) . '"></div>';
-                    print '<input type="hidden" name="page" value="' . $page . '">';
-                    print '<input type="hidden" name="rowid" value="' . $rowid . '">';
+                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     if (!is_null($withentity))
-                        print '<input type="hidden" name="entity" value="' . $withentity . '">';
-                    print '<input type="submit" class="button" name="actionmodify" value="' . $langs->trans("Modify") . '">';
-                    print '<input type="submit" class="button" name="actioncancel" value="' . $langs->trans("Cancel") . '">';
+                        print '<input type="hidden" name="entity" value="'.$withentity.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                 }
                 else {
                     $tmpaction = 'view';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
                     $error = $hookmanager->error;
                     $errors = $hookmanager->errors;
@@ -1651,8 +1651,8 @@ 
                                 if (empty($obj->country_code)) {
                                     $valuetoshow = '-';
                                 } else {
-                                    $key = $langs->trans("Country" . strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country" . strtoupper($obj->country_code) ? $obj->country_code . " - " . $key : $obj->country);
+                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
+                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
                             } else if ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
                                 $valuetoshow = yn($valuetoshow);
@@ -1673,58 +1673,58 @@ 
                                 $valuetoshow = yn($elementList[$valuetoshow]);
                             } else if ($fieldlist[$field] == 'libelle_facture') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentCondition" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentCondition" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                                $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                                 $valuetoshow = nl2br($valuetoshow);
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_country') {
-                                $key = $langs->trans("Country" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_availability') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                                $key = $langs->trans("Country".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->load("propal");
-                                $key = $langs->trans("AvailabilityType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_actioncomm') {
-                                $key = $langs->trans("Action" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_currencies') {
-                                $key = $langs->trans("Currency" . strtoupper($obj->code_iso));
-                                $valuetoshow = ($obj->code_iso && $key != "Currency" . strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_typent') {
+                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                                $key = $langs->trans("Action".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+                                $key = $langs->trans("Currency".strtoupper($obj->code_iso));
+                                $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_prospectlevel') {
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_civility') {
-                                $key = $langs->trans("Civility" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Civility" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_type_contact') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+                                $key = $langs->trans("Civility".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
                                 $langs->load('agenda');
-                                $key = $langs->trans("TypeContact_" . $obj->element . "_" . $obj->source . "_" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "TypeContact_" . $obj->element . "_" . $obj->source . "_" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_payment_term') {
+                                $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentConditionShort" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_paiement') {
+                                $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_input_reason') {
-                                $key = $langs->trans("DemandReasonType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "DemandReasonType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_input_method') {
+                                $key = $langs->trans("PaymentType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+                                $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
                                 $langs->load("orders");
                                 $key = $langs->trans($obj->code);
                                 $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_shipment_mode') {
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
                                 $langs->load("sendings");
-                                $key = $langs->trans("SendingMethod" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "SendingMethod" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_paper_format') {
-                                $key = $langs->trans('PaperFormat' . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != 'PaperFormat' . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_type_fees') {
+                                $key = $langs->trans("SendingMethod".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format') {
+                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') {
                                 $langs->load('trips');
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
@@ -1732,15 +1732,15 @@ 
                                 $showfield = 0;
                             } else if ($fieldlist[$field] == 'unicode') {
                                 $valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX . 'c_units') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
                                 $langs->load("products");
                                 $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX . 'c_units') {
+                            } else if ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
                                 $langs->load("products");
                                 $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX . 'c_paper_format')) {
-                                $key = $langs->trans('SizeUnit' . strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit' . strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+                            } else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) {
+                                $key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                             } else if ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'localtax1_type') {
@@ -1772,9 +1772,9 @@ 
                                     }
                                 }
                             } elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
-                                $valuetoshow = getDictvalue(MAIN_DB_PREFIX . 'c_exp_tax_cat', 'label', $valuetoshow);
+                                $valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
                                 $valuetoshow = $langs->trans($valuetoshow);
-                            } elseif ($tabname[$id] == MAIN_DB_PREFIX . 'c_exp_tax_cat') {
+                            } elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat') {
                                 $valuetoshow = $langs->trans($valuetoshow);
                             }
 
@@ -1793,7 +1793,7 @@ 
                                 $class .= ' nowrap';
                             // Show value for field
                             if ($showfield)
-                                print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                                print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }
                     }
 
@@ -1824,7 +1824,7 @@ 
                     $canbemodified = $iserasable;
                     if ($obj->code == 'RECEP')
                         $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm")
+                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm")
                         $canbemodified = 1;
 
                     // Url
@@ -1833,11 +1833,11 @@ 
                     if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27)))
                         $rowidcol = 'rowid';
                     //$url = $_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
-                    $url = BASE_URI . '?controller=admin&method=dict&' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
+                    $url = BASE_URI.'?controller=admin&method=dict&'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
                     if (!empty($param))
-                        $url .= '&' . $param;
+                        $url .= '&'.$param;
                     if (!is_null($withentity))
-                        $url .= '&entity=' . $withentity;
+                        $url .= '&entity='.$withentity;
                     $url .= '&';
 
                     // Favorite
@@ -1845,7 +1845,7 @@ 
                     if ($id == 4) {
                         print '<td align="center" class="nowrap">';
                         if ($iserasable)
-                            print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
+                            print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
                         else
                             print $langs->trans("AlwaysActive");
                         print '</td>';
@@ -1854,7 +1854,7 @@ 
                     // Active
                     print '<td align="center" class="nowrap">';
                     if ($canbedisabled)
-                        print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
+                        print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
                     else {
                         if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')))
                             print $langs->trans("AlwaysActive");
@@ -1869,7 +1869,7 @@ 
 
                     // Modify link
                     if ($canbemodified)
-                        print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
+                        print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
                     else
                         print '<td>&nbsp;</td>';
 
@@ -1877,7 +1877,7 @@ 
                     if ($iserasable) {
                         print '<td align="center">';
                         if ($user->admin)
-                            print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                            print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     } else
@@ -1909,8 +1909,8 @@ 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     //print '<td>'.$langs->trans("Module").'</td>';
-    print '<td colspan="2">' . $langs->trans("Dictionary") . '</td>';
-    print '<td>' . $langs->trans("Table") . '</td>';
+    print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
+    print '<td>'.$langs->trans("Table").'</td>';
     print '</tr>';
 
     $showemptyline = '';
@@ -1930,7 +1930,7 @@ 
             print '<tr class="oddeven"><td width="50%">';
             if (!empty($tabcond[$i])) {
                 // print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $i . '">' . $langs->trans($tablib[$i]) . '</a>';
-                print '<a href="' . BASE_URI . '?controller=admin&method=dict&id=' . $i . '">' . $langs->trans($tablib[$i]) . '</a>';
+                print '<a href="'.BASE_URI.'?controller=admin&method=dict&id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
             } else {
                 print $langs->trans($tablib[$i]);
             }
@@ -1941,7 +1941,7 @@ 
               print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
               } */
             print '</td>';
-            print '<td>' . $tabname[$i] . '</td></tr>';
+            print '<td>'.$tabname[$i].'</td></tr>';
             $lastlineisempty = false;
         } else {
             if (!$lastlineisempty) {
@@ -1990,10 +1990,10 @@ 
             continue;
         }
 
-        if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+        if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
             $hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '');
             print '<td>';
-            print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $hidden . '">';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
             print $langs->trans($hidden);
             print '</td>';
         } elseif ($fieldlist[$field] == 'country') {
@@ -2011,7 +2011,7 @@ 
             if (!in_array('country', $fieldlist)) { // If there is already a field country, we don't show country_id (avoid duplicate)
                 $country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
                 print '<td class="tdoverflowmax100">';
-                print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $country_id . '">';
+                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
                 print '</td>';
             }
         } elseif ($fieldlist[$field] == 'region') {
@@ -2021,7 +2021,7 @@ 
         } elseif ($fieldlist[$field] == 'region_id') {
             $region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
             print '<td>';
-            print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $region_id . '">';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'lang') {
             print '<td>';
@@ -2043,10 +2043,10 @@ 
             print '<td>';
             print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
             print '</td>';
-        } elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX . "c_actioncomm") {
+        } elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") {
             $type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
             print '<td>';
-            print $type . '<input type="hidden" name="type" value="' . $type . '">';
+            print $type.'<input type="hidden" name="type" value="'.$type.'">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
             if ($fieldlist[$field] == 'type_cdr')
@@ -2063,30 +2063,30 @@ 
             $align = "left";
             if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2')))
                 $align = "center"; // Fields aligned on right
-            print '<td align="' . $align . '">';
-            print '<input type="text" class="flat" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" size="3" name="' . $fieldlist[$field] . '">';
+            print '<td align="'.$align.'">';
+            print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
             print '</td>';
         }
         elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
             print '<td>';
             $transfound = 0;
             // Special case for labels
-            if ($tabname == MAIN_DB_PREFIX . 'c_payment_term') {
+            if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
                 $langs->load("bills");
-                $transkey = "PaymentCondition" . strtoupper($obj->code);
+                $transkey = "PaymentCondition".strtoupper($obj->code);
                 if ($langs->trans($transkey) != $transkey) {
                     $transfound = 1;
                     print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
                 }
             }
             if (!$transfound) {
-                print '<textarea cols="30" rows="' . ROWS_2 . '" class="flat" name="' . $fieldlist[$field] . '">' . (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '</textarea>';
+                print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'</textarea>';
             }
             print '</td>';
         } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-            print '<td><input type="text" class="flat minwidth75" value="' . price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '')) . '" name="' . $fieldlist[$field] . '"></td>';
+            print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '')).'" name="'.$fieldlist[$field].'"></td>';
         } elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
-            print '<td class="maxxxx"><input type="text" class="flat minwidth75" value="' . (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" name="' . $fieldlist[$field] . '"></td>';
+            print '<td class="maxxxx"><input type="text" class="flat minwidth75" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'"></td>';
         } elseif ($fieldlist[$field] == 'unit') {
             print '<td>';
             $units = array(
@@ -2108,10 +2108,10 @@ 
             if (!empty($conf->accounting->enabled)) {
                 $fieldname = $fieldlist[$field];
                 $accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
-                print $formaccounting->select_account($accountancy_account, '.' . $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+                print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
             } else {
                 $fieldname = $fieldlist[$field];
-                print '<input type="text" size="10" class="flat" value="' . (isset($obj->$fieldname) ? $obj->$fieldname : '') . '" name="' . $fieldlist[$field] . '">';
+                print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
             }
             print '</td>';
         } elseif ($fieldlist[$field] == 'fk_tva') {
@@ -2146,17 +2146,17 @@ 
                 $class = 'quatrevingtpercent';
             if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type')
                 $class = 'maxwidth50';
-            print '<td class="' . $classtd . '">';
+            print '<td class="'.$classtd.'">';
             $transfound = 0;
             if (in_array($fieldlist[$field], array('label', 'libelle'))) {
                 $transkey = '';
                 // Special case for labels
-                if ($tabname == MAIN_DB_PREFIX . 'c_civility') {
-                    $transkey = "Civility" . strtoupper($obj->code);
+                if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+                    $transkey = "Civility".strtoupper($obj->code);
                 }
-                if ($tabname == MAIN_DB_PREFIX . 'c_payment_term') {
+                if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
                     $langs->load("bills");
-                    $transkey = "PaymentCondition" . strtoupper($obj->code);
+                    $transkey = "PaymentCondition".strtoupper($obj->code);
                 }
                 if ($transkey && $langs->trans($transkey) != $transkey) {
                     $transfound = 1;
@@ -2164,7 +2164,7 @@ 
                 }
             }
             if (!$transfound) {
-                print '<input type="text" class="flat' . ($class ? ' ' . $class : '') . '" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" name="' . $fieldlist[$field] . '">';
+                print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'">';
             }
             print '</td>';
         }

Braces +333 added lines, -231 removed lines

@@ -568,8 +568,9 @@ 
         'fichinter' => $langs->trans('InterventionCard'),
         'contrat' => $langs->trans('Contract')
     );
-    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
-        $elementList["societe"] = $langs->trans('ThirdParty');
+    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
+            $elementList["societe"] = $langs->trans('ThirdParty');
+    }
 
     complete_elementList_with_modules($elementList);
 
@@ -615,20 +616,30 @@ 
     // Check that all fields are filled
     $ok = 1;
     foreach ($listfield as $f => $value) {
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'localtax1' && empty($_POST['localtax1_type']))
-            continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type']))
-            continue;
-        if ($value == 'color' && empty($_POST['color']))
-            continue;
-        if ($value == 'formula' && empty($_POST['formula']))
-            continue;
-        if ($value == 'sortorder')
-            continue;  // For a column name 'sortorder', we use the field name 'position'
+        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) {
+                    continue;
+        }
+        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) {
+                    continue;
+        }
+        if ($value == 'color' && empty($_POST['color'])) {
+                    continue;
+        }
+        if ($value == 'formula' && empty($_POST['formula'])) {
+                    continue;
+        }
+        if ($value == 'sortorder') {
+                    continue;
+        }
+        // For a column name 'sortorder', we use the field name 'position'
         if ((!isset($_POST[$value]) || $_POST[$value] == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
             && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
             )
@@ -636,36 +647,51 @@ 
             $ok = 0;
             $fieldnamekey = $listfield[$f];
             // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))
-                $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture')
-                $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')
-                $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage')
-                $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')
-                $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code')
-                $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note')
-                $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux')
-                $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type')
-                $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position')
-                $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode')
-                $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible')
-                $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder')
-                $fieldnamekey = 'SortOrder';
-            if ($fieldnamekey == 'category_type')
-                $fieldnamekey = 'Calculated';
-            if ($fieldnamekey == 'revenuestamp_type')
-                $fieldnamekey = 'TypeOfRevenueStamp';
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+                            $fieldnamekey = 'Label';
+            }
+            if ($fieldnamekey == 'libelle_facture') {
+                            $fieldnamekey = 'LabelOnDocuments';
+            }
+            if ($fieldnamekey == 'nbjour') {
+                            $fieldnamekey = 'NbOfDays';
+            }
+            if ($fieldnamekey == 'decalage') {
+                            $fieldnamekey = 'Offset';
+            }
+            if ($fieldnamekey == 'module') {
+                            $fieldnamekey = 'Module';
+            }
+            if ($fieldnamekey == 'code') {
+                            $fieldnamekey = 'Code';
+            }
+            if ($fieldnamekey == 'note') {
+                            $fieldnamekey = 'Note';
+            }
+            if ($fieldnamekey == 'taux') {
+                            $fieldnamekey = 'Rate';
+            }
+            if ($fieldnamekey == 'type') {
+                            $fieldnamekey = 'Type';
+            }
+            if ($fieldnamekey == 'position') {
+                            $fieldnamekey = 'Position';
+            }
+            if ($fieldnamekey == 'unicode') {
+                            $fieldnamekey = 'Unicode';
+            }
+            if ($fieldnamekey == 'deductible') {
+                            $fieldnamekey = 'Deductible';
+            }
+            if ($fieldnamekey == 'sortorder') {
+                            $fieldnamekey = 'SortOrder';
+            }
+            if ($fieldnamekey == 'category_type') {
+                            $fieldnamekey = 'Calculated';
+            }
+            if ($fieldnamekey == 'revenuestamp_type') {
+                            $fieldnamekey = 'TypeOfRevenueStamp';
+            }
 
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
         }
@@ -700,16 +726,26 @@ 
     }
 
     // Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"]))
-        $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"]))
-        $_POST["localtax2"] = '0'; // If empty, we force to 0
-    if ($_POST["accountancy_code"] <= 0)
-        $_POST["accountancy_code"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_sell"] <= 0)
-        $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_buy"] <= 0)
-        $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) {
+            $_POST["localtax1"] = '0';
+    }
+    // If empty, we force to 0
+    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) {
+            $_POST["localtax2"] = '0';
+    }
+    // If empty, we force to 0
+    if ($_POST["accountancy_code"] <= 0) {
+            $_POST["accountancy_code"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_sell"] <= 0) {
+            $_POST["accountancy_code_sell"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_buy"] <= 0) {
+            $_POST["accountancy_code_buy"] = '';
+    }
+    // If empty, we force to null
     if ($id == 10 && isset($_POST["code"])) {  // Spaces are not allowed into code
         $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
     }
@@ -732,15 +768,17 @@ 
         // Add new entry
         $sql = "INSERT INTO " . $tabname[$id] . " (";
         // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $tabrowid[$id] . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $tabrowid[$id] . ",";
+        }
         $sql .= $tabfieldinsert[$id];
         $sql .= ",active)";
         $sql .= " VALUES(";
 
         // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $newid . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $newid . ",";
+        }
         $i = 0;
         foreach ($listfieldinsert as $f => $value) {
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -748,14 +786,18 @@ 
             } else if ($value == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= ",1)";
@@ -796,20 +838,25 @@ 
             } else if ($field == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             $sql .= $field . "=";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= " WHERE " . $rowidcol . " = '" . $rowid . "'";
-        if (in_array('entity', $listfieldmodify))
-            $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        if (in_array('entity', $listfieldmodify)) {
+                    $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        }
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -962,19 +1009,25 @@ 
 
 
 $param = '&id=' . urlencode($id);
-if ($search_country_id > 0)
+if ($search_country_id > 0) {
     $param .= '&search_country_id=' . urlencode($search_country_id);
-if ($search_code != '')
+}
+if ($search_code != '') {
     $param .= '&search_code=' . urlencode($search_country_id);
-if ($entity != '')
+}
+if ($entity != '') {
     $param .= '&entity=' . (int) $entity;
+}
 $paramwithsearch = $param;
-if ($sortorder)
+if ($sortorder) {
     $paramwithsearch .= '&sortorder=' . urlencode($sortorder);
-if ($sortfield)
+}
+if ($sortfield) {
     $paramwithsearch .= '&sortfield=' . urlencode($sortfield);
-if (GETPOST('from'))
+}
+if (GETPOST('from')) {
     $paramwithsearch .= '&from=' . urlencode(GETPOST('from', 'alpha'));
+}
 
 
 // Confirmation de la suppression de la ligne
@@ -990,19 +1043,24 @@ 
     // Complete requete recherche valeurs avec critere de tri
     $sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql))
-        $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0)
-        $sql .= " AND c.rowid = " . $search_country_id;
-    if ($search_code != '' && $id != 9)
-        $sql .= natural_search("code", $search_code);
-    if ($search_code != '' && $id == 9)
-        $sql .= natural_search("code_iso", $search_code);
+    if (!preg_match('/ WHERE /', $sql)) {
+            $sql .= " WHERE 1 = 1";
+    }
+    if ($search_country_id > 0) {
+            $sql .= " AND c.rowid = " . $search_country_id;
+    }
+    if ($search_code != '' && $id != 9) {
+            $sql .= natural_search("code", $search_code);
+    }
+    if ($search_code != '' && $id == 9) {
+            $sql .= natural_search("code_iso", $search_code);
+    }
 
     if ($sortfield) {
         // If sort order is "country", we use country_code instead
-        if ($sortfield == 'country')
-            $sortfield = 'country_code';
+        if ($sortfield == 'country') {
+                    $sortfield = 'country_code';
+        }
         $sql .= " ORDER BY " . $db->escape($sortfield);
         if ($sortorder) {
             $sql .= " " . strtoupper($db->escape($sortorder));
@@ -1065,10 +1123,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $class = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1096,10 +1155,11 @@ 
                 $valuetoshow = $langs->trans("Language");
             }
             if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement")
-                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
-                else
-                    $valuetoshow = $langs->trans("Type");
+                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement") {
+                                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+                } else {
+                                    $valuetoshow = $langs->trans("Type");
+                }
             }
             if ($fieldlist[$field] == 'code') {
                 $valuetoshow = $langs->trans("Code");
@@ -1248,24 +1308,28 @@ 
 
             if ($valuetoshow != '') {
                 print '<td' . ($class ? ' class="' . $class . '"' : '') . '>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value]))
-                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
-                else if (!empty($tabhelp[$id][$value]))
-                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else
-                    print $valuetoshow;
+                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+                                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
+                } else if (!empty($tabhelp[$id][$value])) {
+                                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+                } else {
+                                    print $valuetoshow;
+                }
                 print '</td>';
             }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $alabelisused = 1;
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $alabelisused = 1;
+            }
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td>';
         print '<input type="hidden" name="id" value="' . $id . '">';
-        if (!is_null($withentity))
-            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        if (!is_null($withentity)) {
+                    print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        }
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1278,8 +1342,9 @@ 
         // If data was already input, we define them in obj to populate input fields.
         if (GETPOST('actionadd')) {
             foreach ($fieldlist as $key => $val) {
-                if (GETPOST($val) != '')
-                    $obj->$val = GETPOST($val);
+                if (GETPOST($val) != '') {
+                                    $obj->$val = GETPOST($val);
+                }
             }
         }
 
@@ -1289,15 +1354,18 @@ 
         $error = $hookmanager->error;
         $errors = $hookmanager->errors;
 
-        if ($id == 3)
-            unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+        if ($id == 3) {
+                    unset($fieldlist[2]);
+        }
+        // Remove field ??? if dictionary Regions
 
         if (empty($reshook)) {
             fieldList($fieldlist, $obj, $tabname[$id], 'add');
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td colspan="3" align="center">';
         if ($action != 'edit') {
             print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
@@ -1306,8 +1374,9 @@ 
         print "</tr>";
 
         $colspan = count($fieldlist) + 3;
-        if ($id == 4)
-            $colspan++;
+        if ($id == 4) {
+                    $colspan++;
+        }
 
         print '</table>';
         print '</div>';
@@ -1342,8 +1411,9 @@ 
         print '<tr class="liste_titre_filter">';
         $filterfound = 0;
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             $showfield = 1; // By default
 
@@ -1368,8 +1438,9 @@ 
                 }
             }
         }
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre" colspan="2" align="right">';
         if ($filterfound) {
@@ -1382,8 +1453,9 @@ 
         // Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
@@ -1407,10 +1479,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $align = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1583,8 +1656,9 @@ 
             }
         }
         // Favorite - Only activated on country dictionary
-        if ($id == 4)
-            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        if ($id == 4) {
+                    print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        }
 
         print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
         print getTitleFieldOfList('');
@@ -1613,13 +1687,13 @@ 
                     print '<div name="' . (!empty($obj->rowid) ? $obj->rowid : $obj->code) . '"></div>';
                     print '<input type="hidden" name="page" value="' . $page . '">';
                     print '<input type="hidden" name="rowid" value="' . $rowid . '">';
-                    if (!is_null($withentity))
-                        print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    if (!is_null($withentity)) {
+                                            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    }
                     print '<input type="submit" class="button" name="actionmodify" value="' . $langs->trans("Modify") . '">';
                     print '<input type="submit" class="button" name="actioncancel" value="' . $langs->trans("Cancel") . '">';
                     print '</td>';
-                }
-                else {
+                } else {
                     $tmpaction = 'view';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -1658,15 +1732,15 @@ 
                                 $valuetoshow = yn($valuetoshow);
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'type_cdr') {
-                                if (empty($valuetoshow))
-                                    $valuetoshow = $langs->trans('None');
-                                elseif ($valuetoshow == 1)
-                                    $valuetoshow = $langs->trans('AtEndOfMonth');
-                                elseif ($valuetoshow == 2)
-                                    $valuetoshow = $langs->trans('CurrentNext');
+                                if (empty($valuetoshow)) {
+                                                                    $valuetoshow = $langs->trans('None');
+                                } elseif ($valuetoshow == 1) {
+                                                                    $valuetoshow = $langs->trans('AtEndOfMonth');
+                                } elseif ($valuetoshow == 2) {
+                                                                    $valuetoshow = $langs->trans('CurrentNext');
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+                            } else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
                                 $valuetoshow = price($valuetoshow);
                             }
                             if ($value == 'private') {
@@ -1744,20 +1818,20 @@ 
                             } else if ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                                if ($obj->localtax1 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'localtax2_type') {
-                                if ($obj->localtax2 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                            } else if ($fieldlist[$field] == 'localtax2_type') {
+                                if ($obj->localtax2 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'taux') {
+                            } else if ($fieldlist[$field] == 'taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
                                 $align = "center";
                             } else if (in_array($fieldlist[$field], array('recuperableonly'))) {
@@ -1779,21 +1853,28 @@ 
                             }
 
                             $class = 'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10)
-                                $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking')
-                                $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'code')
-                                $class .= ' width100';
-                            if ($fieldlist[$field] == 'position')
-                                $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type')
-                                $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type')
-                                $class .= ' nowrap';
+                            if ($fieldlist[$field] == 'note' && $id == 10) {
+                                                            $class .= ' tdoverflowmax200';
+                            }
+                            if ($fieldlist[$field] == 'tracking') {
+                                                            $class .= ' tdoverflowauto';
+                            }
+                            if ($fieldlist[$field] == 'code') {
+                                                            $class .= ' width100';
+                            }
+                            if ($fieldlist[$field] == 'position') {
+                                                            $class .= ' right';
+                            }
+                            if ($fieldlist[$field] == 'localtax1_type') {
+                                                            $class .= ' nowrap';
+                            }
+                            if ($fieldlist[$field] == 'localtax2_type') {
+                                                            $class .= ' nowrap';
+                            }
                             // Show value for field
-                            if ($showfield)
-                                print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            if ($showfield) {
+                                                            print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            }
                         }
                     }
 
@@ -1822,66 +1903,76 @@ 
                         $canbedisabled = 0;
                     }
                     $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP')
-                        $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm")
-                        $canbemodified = 1;
+                    if ($obj->code == 'RECEP') {
+                                            $canbemodified = 1;
+                    }
+                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm") {
+                                            $canbemodified = 1;
+                    }
 
                     // Url
                     $rowidcol = $tabrowid[$id];
                     // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27)))
-                        $rowidcol = 'rowid';
+                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27))) {
+                                            $rowidcol = 'rowid';
+                    }
                     //$url = $_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
                     $url = BASE_URI . '?controller=admin&method=dict&' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
-                    if (!empty($param))
-                        $url .= '&' . $param;
-                    if (!is_null($withentity))
-                        $url .= '&entity=' . $withentity;
+                    if (!empty($param)) {
+                                            $url .= '&' . $param;
+                    }
+                    if (!is_null($withentity)) {
+                                            $url .= '&entity=' . $withentity;
+                    }
                     $url .= '&';
 
                     // Favorite
                     // Only activated on country dictionary
                     if ($id == 4) {
                         print '<td align="center" class="nowrap">';
-                        if ($iserasable)
-                            print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
-                        else
-                            print $langs->trans("AlwaysActive");
+                        if ($iserasable) {
+                                                    print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                         print '</td>';
                     }
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    if ($canbedisabled)
-                        print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
-                    else {
-                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')))
-                            print $langs->trans("AlwaysActive");
-                        else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active))
-                            print $langs->trans("Deprecated");
-                        else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH')
-                            print $langs->trans("UsedOnlyWithTypeOption");
-                        else
-                            print $langs->trans("AlwaysActive");
+                    if ($canbedisabled) {
+                                            print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
+                    } else {
+                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) {
+                                                    print $langs->trans("AlwaysActive");
+                        } else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) {
+                                                    print $langs->trans("Deprecated");
+                        } else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') {
+                                                    print $langs->trans("UsedOnlyWithTypeOption");
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                     }
                     print "</td>";
 
                     // Modify link
-                    if ($canbemodified)
-                        print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
-                    else
-                        print '<td>&nbsp;</td>';
+                    if ($canbemodified) {
+                                            print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     // Delete link
                     if ($iserasable) {
                         print '<td align="center">';
-                        if ($user->admin)
-                            print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        if ($user->admin) {
+                                                    print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        }
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    } else
-                        print '<td>&nbsp;</td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     print "</tr>\n";
                 }
@@ -1891,8 +1982,7 @@ 
 
         print '</table>';
         print '</div>';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -1915,8 +2005,9 @@ 
 
     $showemptyline = '';
     foreach ($taborder as $i) {
-        if (isset($tabname[$i]) && empty($tabcond[$i]))
-            continue;
+        if (isset($tabname[$i]) && empty($tabcond[$i])) {
+                    continue;
+        }
 
         if ($i) {
             if ($showemptyline) {
@@ -1979,8 +2070,9 @@ 
 
     $formadmin = new FormAdmin($db);
     $formcompany = new FormCompany($db);
-    if (!empty($conf->accounting->enabled))
-        $formaccounting = new FormAccounting($db);
+    if (!empty($conf->accounting->enabled)) {
+            $formaccounting = new FormAccounting($db);
+    }
 
     $withentity = '';
 
@@ -2049,10 +2141,11 @@ 
             print $type . '<input type="hidden" name="type" value="' . $type . '">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-            if ($fieldlist[$field] == 'type_cdr')
-                print '<td align="center">';
-            else
-                print '<td>';
+            if ($fieldlist[$field] == 'type_cdr') {
+                            print '<td align="center">';
+            } else {
+                            print '<td>';
+            }
             if ($fieldlist[$field] == 'type_cdr') {
                 print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
             } else {
@@ -2061,13 +2154,14 @@ 
             print '</td>';
         } elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
             $align = "left";
-            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2')))
-                $align = "center"; // Fields aligned on right
+            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) {
+                            $align = "center";
+            }
+            // Fields aligned on right
             print '<td align="' . $align . '">';
             print '<input type="text" class="flat" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" size="3" name="' . $fieldlist[$field] . '">';
             print '</td>';
-        }
-        elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+        } elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
             print '<td>';
             $transfound = 0;
             // Special case for labels
@@ -2127,25 +2221,33 @@ 
             print $form->selectExpenseRanges($obj->fk_range);
             print '</td>';
         } else {
-            if ($fieldlist[$field] == 'sortorder')
-                $fieldlist[$field] = 'position';
+            if ($fieldlist[$field] == 'sortorder') {
+                            $fieldlist[$field] = 'position';
+            }
 
             $classtd = '';
             $class = '';
-            if ($fieldlist[$field] == 'code')
-                $classtd = 'width100';
-            if ($fieldlist[$field] == 'affect')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'delay')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'position')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'tracking')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type')
-                $class = 'maxwidth50';
+            if ($fieldlist[$field] == 'code') {
+                            $classtd = 'width100';
+            }
+            if ($fieldlist[$field] == 'affect') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'delay') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'position') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'tracking') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+                            $class = 'maxwidth50';
+            }
             print '<td class="' . $classtd . '">';
             $transfound = 0;
             if (in_array($fieldlist[$field], array('label', 'libelle'))) {

dolibarr/htdocs/core/lib/parsemd.lib.php

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
  * @param   string    $replaceimagepath     Replace path to image with another path. Exemple: ('doc/'=>'xxx/aaa/')

  * @return	string                          Parsed content

  */

-function dolMd2Html($content, $parser='parsedown',$replaceimagepath=null)

+function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)

 {

     if (is_array($replaceimagepath))

     {

-        foreach($replaceimagepath as $key => $val)

+        foreach ($replaceimagepath as $key => $val)

         {

             $keytoreplace = ']('.$key;

             $valafter = ']('.$val;

-            $content = preg_replace('/'.preg_quote($keytoreplace,'/').'/m', $valafter, $content);

+            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);

         }

     }

     if ($parser == 'parsedown')

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
         // include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';

         $Parsedown = new Parsedown();

         $content = $Parsedown->text($content);

-    }

-    else

+    } else

     {

         $content = nl2br($content);

     }

Helpers/Request.php

Spacing +27 added lines, -27 removed lines

@@ -25,17 +25,17 @@ 
 {
 
     // Filters
-    const NO_CHECK = 0;             // 'none'=no check (only for param that should have very rich content)
-    const NUMERIC = 1;              // 'int'=check it's numeric (integer or float)
-    const NUMBER_COMMA = 2;         // 'intcomma'=check it's integer+comma ('1,2,3,4...')
-    const ALPHA = 3;                // 'alpha'=check it's text and sign
-    const LETTERS_ONLY = 4;         // 'aZ'=check it's a-z only
-    const LETTERS_AND_NUMBERS = 5;  // 'aZ09'=check it's simple alpha string (recommended for keys)
-    const AN_ARRAY = 6;             // 'array'=check it's array
-    const SANITIZE = 7;             // 'san_alpha' = Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
-    const NO_HTML = 8;              // 'nohtml', 'alphanohtml' = check there is no html content
-    const ALPHA_NO_HTML = 9;              // 'nohtml', 'alphanohtml' = check there is no html content
-    const CUSTOM = 10;               // 'custom' = custom filter specify $filter and $options)
+    const NO_CHECK = 0; // 'none'=no check (only for param that should have very rich content)
+    const NUMERIC = 1; // 'int'=check it's numeric (integer or float)
+    const NUMBER_COMMA = 2; // 'intcomma'=check it's integer+comma ('1,2,3,4...')
+    const ALPHA = 3; // 'alpha'=check it's text and sign
+    const LETTERS_ONLY = 4; // 'aZ'=check it's a-z only
+    const LETTERS_AND_NUMBERS = 5; // 'aZ09'=check it's simple alpha string (recommended for keys)
+    const AN_ARRAY = 6; // 'array'=check it's array
+    const SANITIZE = 7; // 'san_alpha' = Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
+    const NO_HTML = 8; // 'nohtml', 'alphanohtml' = check there is no html content
+    const ALPHA_NO_HTML = 9; // 'nohtml', 'alphanohtml' = check there is no html content
+    const CUSTOM = 10; // 'custom' = custom filter specify $filter and $options)
 
     public static function get(string $variable, array $methods = [INPUT_GET, INPUT_POST], int $filter = self::NO_CHECK): string
     {
@@ -177,7 +177,7 @@ 
         if (empty($paramname))
             return 'BadFirstParameterForGETPOST';
         if (empty($check)) {
-            dol_syslog("Deprecated use of GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);
+            dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 // Enable this line to know who call the GETPOST with '' $check parameter.
 //var_dump(debug_backtrace()[0]);
         }
@@ -199,7 +199,7 @@ 
             $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
             if (constant('DOL_URL_ROOT'))
-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+                $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 //var_dump($relativepathstring);
@@ -207,8 +207,8 @@ 
 // Code for search criteria persistence.
 // Retrieve values if restore_lastsearch_values
             if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST
-                if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values
-                    $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);
+                if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values
+                    $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
                     if (is_array($tmp)) {
                         foreach ($tmp as $key => $val) {
                             if ($key == $paramname) { // We are on the requested parameter
@@ -219,12 +219,12 @@ 
                     }
                 }
 // If there is saved contextpage, page or limit
-                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {
-                    $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];
-                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {
-                    $out = $_SESSION['lastsearch_page_' . $relativepathstring];
-                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {
-                    $out = $_SESSION['lastsearch_limit_' . $relativepathstring];
+                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {
+                    $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
+                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
+                    $out = $_SESSION['lastsearch_page_'.$relativepathstring];
+                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
+                    $out = $_SESSION['lastsearch_limit_'.$relativepathstring];
                 }
             }
 // Else, retreive default values if we are not doing a sort
@@ -292,7 +292,7 @@ 
                                             $qualified = 1;
 
                                         if ($qualified) {
-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,
+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {
                                                 if ($out)
                                                     $out .= ', ';
@@ -328,11 +328,11 @@ 
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
 // We made a search from quick search menu, do we still use default filter ?
                                             if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {
-                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,
+                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
                                                 $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
                                             }
                                         } else {
-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,
+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
                                         }
                                         break;
@@ -350,7 +350,7 @@ 
 // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
         if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {
             $maxloop = 20;
-            $loopnb = 0;    // Protection against infinite loop
+            $loopnb = 0; // Protection against infinite loop
             while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
                 $loopnb++;
                 $newout = '';
@@ -395,9 +395,9 @@ 
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
                     $newout = $conf->entity;
                 } else
-                    $newout = '';     // Key not found, we replace with empty string
+                    $newout = ''; // Key not found, we replace with empty string
 //var_dump('__'.$reg[1].'__ -> '.$newout);
-                $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);
+                $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
             }
         }
 

Braces +90 added lines, -65 removed lines

@@ -79,15 +79,17 @@ 
             case self::LETTERS_ONLY:// 'aZ'=check it's a-z only
                 if (!is_array($result)) {
                     $out = trim($result);
-                    if (preg_match('/[^a-z]+/i', $result))
-                        $result = '';
+                    if (preg_match('/[^a-z]+/i', $result)) {
+                                            $result = '';
+                    }
                 }
                 break;
             case self::LETTERS_AND_NUMBERS:// 'aZ09'=check it's simple alpha string (recommended for keys)
                 if (!is_array($result)) {
                     $result = trim($result);
-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $result))
-                        $result = '';
+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $result)) {
+                                            $result = '';
+                    }
                 }
                 break;
             case self::AN_ARRAY :// 'array'=check it's array
@@ -174,32 +176,35 @@ 
 
         Debug::addMessage('Deprecated', 'Using GETPOST of functions.lib.php instead of Request library');
 
-        if (empty($paramname))
-            return 'BadFirstParameterForGETPOST';
+        if (empty($paramname)) {
+                    return 'BadFirstParameterForGETPOST';
+        }
         if (empty($check)) {
             dol_syslog("Deprecated use of GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);
 // Enable this line to know who call the GETPOST with '' $check parameter.
 //var_dump(debug_backtrace()[0]);
         }
 
-        if (empty($method))
-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
-        elseif ($method == 1)
-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
-        elseif ($method == 2)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
-        elseif ($method == 3)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
-        elseif ($method == 4)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
-        else
-            return 'BadThirdParameterForGETPOST';
+        if (empty($method)) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+        } elseif ($method == 1) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+        } elseif ($method == 2) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+        } elseif ($method == 3) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+        } elseif ($method == 4) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+        } else {
+                    return 'BadThirdParameterForGETPOST';
+        }
 
         if (empty($method) || $method == 3 || $method == 4) {
             $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
-            if (constant('DOL_URL_ROOT'))
-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+            if (constant('DOL_URL_ROOT')) {
+                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+            }
             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 //var_dump($relativepathstring);
@@ -248,14 +253,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                         $foundintru = 0;
                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                $foundintru = 1;
+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
+                                        }
+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
                                         }
-                                        if (!$foundintru)
-                                            $qualified = 1;
-//var_dump($defkey.'-'.$qualified);
-                                    } else
-                                        $qualified = 1;
+                                        //var_dump($defkey.'-'.$qualified);
+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 
                                     if ($qualified) {
 //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
@@ -282,20 +290,24 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                             $foundintru = 0;
                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                    $foundintru = 1;
+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }
-                                            if (!$foundintru)
-                                                $qualified = 1;
-//var_dump($defkey.'-'.$qualified);
-                                        } else
-                                            $qualified = 1;
+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
+                                            //var_dump($defkey.'-'.$qualified);
+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 
                                         if ($qualified) {
                                             $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,
                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {
-                                                if ($out)
-                                                    $out .= ', ';
+                                                if ($out) {
+                                                                                                    $out .= ', ';
+                                                }
                                                 if ($paramname == 'sortfield') {
                                                     $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);
                                                 }
@@ -315,14 +327,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                         $foundintru = 0;
                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                $foundintru = 1;
+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }
-                                        if (!$foundintru)
-                                            $qualified = 1;
-//var_dump($defkey.'-'.$qualified);
-                                    } else
-                                        $qualified = 1;
+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
+                                        //var_dump($defkey.'-'.$qualified);
+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 
                                     if ($qualified) {
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
@@ -394,8 +409,10 @@ 
                     $newout = $user->fk_user;
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
                     $newout = $conf->entity;
-                } else
-                    $newout = '';     // Key not found, we replace with empty string
+                } else {
+                                    $newout = '';
+                }
+                // Key not found, we replace with empty string
 //var_dump('__'.$reg[1].'__ -> '.$newout);
                 $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);
             }
@@ -412,18 +429,20 @@ 
                 }
                 break;
             case 'intcomma':
-                if (preg_match('/[^0-9,-]+/i', $out))
-                    $out = '';
+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;
             case 'alpha':
                 if (!is_array($out)) {
                     $out = trim($out);
 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 // '../' is dangerous because it allows dir transversals
-                    if (preg_match('/"/', $out))
-                        $out = '';
-                    else if (preg_match('/\.\.\//', $out))
-                        $out = '';
+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'san_alpha':
@@ -432,27 +451,31 @@ 
             case 'aZ':
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'aZ09':
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'array':
-                if (!is_array($out) || empty($out))
-                    $out = array();
+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;
             case 'nohtml':  // Recommended for most scalar parameters
                 $out = dol_string_nohtmltag($out, 0);
@@ -462,16 +485,18 @@ 
                     $out = trim($out);
 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 // '../' is dangerous because it allows dir transversals
-                    if (preg_match('/"/', $out))
-                        $out = '';
-                    else if (preg_match('/\.\.\//', $out))
-                        $out = '';
+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);
                 }
                 break;
             case 'custom':
-                if (empty($filter))
-                    return 'BadFourthParameterForGETPOST';
+                if (empty($filter)) {
+                                    return 'BadFourthParameterForGETPOST';
+                }
                 $out = filter_var($out, $filter, $options);
                 break;
         }