alxarafe / alixar

dolibarr/htdocs/comm/action/list.php

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

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

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

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

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;
         }