alxarafe / alixar

dolibarr/htdocs/comm/action/index.php

Braces +319 added lines, -220 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))
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
     $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
-if (empty($conf->global->AGENDA_EXT_NB))
+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)
+if (!$sortorder) {
     $sortorder = "ASC";
-if (!$sortfield)
+}
+if (!$sortfield) {
     $sortfield = "a.datec";
+}
 
 // Security check
 $socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
-if ($user->societe_id)
+if ($user->societe_id) {
     $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0)
+if ($socid < 0) {
     $socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read)
+if (!$user->rights->agenda->myactions->read) {
     accessforbidden();
-if (!$user->rights->agenda->allactions->read)
+}
+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))
+if ($actioncode == '' && empty($actioncodearray)) {
     $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 
-if ($status == '' && !GETPOSTISSET('search_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'))
+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')
+if ($status == 'done') {
     $title = $langs->trans("DoneActions");
-if ($status == 'todo')
+}
+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)
+        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']))
+}
+if ($status || isset($_GET['status']) || isset($_POST['status'])) {
     $param .= "&search_status=" . urlencode($status);
-if ($filter)
+}
+if ($filter) {
     $param .= "&search_filter=" . urlencode($filter);
-if ($filtert)
+}
+if ($filtert) {
     $param .= "&search_filtert=" . urlencode($filtert);
-if ($usergroup)
+}
+if ($usergroup) {
     $param .= "&search_usergroup=" . urlencode($usergroup);
-if ($socid)
+}
+if ($socid) {
     $param .= "&search_socid=" . urlencode($socid);
-if ($showbirthday)
+}
+if ($showbirthday) {
     $param .= "&search_showbirthday=1";
-if ($pid)
+}
+if ($pid) {
     $param .= "&search_projectid=" . urlencode($pid);
-if ($type)
+}
+if ($type) {
     $param .= "&search_type=" . urlencode($type);
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month')
+}
+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')
+if ($action == 'show_month') {
     $tabactive = 'cardmonth';
-if ($action == 'show_week')
+}
+if ($action == 'show_week') {
     $tabactive = 'cardweek';
-if ($action == 'show_day')
+}
+if ($action == 'show_day') {
     $tabactive = 'cardday';
-if ($action == 'show_list')
+}
+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 != '')
+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)
+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)
+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)
+if ($resourceid > 0) {
     $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
+if ($filtert > 0 || $usergroup > 0) {
     $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
-if ($usergroup > 0)
+}
+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)
+if ($resourceid > 0) {
     $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);
-if ($pid)
+}
+if ($pid) {
     $sql .= " AND a.fk_project=" . $db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid)
+}
+if (!$user->rights->societe->client->voir && !$socid) {
     $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
-if ($socid > 0)
+}
+if ($socid > 0) {
     $sql .= ' AND a.fk_soc = ' . $socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
+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)
+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))
+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="' . BASE_URI . '?controller=comm/action&method=index&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/comm/action/list.php

Braces +243 added lines, -158 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)
+if ($user->societe_id) {
     $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0)
+if ($socid < 0) {
     $socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read)
+if (!$user->rights->agenda->myactions->read) {
     accessforbidden();
-if (!$user->rights->agenda->allactions->read)
+}
+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)
+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"])
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
     $param .= '&contextpage=' . urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit)
+}
+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)
+        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)
+}
+if ($status != '' && $status > -1) {
     $param .= "&search_status=" . urlencode($status);
-if ($filter)
+}
+if ($filter) {
     $param .= "&search_filter=" . urlencode($filter);
-if ($filtert)
+}
+if ($filtert) {
     $param .= "&search_filtert=" . urlencode($filtert);
-if ($socid)
+}
+if ($socid) {
     $param .= "&search_socid=" . urlencode($socid);
-if ($showbirthday)
+}
+if ($showbirthday) {
     $param .= "&search_showbirthday=1";
-if ($pid)
+}
+if ($pid) {
     $param .= "&search_projectid=" . urlencode($pid);
-if ($type)
+}
+if ($type) {
     $param .= "&search_type=" . urlencode($type);
-if ($usergroup)
+}
+if ($usergroup) {
     $param .= "&search_usergroup=" . urlencode($usergroup);
-if ($search_id != '')
+}
+if ($search_id != '') {
     $param .= '&search_title=' . urlencode($search_id);
-if ($search_title != '')
+}
+if ($search_title != '') {
     $param .= '&search_title=' . urlencode($search_title);
-if (GETPOST('datestartday', 'int'))
+}
+if (GETPOST('datestartday', 'int')) {
     $param .= '&datestartday=' . GETPOST('datestartday', 'int');
-if (GETPOST('datestartmonth', 'int'))
+}
+if (GETPOST('datestartmonth', 'int')) {
     $param .= '&datestartmonth=' . GETPOST('datestartmonth', 'int');
-if (GETPOST('datestartyear', 'int'))
+}
+if (GETPOST('datestartyear', 'int')) {
     $param .= '&datestartyear=' . GETPOST('datestartyear', 'int');
-if (GETPOST('dateendday', 'int'))
+}
+if (GETPOST('dateendday', 'int')) {
     $param .= '&dateendday=' . GETPOST('dateendday', 'int');
-if (GETPOST('dateendmonth', 'int'))
+}
+if (GETPOST('dateendmonth', 'int')) {
     $param .= '&dateendmonth=' . GETPOST('dateendmonth', 'int');
-if (GETPOST('dateendyear', 'int'))
+}
+if (GETPOST('dateendyear', 'int')) {
     $param .= '&dateendyear=' . GETPOST('dateendyear', 'int');
-if ($optioncss != '')
+}
+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)
+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)
+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)
+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)
+if ($resourceid > 0) {
     $sql .= ", " . MAIN_DB_PREFIX . "element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
+if ($filtert > 0 || $usergroup > 0) {
     $sql .= ", " . MAIN_DB_PREFIX . "actioncomm_resources as ar";
-if ($usergroup > 0)
+}
+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)
+if ($resourceid > 0) {
     $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . $db->escape($resourceid);
-if ($pid)
+}
+if ($pid) {
     $sql .= " AND a.fk_project=" . $db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid)
+}
+if (!$user->rights->societe->client->voir && !$socid) {
     $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = " . $user->id . ")";
-if ($socid > 0)
+}
+if ($socid > 0) {
     $sql .= " AND s.rowid = " . $socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
+if ($filtert > 0 || $usergroup > 0) {
     $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-if ($type)
+}
+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)
+if ($search_id) {
     $sql .= natural_search("a.id", $search_id, 1);
-if ($search_title)
+}
+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)
+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)
+}
+if ($datestart > 0) {
     $sql .= " AND a.datep BETWEEN '" . $db->idate($datestart) . "' AND '" . $db->idate($datestart + 3600 * 24 - 1) . "'";
-if ($dateend > 0)
+}
+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/core/lib/functions.lib.php

Braces +1455 added lines, -1043 removed lines

@@ -79,8 +79,9 @@ 
       if ($found) return $result;
       } */
 
-    if (isset($class::$member))
-        return $class::$member;
+    if (isset($class::$member)) {
+            return $class::$member;
+    }
     dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');
     return null;
 }
@@ -131,8 +132,9 @@ 
     } else {
         $out = '';
         $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-        if (in_array($element, $addzero))
-            $out .= '0,';
+        if (in_array($element, $addzero)) {
+                    $out .= '0,';
+        }
         $out .= $conf->entity;
         return $out;
     }
@@ -313,32 +315,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);
@@ -387,14 +392,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;
+                                } else {
+                                                                    $qualified = 1;
+                                }
 
                                 if ($qualified) {
                                     //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
@@ -421,20 +429,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;
                                         }
-                                        if (!$foundintru)
-                                            $qualified = 1;
                                         //var_dump($defkey.'-'.$qualified);
-                                    } else
-                                        $qualified = 1;
+                                    } 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);
                                             }
@@ -454,14 +466,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;
+                                } else {
+                                                                    $qualified = 1;
+                                }
 
                                 if ($qualified) {
                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
@@ -533,8 +548,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
 
 
 
@@ -575,18 +592,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':
@@ -595,27 +614,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);
@@ -625,16 +648,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;
     }
@@ -674,10 +699,11 @@ 
         // If prefix is for email
         if ($mode == 'email') {
             if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) { // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
-                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME')
-                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-                else if (isset($_SERVER["SERVER_NAME"]))
-                    return $_SERVER["SERVER_NAME"];
+                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+                                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+                } else if (isset($_SERVER["SERVER_NAME"])) {
+                                    return $_SERVER["SERVER_NAME"];
+                }
             }
             return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);
         }
@@ -750,22 +776,27 @@ 
             }
         }
         if ($returnemptyifnotfound) {        // Not found into alternate dir
-            if ($returnemptyifnotfound == 1 || !file_exists($res))
-                return '';
+            if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                            return '';
+            }
         }
-    }
-    else {    // For an url path
+    } else {    // For an url path
         // We try to get local path of file on filesystem from url
         // Note that trying to know if a file on disk exist by forging path on disk from url
         // works only for some web server and some setup. This is bugged when
         // using proxy, rewriting, virtual path, etc...
         $res = '';
-        if ($type == 1)
-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value
-        if ($type == 2)
-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value
-        if ($type == 3)
-            $res = DOL_URL_ROOT . '/' . $path;
+        if ($type == 1) {
+                    $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;
+        }
+        // Standard value
+        if ($type == 2) {
+                    $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;
+        }
+        // Standard value
+        if ($type == 3) {
+                    $res = DOL_URL_ROOT . '/' . $path;
+        }
 
         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
             if ($key == 'main') {
@@ -845,13 +876,15 @@ 
 function dol_size($size, $type = '')
 {
     global $conf;
-    if (empty($conf->dol_optimize_smallscreen))
-        return $size;
-    if ($type == 'width' && $size > 250)
-        return 250;
-    else
-        return 10;
-}
+    if (empty($conf->dol_optimize_smallscreen)) {
+            return $size;
+    }
+    if ($type == 'width' && $size > 250) {
+            return 250;
+    } else {
+            return 10;
+    }
+    }
 
 /**
  * 	Clean a string to use it as a file name
@@ -950,8 +983,9 @@ 
 {
     $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
     $forbidden_chars_to_remove = array();
-    if (is_array($badcharstoreplace))
-        $forbidden_chars_to_replace = $badcharstoreplace;
+    if (is_array($badcharstoreplace)) {
+            $forbidden_chars_to_replace = $badcharstoreplace;
+    }
     //$forbidden_chars_to_remove=array("(",")");
 
     return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
@@ -988,9 +1022,9 @@ 
     if (empty($mode)) {
         $substitjs["'"] = "\\'";
         $substitjs['"'] = "\\'";
-    } else if ($mode == 1)
-        $substitjs["'"] = "\\'";
-    else if ($mode == 2) {
+    } else if ($mode == 1) {
+            $substitjs["'"] = "\\'";
+    } else if ($mode == 2) {
         $substitjs['"'] = '\\"';
     } else if ($mode == 3) {
         $substitjs["'"] = "\\'";
@@ -1012,10 +1046,12 @@ 
 {
     // escape quotes and backslashes, newlines, etc.
     $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags
-    if (!$keepb)
-        $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
-    if (!$keepn)
-        $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+    if (!$keepb) {
+            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+    }
+    if (!$keepn) {
+            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+    }
     return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags
 }
 
@@ -1066,8 +1102,9 @@ 
     global $conf, $user;
 
     // If syslog module enabled
-    if (empty($conf->syslog->enabled))
-        return;
+    if (empty($conf->syslog->enabled)) {
+            return;
+    }
 
     if ($ident < 0) {
         foreach ($conf->loghandlers as $loghandlerinstance) {
@@ -1081,8 +1118,9 @@ 
         if (!in_array($level, $logLevels, true)) {
             throw new Exception('Incorrect log level');
         }
-        if ($level > $conf->global->SYSLOG_LEVEL)
-            return;
+        if ($level > $conf->global->SYSLOG_LEVEL) {
+                    return;
+        }
 
         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
         // If adding log inside HTML page is required
@@ -1107,24 +1145,30 @@ 
         );
 
         // This is when server run behind a reverse proxy
-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                    $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+        }
         // This is when server run normally on a server
-        else if (!empty($_SERVER["REMOTE_ADDR"]))
-            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+        else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                    $data['ip'] = $_SERVER['REMOTE_ADDR'];
+        }
         // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-        else if (!empty($_SERVER['SERVER_ADDR']))
-            $data['ip'] = $_SERVER['SERVER_ADDR'];
+        else if (!empty($_SERVER['SERVER_ADDR'])) {
+                    $data['ip'] = $_SERVER['SERVER_ADDR'];
+        }
         // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-        else if (!empty($_SERVER['COMPUTERNAME']))
-            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+        else if (!empty($_SERVER['COMPUTERNAME'])) {
+                    $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+        }
         // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-        else if (!empty($_SERVER['LOGNAME']))
-            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+        else if (!empty($_SERVER['LOGNAME'])) {
+                    $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+        }
         // Loop on each log handler and send output
         foreach ($conf->loghandlers as $loghandlerinstance) {
-            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)
-                continue;
+            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                            continue;
+            }
             $loghandlerinstance->export($data, $suffixinfilename);
         }
         unset($data);
@@ -1180,13 +1224,15 @@ 
 
     // Show title
     $showtitle = 1;
-    if (!empty($conf->dol_optimize_smallscreen))
-        $showtitle = 0;
+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $showtitle = 0;
+    }
     if (!empty($title) && $showtitle) {
         $limittitle = 30;
         $out .= '<a class="tabTitle">';
-        if ($picto)
-            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+        if ($picto) {
+                    $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+        }
         $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';
         $out .= '</a>';
     }
@@ -1195,12 +1241,14 @@ 
     $maxkey = -1;
     if (is_array($links) && !empty($links)) {
         $keys = array_keys($links);
-        if (count($keys))
-            $maxkey = max($keys);
+        if (count($keys)) {
+                    $maxkey = max($keys);
+        }
     }
 
-    if (!empty($conf->dol_optimize_smallscreen))
-        $conf->global->MAIN_MAXTABS_IN_CARD = 2;
+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $conf->global->MAIN_MAXTABS_IN_CARD = 2;
+    }
 
     // Show tabs
     $bactive = false;
@@ -1213,8 +1261,9 @@ 
     for ($i = 0; $i <= $maxkey; $i++) {
         if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
             // If active tab is already present
-            if ($i >= $limittoshow)
-                $limittoshow--;
+            if ($i >= $limittoshow) {
+                            $limittoshow--;
+            }
         }
     }
 
@@ -1255,12 +1304,12 @@ 
             }
             $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';
             if (isset($links[$i][2]) && $links[$i][2] == 'image') {
-                if (!empty($links[$i][0]))
-                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
-                else
-                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
-            }
-            else if (!empty($links[$i][1])) {
+                if (!empty($links[$i][0])) {
+                                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                } else {
+                                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                }
+            } else if (!empty($links[$i][1])) {
                 $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';
                 $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
                 $outmore .= '</a>' . "\n";
@@ -1271,8 +1320,9 @@ 
         }
         $displaytab = $i;
     }
-    if ($popuptab)
-        $outmore .= '</div>';
+    if ($popuptab) {
+            $outmore .= '</div>';
+    }
 
     if ($displaytab > $limittoshow) {
         $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
@@ -1295,8 +1345,9 @@ 
 
     $out .= "</div>\n";
 
-    if (!$notab || $notab == -1)
-        $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+    if (!$notab || $notab == -1) {
+            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+    }
 
     $parameters = array('tabname' => $active, 'out' => $out);
     $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -1326,11 +1377,12 @@ 
  */
 function dol_get_fiche_end($notab = 0)
 {
-    if (!$notab || $notab == -1)
-        return "\n</div>\n";
-    else
-        return '';
-}
+    if (!$notab || $notab == -1) {
+            return "\n</div>\n";
+    } else {
+            return '';
+    }
+    }
 
 /**
  *  Show tab footer of a card.
@@ -1361,40 +1413,55 @@ 
     $showimage = 1;
     $entity = (empty($object->entity) ? $conf->entity : $object->entity);
     $showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
-    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))
-        $showbarcode = 0;
+    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+            $showbarcode = 0;
+    }
     $modulepart = 'unknown';
 
-    if ($object->element == 'societe')
-        $modulepart = 'societe';
-    if ($object->element == 'contact')
-        $modulepart = 'contact';
-    if ($object->element == 'member')
-        $modulepart = 'memberphoto';
-    if ($object->element == 'user')
-        $modulepart = 'userphoto';
-    if ($object->element == 'product')
-        $modulepart = 'product';
+    if ($object->element == 'societe') {
+            $modulepart = 'societe';
+    }
+    if ($object->element == 'contact') {
+            $modulepart = 'contact';
+    }
+    if ($object->element == 'member') {
+            $modulepart = 'memberphoto';
+    }
+    if ($object->element == 'user') {
+            $modulepart = 'userphoto';
+    }
+    if ($object->element == 'product') {
+            $modulepart = 'product';
+    }
 
     if (class_exists("Imagick")) {
-        if ($object->element == 'propal')
-            $modulepart = 'propal';
-        if ($object->element == 'commande')
-            $modulepart = 'commande';
-        if ($object->element == 'facture')
-            $modulepart = 'facture';
-        if ($object->element == 'fichinter')
-            $modulepart = 'ficheinter';
-        if ($object->element == 'contrat')
-            $modulepart = 'contract';
-        if ($object->element == 'supplier_proposal')
-            $modulepart = 'supplier_proposal';
-        if ($object->element == 'order_supplier')
-            $modulepart = 'supplier_order';
-        if ($object->element == 'invoice_supplier')
-            $modulepart = 'supplier_invoice';
-        if ($object->element == 'expensereport')
-            $modulepart = 'expensereport';
+        if ($object->element == 'propal') {
+                    $modulepart = 'propal';
+        }
+        if ($object->element == 'commande') {
+                    $modulepart = 'commande';
+        }
+        if ($object->element == 'facture') {
+                    $modulepart = 'facture';
+        }
+        if ($object->element == 'fichinter') {
+                    $modulepart = 'ficheinter';
+        }
+        if ($object->element == 'contrat') {
+                    $modulepart = 'contract';
+        }
+        if ($object->element == 'supplier_proposal') {
+                    $modulepart = 'supplier_proposal';
+        }
+        if ($object->element == 'order_supplier') {
+                    $modulepart = 'supplier_order';
+        }
+        if ($object->element == 'invoice_supplier') {
+                    $modulepart = 'supplier_invoice';
+        }
+        if ($object->element == 'expensereport') {
+                    $modulepart = 'expensereport';
+        }
     }
 
     if ($object->element == 'product') {
@@ -1402,11 +1469,12 @@ 
         $cssclass = 'photoref';
         $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
         $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
-        if ($conf->browser->layout == 'phone')
-            $maxvisiblephotos = 1;
-        if ($showimage)
-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
-        else {
+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {
             if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
                 $nophoto = '';
                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1422,11 +1490,12 @@ 
         $cssclass = 'photoref';
         $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);
         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);
-        if ($conf->browser->layout == 'phone')
-            $maxvisiblephotos = 1;
-        if ($showimage)
-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
-        else {
+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {
             if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {
                 $nophoto = '';
                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1451,8 +1520,10 @@ 
                     } else {
                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
                     }
-                    if (empty($subdir))
-                        $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
+                    if (empty($subdir)) {
+                                            $subdir = 'errorgettingsubdirofobject';
+                    }
+                    // Protection to avoid to return empty path
 
                     $filepath = $dir_output . $subdir . "/";
 
@@ -1473,14 +1544,16 @@ 
                             if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.
                                 include_once DOL_BASE_PATH . '/core/lib/files.lib.php';
                                 $ret = dol_convert_file($file, 'png', $fileimage);
-                                if ($ret < 0)
-                                    $error++;
+                                if ($ret < 0) {
+                                                                    $error++;
+                                }
                             }
                         }
 
                         $heightforphotref = 70;
-                        if (!empty($conf->dol_optimize_smallscreen))
-                            $heightforphotref = 60;
+                        if (!empty($conf->dol_optimize_smallscreen)) {
+                                                    $heightforphotref = 60;
+                        }
                         // Si fichier png PDF d'1 page trouve
                         if (file_exists($fileimage)) {
                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
@@ -1516,8 +1589,10 @@ 
                     $width = 14;
                     $cssclass = 'photorefcenter';
                     $picto = $object->picto;
-                    if ($object->element == 'project' && !$object->public)
-                        $picto = 'project'; // instead of projectpub
+                    if ($object->element == 'project' && !$object->public) {
+                                            $picto = 'project';
+                    }
+                    // instead of projectpub
                     $nophoto = img_picto('', 'object_' . $picto, '', false, 1);
                 }
                 $morehtmlleft .= '<!-- No photo to show -->';
@@ -1528,8 +1603,9 @@ 
         }
     }
 
-    if ($showbarcode)
-        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+    if ($showbarcode) {
+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+    }
 
     if ($object->element == 'societe') {
         if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1553,35 +1629,37 @@ 
         }
     } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {
         $tmptxt = $object->getLibStatut(6, $object->totalpaye);
-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')
-            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+        }
         $morehtmlstatus .= $tmptxt;
-    }
-    elseif ($object->element == 'contrat' || $object->element == 'contract') {
-        if ($object->statut == 0)
-            $morehtmlstatus .= $object->getLibStatut(5);
-        else
-            $morehtmlstatus .= $object->getLibStatut(4);
-    }
-    elseif ($object->element == 'facturerec') {
-        if ($object->frequency == 0)
-            $morehtmlstatus .= $object->getLibStatut(2);
-        else
-            $morehtmlstatus .= $object->getLibStatut(5);
-    }
-    elseif ($object->element == 'project_task') {
+    } elseif ($object->element == 'contrat' || $object->element == 'contract') {
+        if ($object->statut == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(4);
+        }
+    } elseif ($object->element == 'facturerec') {
+        if ($object->frequency == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(2);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        }
+    } elseif ($object->element == 'project_task') {
         $object->fk_statut = 1;
-        if ($object->progress > 0)
-            $object->fk_statut = 2;
-        if ($object->progress >= 100)
-            $object->fk_statut = 3;
+        if ($object->progress > 0) {
+                    $object->fk_statut = 2;
+        }
+        if ($object->progress >= 100) {
+                    $object->fk_statut = 3;
+        }
         $tmptxt = $object->getLibStatut(5);
         $morehtmlstatus .= $tmptxt;  // No status on task
-    }
-    else { // Generic case
+    } else { // Generic case
         $tmptxt = $object->getLibStatut(6);
-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')
-            $tmptxt = $object->getLibStatut(5);
+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5);
+        }
         $morehtmlstatus .= $tmptxt;
     }
 
@@ -1595,13 +1673,15 @@ 
     }
 
     // Add alias for thirdparty
-    if (!empty($object->name_alias))
-        $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+    if (!empty($object->name_alias)) {
+            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+    }
 
     // Add label
     if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {
-        if (!empty($object->label))
-            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+        if (!empty($object->label)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+        }
     }
 
     if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {
@@ -1634,15 +1714,19 @@ 
 {
     global $conf, $langs;
     $ret = '';
-    if ($fieldrequired)
-        $ret .= '<span class="fieldrequired">';
-    if (($conf->dol_use_jmobile != 4))
-        $ret .= '<label for="' . $fieldkey . '">';
+    if ($fieldrequired) {
+            $ret .= '<span class="fieldrequired">';
+    }
+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '<label for="' . $fieldkey . '">';
+    }
     $ret .= $langs->trans($langkey);
-    if (($conf->dol_use_jmobile != 4))
-        $ret .= '</label>';
-    if ($fieldrequired)
-        $ret .= '</span>';
+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '</label>';
+    }
+    if ($fieldrequired) {
+            $ret .= '</span>';
+    }
     return $ret;
 }
 
@@ -1657,8 +1741,9 @@ 
 {
     global $bc;
     $ret = ' ' . $bc[$var];
-    if ($moreclass)
-        $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+    if ($moreclass) {
+            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+    }
     return $ret;
 }
 
@@ -1689,18 +1774,18 @@ 
         if ($object->state) {
             $ret .= ($ret ? ", " : '') . $object->state;
         }
-        if ($object->zip)
-            $ret .= ($ret ? ", " : '') . $object->zip;
-    }
-    else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
+        if ($object->zip) {
+                    $ret .= ($ret ? ", " : '') . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
         $ret .= ($ret ? $sep : '' ) . $object->town;
         if ($object->state) {
             $ret .= ($ret ? ", " : '') . $object->state;
         }
-        if ($object->zip)
-            $ret .= ($ret ? $sep : '' ) . $object->zip;
-    }
-    else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
+        if ($object->zip) {
+                    $ret .= ($ret ? $sep : '' ) . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
         $ret .= ($ret ? $sep : '' ) . $object->zip;
         $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');
         if ($object->state) {
@@ -1717,8 +1802,9 @@ 
             $ret .= ($ret ? ", " : '') . $object->state;
         }
     }
-    if (!is_object($outputlangs))
-        $outputlangs = $langs;
+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
     if ($withcountry) {
         $langs->load("dict");
         $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');
@@ -1739,9 +1825,10 @@ 
 {
     if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
         return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-    } else
-        return 'Error date into a not supported range';
-}
+    } else {
+            return 'Error date into a not supported range';
+    }
+    }
 
 /**
  * 	Output date in a string format according to outputlangs (or langs if not defined).
@@ -1787,10 +1874,12 @@ 
             }
         }
     }
-    if (!is_object($outputlangs))
-        $outputlangs = $langs;
-    if (!$format)
-        $format = 'daytextshort';
+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
+    if (!$format) {
+            $format = 'daytextshort';
+    }
     $reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;
     $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
     if ($formatwithoutreduce != $format) {
@@ -1799,40 +1888,46 @@ 
     }  // so format 'dayreduceformat' is processed like day
     // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
     // TODO Add format daysmallyear and dayhoursmallyear
-    if ($format == 'day')
-        $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
-    else if ($format == 'hour')
-        $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
-    else if ($format == 'hourduration')
-        $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
-    else if ($format == 'daytext')
-        $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
-    else if ($format == 'daytextshort')
-    // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781
+    if ($format == 'day') {
+            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+    } else if ($format == 'hour') {
+            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+    } else if ($format == 'hourduration') {
+            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+    } else if ($format == 'daytext') {
+            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+    } else if ($format == 'daytextshort') {
+        // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781
         $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
-    else if ($format == 'dayhour')
-        $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
-    else if ($format == 'dayhoursec')
-        $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
-    else if ($format == 'dayhourtext')
-        $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
-    else if ($format == 'dayhourtextshort')
-        $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+    } else if ($format == 'dayhour') {
+            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+    } else if ($format == 'dayhoursec') {
+            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+    } else if ($format == 'dayhourtext') {
+            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+    } else if ($format == 'dayhourtextshort') {
+            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+    }
     // Format not sensitive to language
-    else if ($format == 'dayhourlog')
-        $format = '%Y%m%d%H%M%S';
-    else if ($format == 'dayhourldap')
-        $format = '%Y%m%d%H%M%SZ';
-    else if ($format == 'dayhourxcard')
-        $format = '%Y%m%dT%H%M%SZ';
-    else if ($format == 'dayxcard')
-        $format = '%Y%m%d';
-    else if ($format == 'dayrfc')
-        $format = '%Y-%m-%d';             // DATE_RFC3339
-    else if ($format == 'dayhourrfc')
-        $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-    else if ($format == 'standard')
-        $format = '%Y-%m-%d %H:%M:%S';
+    else if ($format == 'dayhourlog') {
+            $format = '%Y%m%d%H%M%S';
+    } else if ($format == 'dayhourldap') {
+            $format = '%Y%m%d%H%M%SZ';
+    } else if ($format == 'dayhourxcard') {
+            $format = '%Y%m%dT%H%M%SZ';
+    } else if ($format == 'dayxcard') {
+            $format = '%Y%m%d';
+    } else if ($format == 'dayrfc') {
+            $format = '%Y-%m-%d';
+    }
+    // DATE_RFC3339
+    else if ($format == 'dayhourrfc') {
+            $format = '%Y-%m-%dT%H:%M:%SZ';
+    }
+    // DATETIME RFC3339
+    else if ($format == 'standard') {
+            $format = '%Y-%m-%d %H:%M:%S';
+    }
 
     if ($reduceformat) {
         $format = str_replace('%Y', '%y', $format);
@@ -1840,8 +1935,10 @@ 
     }
 
     // If date undefined or "", we return ""
-    if (dol_strlen($time) == 0)
-        return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)
+    if (dol_strlen($time) == 0) {
+            return '';
+    }
+    // $time=0 allowed (it means 01/01/1970 00:00:00)
 
 
 
@@ -1901,8 +1998,9 @@ 
             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
             $ret = adodb_strftime($format, $timetouse, $to_gmt);
-        } else
-            $ret = 'Bad value ' . $time . ' for date';
+        } else {
+                    $ret = 'Bad value ' . $time . ' for date';
+        }
     }
 
     if (preg_match('/__b__/i', $format)) {
@@ -1973,10 +2071,14 @@ 
     global $conf;
 
     $usealternatemethod = false;
-    if ($timestamp <= 0)
-        $usealternatemethod = true;    // <= 1970
-    if ($timestamp >= 2145913200)
-        $usealternatemethod = true;  // >= 2038
+    if ($timestamp <= 0) {
+            $usealternatemethod = true;
+    }
+    // <= 1970
+    if ($timestamp >= 2145913200) {
+            $usealternatemethod = true;
+    }
+    // >= 2038
 
     if ($usealternatemethod) {
         $arrayinfo = adodb_getdate($timestamp, $fast);
@@ -2011,27 +2113,36 @@ 
     global $conf;
     //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
     // Clean parameters
-    if ($hour == -1 || empty($hour))
-        $hour = 0;
-    if ($minute == -1 || empty($minute))
-        $minute = 0;
-    if ($second == -1 || empty($second))
-        $second = 0;
+    if ($hour == -1 || empty($hour)) {
+            $hour = 0;
+    }
+    if ($minute == -1 || empty($minute)) {
+            $minute = 0;
+    }
+    if ($second == -1 || empty($second)) {
+            $second = 0;
+    }
 
     // Check parameters
     if ($check) {
-        if (!$month || !$day)
-            return '';
-        if ($day > 31)
-            return '';
-        if ($month > 12)
-            return '';
-        if ($hour < 0 || $hour > 24)
-            return '';
-        if ($minute < 0 || $minute > 60)
-            return '';
-        if ($second < 0 || $second > 60)
-            return '';
+        if (!$month || !$day) {
+                    return '';
+        }
+        if ($day > 31) {
+                    return '';
+        }
+        if ($month > 12) {
+                    return '';
+        }
+        if ($hour < 0 || $hour > 24) {
+                    return '';
+        }
+        if ($minute < 0 || $minute > 60) {
+                    return '';
+        }
+        if ($second < 0 || $second > 60) {
+                    return '';
+        }
     }
 
     if (method_exists('DateTime', 'getTimestamp')) {
@@ -2088,8 +2199,10 @@ 
 
     // Note that gmmktime and mktime return same value (GMT) when used without parameters
     //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead
-    if ($mode == 'gmt')
-        $ret = time(); // Time for now at greenwich.
+    if ($mode == 'gmt') {
+            $ret = time();
+    }
+    // Time for now at greenwich.
     else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added
         require_once DOL_BASE_PATH . '/core/lib/date.lib.php';
         $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time
@@ -2123,8 +2236,9 @@ 
     global $conf, $langs;
     $level = 1024;
 
-    if (!empty($conf->dol_optimize_smallscreen))
-        $shortunit = 1;
+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $shortunit = 1;
+    }
 
     // Set value text
     if (empty($shortvalue) || $size < ($level * 10)) {
@@ -2159,19 +2273,23 @@ 
 {
     global $langs;
 
-    if (empty($url))
-        return '';
+    if (empty($url)) {
+            return '';
+    }
 
     $link = '<a href="';
-    if (!preg_match('/^http/i', $url))
-        $link .= 'http://';
+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= $url;
     $link .= '"';
-    if ($target)
-        $link .= ' target="' . $target . '"';
+    if ($target) {
+            $link .= ' target="' . $target . '"';
+    }
     $link .= '>';
-    if (!preg_match('/^http/i', $url))
-        $link .= 'http://';
+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= dol_trunc($url, $max);
     $link .= '</a>';
     return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';
@@ -2195,13 +2313,15 @@ 
 
     $newemail = $email;
 
-    if (empty($email))
-        return '&nbsp;';
+    if (empty($email)) {
+            return '&nbsp;';
+    }
 
     if (!empty($addlink)) {
         $newemail = '<a style="text-overflow: ellipsis;" href="';
-        if (!preg_match('/^mailto:/i', $email))
-            $newemail .= 'mailto:';
+        if (!preg_match('/^mailto:/i', $email)) {
+                    $newemail .= 'mailto:';
+        }
         $newemail .= $email;
         $newemail .= '">';
         $newemail .= dol_trunc($email, $max);
@@ -2214,13 +2334,14 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
             $type = 'AC_EMAIL';
             $link = '';
-            if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL))
-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
-            if ($link)
-                $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+            if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+            }
         }
-    }
-    else {
+    } else {
         if ($showinvalid && !isValidEmail($email)) {
             $langs->load("errors");
             $newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
@@ -2252,8 +2373,9 @@ 
 
     $newskype = $value;
 
-    if (empty($value))
-        return '&nbsp;';
+    if (empty($value)) {
+            return '&nbsp;';
+    }
 
     if (!empty($type)) {
         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';
@@ -2274,13 +2396,13 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {
             $addlink = 'AC_SKYPE';
             $link = '';
-            if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE))
-                $link = '<a href="' . BASE_URI . '?controller=comm/action&method=card&action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                            $link = '<a href="' . BASE_URI . '?controller=comm/action&method=card&action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
             $newskype .= ($link ? ' ' . $link : '');
         }
         $newskype .= '</div>';
-    }
-    else {
+    } else {
         $langs->load("errors");
         $newskype .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));
     }
@@ -2310,12 +2432,14 @@ 
     if (empty($phone)) {
         return '';
     }
-    if (empty($countrycode))
-        $countrycode = $mysoc->country_code;
+    if (empty($countrycode)) {
+            $countrycode = $mysoc->country_code;
+    }
 
     // Short format for small screens
-    if ($conf->dol_optimize_smallscreen)
-        $separ = '';
+    if ($conf->dol_optimize_smallscreen) {
+            $separ = '';
+    }
 
     $newphone = $phone;
     if (strtoupper($countrycode) == "FR") {
@@ -2481,15 +2605,18 @@ 
             $newphone = '<a href="tel:' . $phone . '"';
             $newphone .= '>' . $phone . '</a>';
         } else if (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url
-            if (empty($user->clicktodial_loaded))
-                $user->fetch_clicktodial();
+            if (empty($user->clicktodial_loaded)) {
+                            $user->fetch_clicktodial();
+            }
 
             // Define urlmask
             $urlmask = 'ErrorClickToDialModuleNotConfigured';
-            if (!empty($conf->global->CLICKTODIAL_URL))
-                $urlmask = $conf->global->CLICKTODIAL_URL;
-            if (!empty($user->clicktodial_url))
-                $urlmask = $user->clicktodial_url;
+            if (!empty($conf->global->CLICKTODIAL_URL)) {
+                            $urlmask = $conf->global->CLICKTODIAL_URL;
+            }
+            if (!empty($user->clicktodial_url)) {
+                            $urlmask = $user->clicktodial_url;
+            }
 
             $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');
             $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');
@@ -2504,8 +2631,9 @@ 
             $url = make_substitutions($url, $substitarray);
             $newphonesav = $newphone;
             $newphone = '<a href="' . $url . '"';
-            if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET))
-                $newphone .= ' target="_blank"';
+            if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                            $newphone .= ' target="_blank"';
+            }
             $newphone .= '>' . $newphonesav . '</a>';
         }
 
@@ -2513,12 +2641,15 @@ 
         if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
             $type = 'AC_TEL';
             $link = '';
-            if ($addlink == 'AC_FAX')
-                $type = 'AC_FAX';
-            if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE))
-                $link = '<a href="' . BASE_URI . '?controller=comm/action&method=card&action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
-            if ($link)
-                $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+            if ($addlink == 'AC_FAX') {
+                            $type = 'AC_FAX';
+            }
+            if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                            $link = '<a href="' . BASE_URI . '?controller=comm/action&method=card&action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+            }
         }
     }
 
@@ -2545,15 +2676,17 @@ 
                 $picto = '';
             }
         }
-        if ($adddivfloat)
-            $rep .= '<div class="nospan float" style="margin-right: 10px">';
-        else
-            $rep .= '<span style="margin-right: 10px;">';
+        if ($adddivfloat) {
+                    $rep .= '<div class="nospan float" style="margin-right: 10px">';
+        } else {
+                    $rep .= '<span style="margin-right: 10px;">';
+        }
         $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;
-        if ($adddivfloat)
-            $rep .= '</div>';
-        else
-            $rep .= '</span>';
+        if ($adddivfloat) {
+                    $rep .= '</div>';
+        } else {
+                    $rep .= '</span>';
+        }
     }
 
     return $rep;
@@ -2583,8 +2716,9 @@ 
         if ($countrycode) { // If success, countrycode is us, fr, ...
             if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {
                 $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);
-            } else
-                $ret .= ' (' . $countrycode . ')';
+            } else {
+                            $ret .= ' (' . $countrycode . ')';
+            }
         }
     }
 
@@ -2682,26 +2816,33 @@ 
             $out .= $hookmanager->resPrint;
         }
         if (empty($reshook)) {
-            if (empty($charfornl))
-                $out .= nl2br($address);
-            else
-                $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+            if (empty($charfornl)) {
+                            $out .= nl2br($address);
+            } else {
+                            $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+            }
 
             $showgmap = $showomap = 0;
 
             // TODO Add a hook here
-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS))
-                $showgmap = 1;
-            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))
-                $showgmap = 1;
-            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))
-                $showgmap = 1;
-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS))
-                $showomap = 1;
-            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))
-                $showomap = 1;
-            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))
-                $showomap = 1;
+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                            $showgmap = 1;
+            }
+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                            $showomap = 1;
+            }
 
             if ($showgmap) {
                 $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);
@@ -2713,11 +2854,12 @@ 
             }
         }
     }
-    if ($noprint)
-        return $out;
-    else
-        print $out;
-}
+    if ($noprint) {
+            return $out;
+    } else {
+            print $out;
+    }
+    }
 
 /**
  * 	Return true if email syntax is ok
@@ -2728,10 +2870,12 @@ 
  */
 function isValidEmail($address, $acceptsupervisorkey = 0)
 {
-    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')
-        return true;
-    if (filter_var($address, FILTER_VALIDATE_EMAIL))
-        return true;
+    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+            return true;
+    }
+    if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+            return true;
+    }
 
     return false;
 }
@@ -2753,10 +2897,12 @@ 
             $mxhosts = array();
             $weight = array();
             getmxrr(idn_to_ascii($domain), $mxhosts, $weight);
-            if (count($mxhosts) > 1)
-                return 1;
-            if (count($mxhosts) == 1 && !empty($mxhosts[0]))
-                return 1;
+            if (count($mxhosts) > 1) {
+                            return 1;
+            }
+            if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                            return 1;
+            }
 
             return 0;
         }
@@ -2785,11 +2931,12 @@ 
  */
 function dol_strlen($string, $stringencoding = 'UTF-8')
 {
-    if (function_exists('mb_strlen'))
-        return mb_strlen($string, $stringencoding);
-    else
-        return strlen($string);
-}
+    if (function_exists('mb_strlen')) {
+            return mb_strlen($string, $stringencoding);
+    } else {
+            return strlen($string);
+    }
+    }
 
 /**
  * Make a substring. Works even if mbstring module is not enabled for better compatibility.
@@ -2805,8 +2952,9 @@ 
 {
     global $langs;
 
-    if (empty($stringencoding))
-        $stringencoding = $langs->charset_output;
+    if (empty($stringencoding)) {
+            $stringencoding = $langs->charset_output;
+    }
 
     $ret = '';
     if (empty($trunconbytes)) {
@@ -2842,49 +2990,56 @@ 
 {
     global $conf;
 
-    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC))
-        return $string;
+    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) {
+            return $string;
+    }
 
-    if (empty($stringencoding))
-        $stringencoding = 'UTF-8';
+    if (empty($stringencoding)) {
+            $stringencoding = 'UTF-8';
+    }
     // reduce for small screen
-    if ($conf->dol_optimize_smallscreen == 1 && $display == 1)
-        $size = round($size / 3);
+    if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {
+            $size = round($size / 3);
+    }
 
     // We go always here
     if ($trunc == 'right') {
         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
             return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
-        else
-        //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+        } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
             return $string;
-    }
-    elseif ($trunc == 'middle') {
+        }
+    } elseif ($trunc == 'middle') {
         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
         if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {
             $size1 = round($size / 2);
             $size2 = round($size / 2);
             return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-        } else
-            return $string;
-    }
-    elseif ($trunc == 'left') {
+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'left') {
         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
             return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-        else
-            return $string;
-    }
-    elseif ($trunc == 'wrap') {
+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'wrap') {
         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-        if (dol_strlen($newstring, $stringencoding) > ($size + 1))
-            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-        else
-            return $string;
-    } else
-        return 'BadParam3CallingDolTrunc';
-}
+        if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                    return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+        } else {
+                    return $string;
+        }
+    } else {
+            return 'BadParam3CallingDolTrunc';
+    }
+    }
 
 /**
  * 	Show picto whatever it's its name (generic function)
@@ -3095,8 +3250,9 @@ 
 {
     global $conf;
 
-    if (!preg_match('/(\.png|\.gif)$/i', $picto))
-        $picto .= '.png';
+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 
     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;
     $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;
@@ -3118,20 +3274,22 @@ 
 {
     global $conf;
 
-    if (!preg_match('/(\.png|\.gif)$/i', $picto))
-        $picto .= '.png';
+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 
-    if ($pictoisfullpath)
-        $path = $picto;
-    else {
+    if ($pictoisfullpath) {
+            $path = $picto;
+    } else {
         //$path = DOL_URL_ROOT . '/theme/common/' . $picto;
         $path = DOL_BASE_URI . '/theme/common/' . $picto;
 
         if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {
             $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;
 
-            if (file_exists($themepath))
-                $path = $themepath;
+            if (file_exists($themepath)) {
+                            $path = $themepath;
+            }
         }
     }
 
@@ -3170,8 +3328,9 @@ 
             $numaction = 0;
         }
     }
-    if (!is_numeric($numaction))
-        $numaction = 0;
+    if (!is_numeric($numaction)) {
+            $numaction = 0;
+    }
 
     return img_picto($titlealt, 'stcomm' . $numaction . '.png');
 }
@@ -3187,8 +3346,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Show');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Show');
+    }
 
     return img_picto($titlealt, 'pdf' . $size . '.png');
 }
@@ -3204,8 +3364,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Add');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Add');
+    }
 
     return img_picto($titlealt, 'edit_add.png', $other);
 }
@@ -3221,8 +3382,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Remove');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Remove');
+    }
 
     return img_picto($titlealt, 'edit_remove.png', $other);
 }
@@ -3239,8 +3401,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Modify');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Modify');
+    }
 
     return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));
 }
@@ -3257,8 +3420,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('View');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('View');
+    }
 
     $moreatt = ($float ? 'style="float: right" ' : '') . $other;
 
@@ -3276,8 +3440,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Delete');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Delete');
+    }
 
     return img_picto($titlealt, 'delete.png', $other);
     //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';
@@ -3293,8 +3458,9 @@ 
 function img_printer($titlealt = "default", $other = '')
 {
     global $conf, $langs;
-    if ($titlealt == "default")
-        $titlealt = $langs->trans("Print");
+    if ($titlealt == "default") {
+            $titlealt = $langs->trans("Print");
+    }
     return img_picto($titlealt, 'printer.png', $other);
 }
 
@@ -3309,8 +3475,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Split');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Split');
+    }
 
     return img_picto($titlealt, 'split.png', $other);
 }
@@ -3327,10 +3494,11 @@ 
     global $conf, $langs;
 
     if ($usealttitle) {
-        if (is_string($usealttitle))
-            $usealttitle = dol_escape_htmltag($usealttitle);
-        else
-            $usealttitle = $langs->trans('Info');
+        if (is_string($usealttitle)) {
+                    $usealttitle = dol_escape_htmltag($usealttitle);
+        } else {
+                    $usealttitle = $langs->trans('Info');
+        }
     }
 
     return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');
@@ -3346,8 +3514,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Informations');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Informations');
+    }
 
     return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
 }
@@ -3363,8 +3532,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Warning');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Warning');
+    }
 
     //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
     return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));
@@ -3380,8 +3550,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Error');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Error');
+    }
 
     return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
 }
@@ -3397,8 +3568,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Next');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Next');
+    }
 
     //return img_picto($titlealt, 'next.png', $moreatt);
     return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';
@@ -3415,8 +3587,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Previous');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Previous');
+    }
 
     //return img_picto($titlealt, 'previous.png', $moreatt);
     return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';
@@ -3434,8 +3607,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Down');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Down');
+    }
 
     return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');
 }
@@ -3452,8 +3626,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Up');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Up');
+    }
 
     return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');
 }
@@ -3470,8 +3645,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Left');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Left');
+    }
 
     return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3488,8 +3664,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Right');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Right');
+    }
 
     return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
@@ -3505,11 +3682,13 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Active');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Active');
+    }
 
-    if ($allow == 1)
-        return img_picto($titlealt, 'tick.png');
+    if ($allow == 1) {
+            return img_picto($titlealt, 'tick.png');
+    }
 
     return '-';
 }
@@ -3557,8 +3736,9 @@ 
     $mimeimg = dol_mimetype($file, '', 2);
     $mimefa = dol_mimetype($file, '', 4);
 
-    if (empty($titlealt))
-        $titlealt = 'Mime type: ' . $mimetype;
+    if (empty($titlealt)) {
+            $titlealt = 'Mime type: ' . $mimetype;
+    }
 
     //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
     return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';
@@ -3580,13 +3760,15 @@ 
 
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Call');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Call');
+    }
 
-    if ($option == 1)
-        $img = 'call';
-    else
-        $img = 'call_out';
+    if ($option == 1) {
+            $img = 'call';
+    } else {
+            $img = 'call_out';
+    }
 
     return img_picto($titlealt, $img);
 }
@@ -3602,8 +3784,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Search');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 
     $img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -3624,8 +3807,9 @@ 
 {
     global $conf, $langs;
 
-    if ($titlealt == 'default')
-        $titlealt = $langs->trans('Search');
+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 
     $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -3687,14 +3871,16 @@ 
 
     if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web
         $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";
-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+        }
         $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";
 
         $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";
         $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";
-        if (isset($conf->global->MAIN_FEATURES_LEVEL))
-            $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+        if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+        }
         if (function_exists("phpversion")) {
             $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";
         }
@@ -3737,18 +3923,20 @@ 
         $langs->load("errors");
 
         // Merge all into $errors array
-        if (is_array($error) && is_array($errors))
-            $errors = array_merge($error, $errors);
-        elseif (is_array($error))
-            $errors = $error;
-        elseif (is_array($errors))
-            $errors = array_merge(array($error), $errors);
-        else
-            $errors = array_merge(array($error));
+        if (is_array($error) && is_array($errors)) {
+                    $errors = array_merge($error, $errors);
+        } elseif (is_array($error)) {
+                    $errors = $error;
+        } elseif (is_array($errors)) {
+                    $errors = array_merge(array($error), $errors);
+        } else {
+                    $errors = array_merge(array($error));
+        }
 
         foreach ($errors as $msg) {
-            if (empty($msg))
-                continue;
+            if (empty($msg)) {
+                            continue;
+            }
             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web
                 $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";
             } else {                        // Mode CLI
@@ -3766,9 +3954,9 @@ 
         $out .= "<br>\n";
     }
 
-    if (empty($dolibarr_main_prod))
-        print $out;
-    else {
+    if (empty($dolibarr_main_prod)) {
+            print $out;
+    } else {
         print $langs->trans("DolibarrHasDetectedError") . '. ';
         print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
         define("MAIN_CORE_ERROR", 1);
@@ -3791,16 +3979,18 @@ 
 {
     global $langs, $conf;
 
-    if (empty($email))
-        $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    if (empty($email)) {
+            $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    }
 
     $langs->load("errors");
     $now = dol_now();
 
     print '<br><div class="center login_main_message"><div class="' . $morecss . '">';
     print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));
-    if ($errormessage)
-        print '<br><br>' . $errormessage;
+    if ($errormessage) {
+            print '<br><br>' . $errormessage;
+    }
     if (is_array($errormessages) && count($errormessages)) {
         foreach ($errormessages as $mesgtoshow) {
             print '<br><br>' . $mesgtoshow;
@@ -4043,12 +4233,15 @@ 
     $savtotalnboflines = $totalnboflines;
     $totalnboflines = abs($totalnboflines);
 
-    if ($picto == 'setup')
-        $picto = 'title_setup.png';
-    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png')
-        $picto = 'title.gif';
-    if ($limit < 0)
-        $limit = $conf->liste_limit;
+    if ($picto == 'setup') {
+            $picto = 'title_setup.png';
+    }
+    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+            $picto = 'title.gif';
+    }
+    if ($limit < 0) {
+            $limit = $conf->liste_limit;
+    }
     if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {
         $nextpage = 1;
     } else {
@@ -4062,11 +4255,13 @@ 
     // Left
     //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
     print '<td class="nobordernopadding valignmiddle">';
-    if ($picto && $titre)
-        print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+    if ($picto && $titre) {
+            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+    }
     print '<div class="titre inline-block">' . $titre;
-    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')
-        print ' (' . $totalnboflines . ')';
+    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+            print ' (' . $totalnboflines . ')';
+    }
     print '</div></td>';
 
     // Center
@@ -4076,10 +4271,12 @@ 
 
     // Right
     print '<td class="nobordernopadding valignmiddle" align="right">';
-    if ($sortfield)
-        $options .= "&sortfield=" . urlencode($sortfield);
-    if ($sortorder)
-        $options .= "&sortorder=" . urlencode($sortorder);
+    if ($sortfield) {
+            $options .= "&sortfield=" . urlencode($sortfield);
+    }
+    if ($sortorder) {
+            $options .= "&sortorder=" . urlencode($sortorder);
+    }
     // Show navigation bar
     $pagelist = '';
     if ($savlimit != 0 && ($page > 0 || $num > $limit)) {
@@ -4087,10 +4284,11 @@ 
             // Define nb of extra page links before and after selected page + ... + first or last
             $maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 1);
 
-            if ($limit > 0)
-                $nbpages = ceil($totalnboflines / $limit);
-            else
-                $nbpages = 1;
+            if ($limit > 0) {
+                            $nbpages = ceil($totalnboflines / $limit);
+            } else {
+                            $nbpages = 1;
+            }
             $cpt = ($page - $maxnbofpage);
             if ($cpt < 0) {
                 $cpt = 0;
@@ -4098,10 +4296,11 @@ 
 
             if ($cpt >= 1) {
                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';
-                if ($cpt > 2)
-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
-                else if ($cpt == 2)
-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                if ($cpt > 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                }
             }
 
             do {
@@ -4114,14 +4313,14 @@ 
             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);
 
             if ($cpt < $nbpages) {
-                if ($cpt < $nbpages - 2)
-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
-                else if ($cpt == $nbpages - 2)
-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                if ($cpt < $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                }
                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';
             }
-        }
-        else {
+        } else {
             $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";
         }
     }
@@ -4157,18 +4356,21 @@ 
         $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
         //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
         //$pagesizechoices.=',2:2';
-        if (!empty($conf->global->MAIN_PAGESIZE_CHOICES))
-            $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+        if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+                    $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+        }
 
         print '<li class="pagination">';
         print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';
         $tmpchoice = explode(',', $pagesizechoices);
         $tmpkey = $limit . ':' . $limit;
-        if (!in_array($tmpkey, $tmpchoice))
-            $tmpchoice[] = $tmpkey;
+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         $tmpkey = $conf->liste_limit . ':' . $conf->liste_limit;
-        if (!in_array($tmpkey, $tmpchoice))
-            $tmpchoice[] = $tmpkey;
+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         asort($tmpchoice, SORT_NUMERIC);
         $found = false;
         foreach ($tmpchoice as $val) {
@@ -4244,14 +4446,15 @@ 
     }
 
     // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-    if (!preg_match('/\//', $rate))
-        $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
-    else {
+    if (!preg_match('/\//', $rate)) {
+            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+    } else {
         // TODO Split on / and output with a price2num to have clean numbers without ton of 000.
         $ret = $rate . ($addpercent ? '%' : '');
     }
-    if (($info_bits & 1) && $usestarfornpr >= 0)
-        $ret .= ' *';
+    if (($info_bits & 1) && $usestarfornpr >= 0) {
+            $ret .= ' *';
+    }
     $ret .= $morelabel;
     return $ret;
 }
@@ -4276,11 +4479,14 @@ 
     global $langs, $conf;
 
     // Clean parameters
-    if (empty($amount))
-        $amount = 0; // To have a numeric value if amount not defined or = ''
+    if (empty($amount)) {
+            $amount = 0;
+    }
+    // To have a numeric value if amount not defined or = ''
     $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-    if ($rounding < 0)
-        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+    if ($rounding < 0) {
+            $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+    }
     $nbdecimal = $rounding;
 
     // Output separators by default (french)
@@ -4288,17 +4494,21 @@ 
     $thousand = ' ';
 
     // If $outlangs not forced, we use use language
-    if (!is_object($outlangs))
-        $outlangs = $langs;
-
-    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")
-        $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
-    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")
-        $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
-    if ($thousand == 'None')
-        $thousand = '';
-    else if ($thousand == 'Space')
-        $thousand = ' ';
+    if (!is_object($outlangs)) {
+            $outlangs = $langs;
+    }
+
+    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } else if ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
     //print "amount=".$amount."-";
     $amount = str_replace(',', '.', $amount); // should be useless
@@ -4310,8 +4520,9 @@ 
     $end = '';
 
     // We increase nbdecimal if there is more decimal than asked (to not loose information)
-    if (dol_strlen($decpart) > $nbdecimal)
-        $nbdecimal = dol_strlen($decpart);
+    if (dol_strlen($decpart) > $nbdecimal) {
+            $nbdecimal = dol_strlen($decpart);
+    }
     // Si on depasse max
     if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {
         $nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;
@@ -4322,8 +4533,9 @@ 
     }
 
     // If force rounding
-    if ($forcerounding >= 0)
-        $nbdecimal = $forcerounding;
+    if ($forcerounding >= 0) {
+            $nbdecimal = $forcerounding;
+    }
 
     // Format number
     $output = number_format($amount, $nbdecimal, $dec, $thousand);
@@ -4334,13 +4546,14 @@ 
     // Add symbol of currency if requested
     $cursymbolbefore = $cursymbolafter = '';
     if ($currency_code) {
-        if ($currency_code == 'auto')
-            $currency_code = $conf->currency;
+        if ($currency_code == 'auto') {
+                    $currency_code = $conf->currency;
+        }
 
         $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');
-        if (in_array($currency_code, $listofcurrenciesbefore))
-            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
-        else {
+        if (in_array($currency_code, $listofcurrenciesbefore)) {
+                    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+        } else {
             $tmpcur = $outlangs->getCurrencySymbol($currency_code);
             $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);
         }
@@ -4374,14 +4587,17 @@ 
     // Decimal delimiter for PHP and database SQL requests must be '.'
     $dec = ',';
     $thousand = ' ';
-    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")
-        $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
-    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")
-        $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
-    if ($thousand == 'None')
-        $thousand = '';
-    elseif ($thousand == 'Space')
-        $thousand = ' ';
+    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } elseif ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
     // Convert value to universal number format (no thousand separator, '.' as decimal separator)
     if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format
@@ -4397,8 +4613,10 @@ 
         }
         //print "QQ".$amount.'<br>';
         // Now make replace (the main goal of function)
-        if ($thousand != ',' && $thousand != '.')
-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users
         $amount = str_replace(' ', '', $amount);  // To avoid spaces
         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
         $amount = str_replace($dec, '.', $amount);
@@ -4407,19 +4625,23 @@ 
     // Now, make a rounding if required
     if ($rounding) {
         $nbofdectoround = '';
-        if ($rounding == 'MU')
-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-        elseif ($rounding == 'MT')
-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
-        elseif ($rounding == 'MS')
-            $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
-        elseif (is_numeric($rounding))
-            $nbofdectoround = $rounding;
+        if ($rounding == 'MU') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+        } elseif ($rounding == 'MT') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+        } elseif ($rounding == 'MS') {
+                    $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+        } elseif (is_numeric($rounding)) {
+                    $nbofdectoround = $rounding;
+        }
         //print "RR".$amount.' - '.$nbofdectoround.'<br>';
-        if (dol_strlen($nbofdectoround))
-            $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
-        else
-            return 'ErrorBadParameterProvidedToFunction';
+        if (dol_strlen($nbofdectoround)) {
+                    $amount = round($amount, $nbofdectoround);
+        }
+        // $nbofdectoround can be 0.
+        else {
+                    return 'ErrorBadParameterProvidedToFunction';
+        }
         //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
         // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
         // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.
@@ -4433,8 +4655,10 @@ 
         //print "TT".$amount.'<br>';
         // Always make replace because each math function (like round) replace
         // with local values and we want a number that has a SQL string format x.y
-        if ($thousand != ',' && $thousand != '.')
-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users
         $amount = str_replace(' ', '', $amount);  // To avoid spaces
         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
         $amount = str_replace($dec, '.', $amount);
@@ -4493,8 +4717,9 @@ 
 {
     global $db, $conf, $mysoc;
 
-    if (empty($thirdparty_seller) || !is_object($thirdparty_seller))
-        $thirdparty_seller = $mysoc;
+    if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+            $thirdparty_seller = $mysoc;
+    }
 
     dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);
 
@@ -4512,37 +4737,43 @@ 
     // Some test to guess with no need to make database access
     if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
         if ($local == 1) {
-            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")
-                return 0;
-            if ($thirdparty_seller->id == $mysoc->id) {
-                if (!$thirdparty_buyer->localtax1_assuj)
-                    return 0;
+            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                            return 0;
             }
-            else {
-                if (!$thirdparty_seller->localtax1_assuj)
-                    return 0;
+            if ($thirdparty_seller->id == $mysoc->id) {
+                if (!$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {
+                if (!$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
             }
         }
 
         if ($local == 2) {
             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
-            if (!$mysoc->localtax2_assuj)
-                return 0;  // If main vat is 0, IRPF may be different than 0.
+            if (!$mysoc->localtax2_assuj) {
+                            return 0;
+            }
+            // If main vat is 0, IRPF may be different than 0.
             if ($thirdparty_seller->id == $mysoc->id) {
-                if (!$thirdparty_buyer->localtax2_assuj)
-                    return 0;
+                if (!$thirdparty_buyer->localtax2_assuj) {
+                                    return 0;
+                }
+            } else {
+                if (!$thirdparty_seller->localtax2_assuj) {
+                                    return 0;
+                }
             }
-            else {
-                if (!$thirdparty_seller->localtax2_assuj)
+        }
+    } else {
+        if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                    return 0;
+        }
+        if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
                     return 0;
-            }
         }
-    }
-    else {
-        if ($local == 1 && !$thirdparty_seller->localtax1_assuj)
-            return 0;
-        if ($local == 2 && !$thirdparty_seller->localtax2_assuj)
-            return 0;
     }
 
     // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4584,19 +4815,23 @@ 
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
     $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";
     $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-    if ($vatratecode)
-        $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority
-    else
-        $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+    if ($vatratecode) {
+            $sql .= " AND t.code ='" . $vatratecode . "'";
+    }
+    // If we have the code, we use it in priority
+    else {
+            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+    }
     dol_syslog("get_localtax", LOG_DEBUG);
     $resql = $db->query($sql);
 
     if ($resql) {
         $obj = $db->fetch_object($resql);
-        if ($local == 1)
-            return $obj->localtax1;
-        elseif ($local == 2)
-            return $obj->localtax2;
+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }
 
     return 0;
@@ -4642,10 +4877,11 @@ 
     $resql = $db->query($sql);
     if ($resql) {
         $obj = $db->fetch_object($resql);
-        if ($local == 1)
-            return $obj->localtax1;
-        elseif ($local == 2)
-            return $obj->localtax2;
+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }
 
     return 0;
@@ -4671,9 +4907,9 @@ 
     // Search local taxes
     $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
-    if ($firstparamisid)
-        $sql .= " WHERE t.rowid = " . (int) $vatrate;
-    else {
+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {
         $vatratecleaned = $vatrate;
         $vatratecode = '';
         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"
@@ -4686,19 +4922,22 @@ 
           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */
         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-        if ($vatratecode)
-            $sql .= " AND t.code = '" . $vatratecode . "'";
+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }
 
     $resql = $db->query($sql);
     if ($resql) {
         $obj = $db->fetch_object($resql);
-        if ($obj)
-            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
-        else
-            return array();
-    } else
-        dol_print_error($db);
+        if ($obj) {
+                    return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+        } else {
+                    return array();
+        }
+    } else {
+            dol_print_error($db);
+    }
 
     return array();
 }
@@ -4728,9 +4967,9 @@ 
     // Search local taxes
     $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
-    if ($firstparamisid)
-        $sql .= " WHERE t.rowid = " . (int) $vatrate;
-    else {
+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {
         $vatratecleaned = $vatrate;
         $vatratecode = '';
         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"
@@ -4739,13 +4978,17 @@ 
         }
 
         $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";
-        if ($mysoc->country_code == 'ES')
-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??
-        else
-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+        if ($mysoc->country_code == 'ES') {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+        }
+        // local tax in spain use the buyer country ??
+        else {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+        }
         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-        if ($vatratecode)
-            $sql .= " AND t.code = '" . $vatratecode . "'";
+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }
 
     $resql = $db->query($sql);
@@ -4791,17 +5034,17 @@ 
             if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
                 $product->get_buyprice($idprodfournprice, 0, 0, 0);
                 $ret = $product->vatrate_supplier;
-                if ($product->default_vat_code)
-                    $ret .= ' (' . $product->default_vat_code . ')';
-            }
-            else {
+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
+            } else {
                 $ret = $product->tva_tx;    // Default vat of product we defined
-                if ($product->default_vat_code)
-                    $ret .= ' (' . $product->default_vat_code . ')';
+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
             }
             $found = 1;
-        }
-        else {
+        } else {
             // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
             // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
         }
@@ -4821,14 +5064,18 @@ 
                 $obj = $db->fetch_object($resql);
                 if ($obj) {
                     $ret = $obj->vat_rate;
-                    if ($obj->default_vat_code)
-                        $ret .= ' (' . $obj->default_vat_code . ')';
+                    if ($obj->default_vat_code) {
+                                            $ret .= ' (' . $obj->default_vat_code . ')';
+                    }
                 }
                 $db->free($sql);
-            } else
-                dol_print_error($db);
-        } else
-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
+            } else {
+                            dol_print_error($db);
+            }
+        } else {
+                    $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+        }
+        // Forced value if autodetect fails
     }
 
     dol_syslog("get_product_vat_for_country: ret=" . $ret);
@@ -4883,13 +5130,15 @@ 
         if ($resql) {
             $obj = $db->fetch_object($resql);
             if ($obj) {
-                if ($local == 1)
-                    $ret = $obj->localtax1;
-                elseif ($local == 2)
-                    $ret = $obj->localtax2;
+                if ($local == 1) {
+                                    $ret = $obj->localtax1;
+                } elseif ($local == 2) {
+                                    $ret = $obj->localtax2;
+                }
             }
-        } else
-            dol_print_error($db);
+        } else {
+                    dol_print_error($db);
+        }
     }
 
     dol_syslog("get_product_localtax_for_country: ret=" . $ret);
@@ -4992,15 +5241,16 @@ 
     global $db;
 
     if ($idprodfournprice > 0) {
-        if (!class_exists('ProductFournisseur'))
-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+        if (!class_exists('ProductFournisseur')) {
+                    require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+        }
         $prodprice = new ProductFournisseur($db);
         $prodprice->fetch_product_fournisseur_price($idprodfournprice);
         return $prodprice->fourn_tva_npr;
-    }
-    elseif ($idprod > 0) {
-        if (!class_exists('Product'))
-            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+    } elseif ($idprod > 0) {
+        if (!class_exists('Product')) {
+                    require_once DOL_BASE_PATH . 'product/class/product.class.php';
+        }
         $prod = new Product($db);
         $prod->fetch($idprod);
         return $prod->tva_npr;
@@ -5026,30 +5276,35 @@ 
 {
     global $mysoc;
 
-    if (!is_object($thirdparty_seller))
-        return -1;
-    if (!is_object($thirdparty_buyer))
-        return -1;
+    if (!is_object($thirdparty_seller)) {
+            return -1;
+    }
+    if (!is_object($thirdparty_buyer)) {
+            return -1;
+    }
 
     if ($local == 1) { // Localtax 1
         if ($mysoc->country_code == 'ES') {
-            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)
-                return 0;
-        }
-        else {
+            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                            return 0;
+            }
+        } else {
             // Si vendeur non assujeti a Localtax1, localtax1 par default=0
-            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)
-                return 0;
-            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')
-                return 0;
+            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                            return 0;
+            }
         }
-    }
-    elseif ($local == 2) { //I Localtax 2
+    } elseif ($local == 2) { //I Localtax 2
         // Si vendeur non assujeti a Localtax2, localtax2 par default=0
-        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)
-            return 0;
-        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')
-            return 0;
+        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                    return 0;
+        }
+        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                    return 0;
+        }
     }
 
     if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {
@@ -5074,31 +5329,38 @@ 
     $classname = '';
     if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0
         $result = $langs->trans('yes');
-        if ($case == 1 || $case == 3)
-            $result = $langs->trans("Yes");
-        if ($case == 2)
-            $result = '<input type="checkbox" value="1" checked disabled>';
-        if ($case == 3)
-            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("Yes");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="1" checked disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+        }
 
         $classname = 'ok';
-    }
-    elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
+    } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
         $result = $langs->trans("no");
-        if ($case == 1 || $case == 3)
-            $result = $langs->trans("No");
-        if ($case == 2)
-            $result = '<input type="checkbox" value="0" disabled>';
-        if ($case == 3)
-            $result = '<input type="checkbox" value="0" disabled> ' . $result;
-
-        if ($color == 2)
-            $classname = 'ok';
-        else
-            $classname = 'error';
-    }
-    if ($color)
-        return '<font class="' . $classname . '">' . $result . '</font>';
+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("No");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="0" disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="0" disabled> ' . $result;
+        }
+
+        if ($color == 2) {
+                    $classname = 'ok';
+        } else {
+                    $classname = 'error';
+        }
+    }
+    if ($color) {
+            return '<font class="' . $classname . '">' . $result . '</font>';
+    }
     return $result;
 }
 
@@ -5124,23 +5386,27 @@ 
     $path = '';
 
     $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
-    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-        $arrayforoldpath[] = 'product';
+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+            $arrayforoldpath[] = 'product';
+    }
     if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
         // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-        if (empty($alpha))
-            $num = preg_replace('/([^0-9])/i', '', $num);
-        else
-            $num = preg_replace('/^.*\-/i', '', $num);
+        if (empty($alpha)) {
+                    $num = preg_replace('/([^0-9])/i', '', $num);
+        } else {
+                    $num = preg_replace('/^.*\-/i', '', $num);
+        }
         $num = substr("000" . $num, -$level);
-        if ($level == 1)
-            $path = substr($num, 0, 1);
-        if ($level == 2)
-            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
-        if ($level == 3)
-            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
-    }
-    else {
+        if ($level == 1) {
+                    $path = substr($num, 0, 1);
+        }
+        if ($level == 2) {
+                    $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+        if ($level == 3) {
+                    $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+    } else {
         // TODO
         // We will enhance here a common way of forging path for document storage
         // Here, object->id, object->ref and modulepart are required.
@@ -5151,8 +5417,9 @@ 
         }
     }
 
-    if (empty($withoutslash) && !empty($path))
-        $path .= '/';
+    if (empty($withoutslash) && !empty($path)) {
+            $path .= '/';
+    }
 
     return $path;
 }
@@ -5172,8 +5439,9 @@ 
     dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);
 
     $dir_osencoded = dol_osencode($dir);
-    if (@is_dir($dir_osencoded))
-        return 0;
+    if (@is_dir($dir_osencoded)) {
+            return 0;
+    }
 
     $nberr = 0;
     $nbcreated = 0;
@@ -5188,12 +5456,15 @@ 
     $cdir = explode("/", $dir);
     $num = count($cdir);
     for ($i = 0; $i < $num; $i++) {
-        if ($i > 0)
-            $ccdir .= '/' . $cdir[$i];
-        else
-            $ccdir .= $cdir[$i];
-        if (preg_match("/^.:$/", $ccdir, $regs))
-            continue; // Si chemin Windows incomplet, on poursuit par rep suivant
+        if ($i > 0) {
+                    $ccdir .= '/' . $cdir[$i];
+        } else {
+                    $ccdir .= $cdir[$i];
+        }
+        if (preg_match("/^.:$/", $ccdir, $regs)) {
+                    continue;
+        }
+        // Si chemin Windows incomplet, on poursuit par rep suivant
 
 
 
@@ -5277,8 +5548,9 @@ 
  */
 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)
 {
-    if ($removelinefeed == 2)
-        $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+    if ($removelinefeed == 2) {
+            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+    }
     $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
     if ($strip_tags) {
@@ -5295,8 +5567,9 @@ 
     $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
 
     // Supprime aussi les retours
-    if ($removelinefeed == 1)
-        $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+    if ($removelinefeed == 1) {
+            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+    }
 
     // et les espaces doubles
     while (strpos($temp, "  ")) {
@@ -5382,18 +5655,21 @@ 
         if ($charset == 'UTF-8') {
             $pattern = '/(<br[^>]*>)/Uu';
         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-        else
-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.
+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.
         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
         $firstline = '';
         $i = 0;
         $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator
         while (($i < $nba) && ($i < ($nboflines * 2))) {
-            if ($i % 2 == 0)
-                $firstline .= $a[$i];
-            elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))
-                $firstline .= ($ishtml ? "<br>\n" : "\n");
+            if ($i % 2 == 0) {
+                            $firstline .= $a[$i];
+            } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                            $firstline .= ($ishtml ? "<br>\n" : "\n");
+            }
             $i++;
         }
         unset($a);
@@ -5442,15 +5718,18 @@ 
     $newstring = $stringtoencode;
     if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not
         $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-        if ($removelasteolbr)
-            $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/<br>$/i', '', $newstring);
+        }
+        // Remove last <br> (remove only last one)
         $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));
         $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
         $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));
-    }
-    else {
-        if ($removelasteolbr)
-            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+    } else {
+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+        }
+        // Remove last \n (may remove several)
         $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
     }
     // Other substitutions that htmlentities does not do
@@ -5552,8 +5831,9 @@ 
  */
 function dol_nboflines($s, $maxchar = 0)
 {
-    if ($s == '')
-        return 0;
+    if ($s == '') {
+            return 0;
+    }
     $arraystring = explode("\n", $s);
     $nb = count($arraystring);
 
@@ -5572,15 +5852,18 @@ 
 function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 {
     $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-    if (dol_textishtml($text))
-        $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+    if (dol_textishtml($text)) {
+            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+    }
 
     $text = strtr($text, $repTable);
     if ($charset == 'UTF-8') {
         $pattern = '/(<br[^>]*>)/Uu';
     } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-    else
-        $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.
+    else {
+            $pattern = '/(<br[^>]*>)/U';
+    }
+    // /U is to have UNGREEDY regex to limit to one html tag.
     $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
     $nblines = (int) floor((count($a) + 1) / 2);
@@ -5627,39 +5910,47 @@ 
 function dol_textishtml($msg, $option = 0)
 {
     if ($option == 1) {
-        if (preg_match('/<html/i', $msg))
-            return true;
-        elseif (preg_match('/<body/i', $msg))
-            return true;
-        elseif (preg_match('/<br/i', $msg))
-            return true;
+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br/i', $msg)) {
+                    return true;
+        }
         return false;
-    }
-    else {
-        if (preg_match('/<html/i', $msg))
-            return true;
-        elseif (preg_match('/<body/i', $msg))
-            return true;
-        elseif (preg_match('/<(b|em|i|u)>/i', $msg))
-            return true;
-        elseif (preg_match('/<br\/>/i', $msg))
-            return true;
-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))
-            return true;
-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))
-            return true;
-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))
-            return true;
-        elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))
-            return true; // must accept <img src="http://example.com/aaa.png" />
-        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))
-            return true; // must accept <a href="http://example.com/aaa.png" />
-        elseif (preg_match('/<h[0-9]>/i', $msg))
-            return true;
-        elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))
-            return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-        elseif (preg_match('/&#[0-9]{2,3};/i', $msg))
-            return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+    } else {
+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <img src="http://example.com/aaa.png" />
+        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <a href="http://example.com/aaa.png" />
+        elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                    return true;
+        }
+        // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+        elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                    return true;
+        }
+        // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 
         return false;
     }
@@ -5811,12 +6102,14 @@ 
             $birthday = dol_print_date($object->birth, 'day');
 
             $substitutionarray['__MEMBER_ID__'] = $object->id;
-            if (method_exists($object, 'getCivilityLabel'))
-                $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+            if (method_exists($object, 'getCivilityLabel')) {
+                            $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+            }
             $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;
             $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;
-            if (method_exists($object, 'getFullName'))
-                $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+            if (method_exists($object, 'getFullName')) {
+                            $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+            }
             $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;
             $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;
             $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;
@@ -5864,10 +6157,12 @@ 
                 $dateplannedstart = '';
                 $datenextexpiration = '';
                 foreach ($object->lines as $line) {
-                    if ($line->date_ouverture_prevue > $dateplannedstart)
-                        $dateplannedstart = $line->date_ouverture_prevue;
-                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))
-                        $datenextexpiration = $line->date_fin_prevue;
+                    if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                            $dateplannedstart = $line->date_ouverture_prevue;
+                    }
+                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                            $datenextexpiration = $line->date_fin_prevue;
+                    }
                 }
                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -5877,8 +6172,9 @@ 
 
             // Create dynamic tags for __EXTRAFIELD_FIELD__
             if ($object->table_element && $object->id > 0) {
-                if (!is_object($extrafields))
-                    $extrafields = new ExtraFields($db);
+                if (!is_object($extrafields)) {
+                                    $extrafields = new ExtraFields($db);
+                }
                 $extrafields->fetch_name_optionals_label($object->table_element, true);
 
                 if ($object->fetch_optionals() > 0) {
@@ -5899,12 +6195,15 @@ 
                 require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';
                 $outputlangs->loadLangs(array('paypal', 'other'));
                 $typeforonlinepayment = 'free';
-                if (is_object($object) && $object->element == 'commande')
-                    $typeforonlinepayment = 'order';
-                if (is_object($object) && $object->element == 'facture')
-                    $typeforonlinepayment = 'invoice';
-                if (is_object($object) && $object->element == 'member')
-                    $typeforonlinepayment = 'member';
+                if (is_object($object) && $object->element == 'commande') {
+                                    $typeforonlinepayment = 'order';
+                }
+                if (is_object($object) && $object->element == 'facture') {
+                                    $typeforonlinepayment = 'invoice';
+                }
+                if (is_object($object) && $object->element == 'member') {
+                                    $typeforonlinepayment = 'member';
+                }
                 $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);
                 $paymenturl = $url;
             }
@@ -5914,16 +6213,19 @@ 
 
             if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
                 $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-            } else
-                $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+            }
             if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {
                 $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-            } else
-                $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+            }
             if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {
                 $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-            } else
-                $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+            }
         }
     }
     if (empty($exclude) || !in_array('objectamount', $exclude)) {
@@ -5933,18 +6235,22 @@ 
         $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';
         $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
         $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
-        if ($onlykey != 2 || $mysoc->useLocalTax(1))
-            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
-        if ($onlykey != 2 || $mysoc->useLocalTax(2))
-            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+        }
 
         $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
         $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
         $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency)) : '';
-        if ($onlykey != 2 || $mysoc->useLocalTax(1))
-            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
-        if ($onlykey != 2 || $mysoc->useLocalTax(2))
-            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
 
         // TODO Add keys for foreign multicurrency
         // For backward compatibility
@@ -6014,23 +6320,27 @@ 
 {
     global $conf, $langs;
 
-    if (!is_array($substitutionarray))
-        return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+    if (!is_array($substitutionarray)) {
+            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+    }
 
-    if (empty($outputlangs))
-        $outputlangs = $langs;
+    if (empty($outputlangs)) {
+            $outputlangs = $langs;
+    }
 
     // Make substitution for language keys
     if (is_object($outputlangs)) {
         while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {
             $msgishtml = 0;
-            if (dol_textishtml($text, 1))
-                $msgishtml = 1;
+            if (dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 
             // If key is __(TranslationKey|langfile)__, then force load of langfile.lang
             $tmp = explode('|', $reg[1]);
-            if (!empty($tmp[1]))
-                $outputlangs->load($tmp[1]);
+            if (!empty($tmp[1])) {
+                            $outputlangs->load($tmp[1]);
+            }
 
             $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
         }
@@ -6040,23 +6350,29 @@ 
     // it is also converted.
     while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {
         $msgishtml = 0;
-        if (dol_textishtml($text, 1))
-            $msgishtml = 1;
+        if (dol_textishtml($text, 1)) {
+                    $msgishtml = 1;
+        }
 
         $keyfound = $reg[1];
-        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))
-            $newval = '*****forbidden*****';
-        else
-            $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                    $newval = '*****forbidden*****';
+        } else {
+                    $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+        }
         $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);
     }
 
     // Make substitition for array $substitutionarray
     foreach ($substitutionarray as $key => $value) {
-        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))
-            $value = '';  // Protection
-        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))
-            $value = ''; // Protection
+        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection
+        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection
 
         $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
     }
@@ -6102,8 +6418,9 @@ 
         $dir = dol_buildpath($reldir, 0);
 
         // Check if directory exists
-        if (!dol_is_dir($dir))
-            continue;
+        if (!dol_is_dir($dir)) {
+                    continue;
+        }
 
         $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
         foreach ($substitfiles as $substitfile) {
@@ -6115,8 +6432,9 @@ 
                 require_once $dir . $substitfile['name'];
                 // Call the user's function, and only if it is defined
                 $function_name = $module . "_" . $callfunc;
-                if (function_exists($function_name))
-                    $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                if (function_exists($function_name)) {
+                                    $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                }
             }
         }
     }
@@ -6152,8 +6470,9 @@ 
 
     $out = '';
 
-    if (!is_object($outputlangs))
-        $outputlangs = $langs;
+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
 
     if ($date_start && $date_end) {
         $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');
@@ -6182,20 +6501,22 @@ 
 
     $ret = '';
     // If order not defined, we use the setup
-    if ($nameorder < 0)
-        $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+    if ($nameorder < 0) {
+            $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+    }
     if ($nameorder && ((string) $nameorder != '2')) {
         $ret .= $firstname;
-        if ($firstname && $lastname)
-            $ret .= ' ';
+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $lastname;
-    }
-    else if ($nameorder == 2) {
+    } else if ($nameorder == 2) {
         $ret .= $firstname;
     } else {
         $ret .= $lastname;
-        if ($firstname && $lastname)
-            $ret .= ' ';
+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $firstname;
     }
     return $ret;
@@ -6215,13 +6536,14 @@ 
 {
     //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
     if (!is_array($mesgs)) {  // If mesgs is a string
-        if ($mesgs)
-            $_SESSION['dol_events'][$style][] = $mesgs;
-    }
-    else {      // If mesgs is an array
+        if ($mesgs) {
+                    $_SESSION['dol_events'][$style][] = $mesgs;
+        }
+    } else {      // If mesgs is an array
         foreach ($mesgs as $mesg) {
-            if ($mesg)
-                $_SESSION['dol_events'][$style][] = $mesg;
+            if ($mesg) {
+                            $_SESSION['dol_events'][$style][] = $mesg;
+            }
         }
     }
 }
@@ -6241,13 +6563,16 @@ 
     if (empty($mesg) && empty($mesgs)) {
         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
     } else {
-        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))
-            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
-        if (empty($mesgs))
-            setEventMessage($mesg, $style);
-        else {
-            if (!empty($mesg) && !in_array($mesg, $mesgs))
-                setEventMessage($mesg, $style); // Add message string if not already into array
+        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                    dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+        }
+        if (empty($mesgs)) {
+                    setEventMessage($mesg, $style);
+        } else {
+            if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                            setEventMessage($mesg, $style);
+            }
+            // Add message string if not already into array
             setEventMessage($mesgs, $style);
         }
     }
@@ -6266,22 +6591,25 @@ 
 {
     // Show mesgs
     if (isset($_SESSION['dol_events']['mesgs'])) {
-        if (empty($disabledoutputofmessages))
-            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+        }
         unset($_SESSION['dol_events']['mesgs']);
     }
 
     // Show errors
     if (isset($_SESSION['dol_events']['errors'])) {
-        if (empty($disabledoutputofmessages))
-            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+        }
         unset($_SESSION['dol_events']['errors']);
     }
 
     // Show warnings
     if (isset($_SESSION['dol_events']['warnings'])) {
-        if (empty($disabledoutputofmessages))
-            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+        }
         unset($_SESSION['dol_events']['warnings']);
     }
 }
@@ -6322,8 +6650,9 @@ 
             foreach ($mesgarray as $message) {
                 $ret++;
                 $out .= $langs->trans($message);
-                if ($ret < count($mesgarray))
-                    $out .= "<br>\n";
+                if ($ret < count($mesgarray)) {
+                                    $out .= "<br>\n";
+                }
             }
         }
         if ($mesgstring) {
@@ -6389,8 +6718,9 @@ 
  */
 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)
 {
-    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))
-        return;
+    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+            return;
+    }
 
     $iserror = 0;
     $iswarning = 0;
@@ -6405,14 +6735,17 @@ 
                 break;
             }
         }
-    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))
-        $iserror++;
-    else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))
-        $iswarning++;
-    if ($style == 'error')
-        $iserror++;
-    if ($style == 'warning')
-        $iswarning++;
+    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+            $iserror++;
+    } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+            $iswarning++;
+    }
+    if ($style == 'error') {
+            $iserror++;
+    }
+    if ($style == 'warning') {
+            $iswarning++;
+    }
 
     if ($iserror || $iswarning) {
         // Remove div from texts
@@ -6431,9 +6764,10 @@ 
             $mesgarray = $newmesgarray;
         }
         print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-    } else
-        print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
-}
+    } else {
+            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+    }
+    }
 
 /**
  *  Print formated error messages to output (Used to show messages on html output).
@@ -6473,15 +6807,17 @@ 
         $sizearray = count($array);
         if ($sizearray > 0) {
             $temp = array();
-            foreach (array_keys($array) as $key)
-                $temp[$key] = $array[$key][$index];
+            foreach (array_keys($array) as $key) {
+                            $temp[$key] = $array[$key][$index];
+            }
 
-            if (!$natsort)
-                ($order == 'asc') ? asort($temp) : arsort($temp);
-            else {
+            if (!$natsort) {
+                            ($order == 'asc') ? asort($temp) : arsort($temp);
+            } else {
                 ($case_sensitive) ? natsort($temp) : natcasesort($temp);
-                if ($order != 'asc')
-                    $temp = array_reverse($temp, true);
+                if ($order != 'asc') {
+                                    $temp = array_reverse($temp, true);
+                }
             }
 
             $sorted = array();
@@ -6507,23 +6843,38 @@ 
     // We must use here a binary strlen function (so not dol_strlen)
     $strLength = dol_strlen($str);
     for ($i = 0; $i < $strLength; $i++) {
-        if (ord($str[$i]) < 0x80)
-            continue; // 0bbbbbbb
-        elseif ((ord($str[$i]) & 0xE0) == 0xC0)
-            $n = 1; // 110bbbbb
-        elseif ((ord($str[$i]) & 0xF0) == 0xE0)
-            $n = 2; // 1110bbbb
-        elseif ((ord($str[$i]) & 0xF8) == 0xF0)
-            $n = 3; // 11110bbb
-        elseif ((ord($str[$i]) & 0xFC) == 0xF8)
-            $n = 4; // 111110bb
-        elseif ((ord($str[$i]) & 0xFE) == 0xFC)
-            $n = 5; // 1111110b
-        else
-            return false; // Does not match any model
+        if (ord($str[$i]) < 0x80) {
+                    continue;
+        }
+        // 0bbbbbbb
+        elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                    $n = 1;
+        }
+        // 110bbbbb
+        elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                    $n = 2;
+        }
+        // 1110bbbb
+        elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                    $n = 3;
+        }
+        // 11110bbb
+        elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                    $n = 4;
+        }
+        // 111110bb
+        elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                    $n = 5;
+        }
+        // 1111110b
+        else {
+                    return false;
+        }
+        // Does not match any model
         for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
-            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
-                return false;
+            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                            return false;
+            }
         }
     }
     return true;
@@ -6541,15 +6892,21 @@ 
     global $conf;
 
     $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0
-    if (empty($tmp) && !empty($_SERVER["WINDIR"]))
-        $tmp = 'iso-8859-1'; // By default for windows
-    if (empty($tmp))
-        $tmp = 'utf-8';          // By default for other
-    if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING))
-        $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
-
-    if ($tmp == 'iso-8859-1')
-        return utf8_decode($str);
+    if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+            $tmp = 'iso-8859-1';
+    }
+    // By default for windows
+    if (empty($tmp)) {
+            $tmp = 'utf-8';
+    }
+    // By default for other
+    if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+            $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+    }
+
+    if ($tmp == 'iso-8859-1') {
+            return utf8_decode($str);
+    }
     return $str;
 }
 
@@ -6571,8 +6928,9 @@ 
     global $cache_codes;
 
     // If key empty
-    if ($key == '')
-        return '';
+    if ($key == '') {
+            return '';
+    }
 
     // Check in cache
     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''
@@ -6584,20 +6942,21 @@ 
     $sql = "SELECT " . $fieldid . " as valuetoget";
     $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;
     $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";
-    if (!empty($entityfilter))
-        $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+    if (!empty($entityfilter)) {
+            $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+    }
 
     $resql = $db->query($sql);
     if ($resql) {
         $obj = $db->fetch_object($resql);
-        if ($obj)
-            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
-        else
-            $cache_codes[$tablename][$key][$fieldid] = '';
+        if ($obj) {
+                    $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+        } else {
+                    $cache_codes[$tablename][$key][$fieldid] = '';
+        }
         $db->free($resql);
         return $cache_codes[$tablename][$key][$fieldid];
-    }
-    else {
+    } else {
         return -1;
     }
 }
@@ -6644,16 +7003,17 @@ 
     global $soc;       // For backward compatibility
     //print $s."<br>\n";
     if ($returnvalue) {
-        if ($hideerrors)
-            return @eval('return ' . $s . ';');
-        else
-            return eval('return ' . $s . ';');
-    }
-    else {
-        if ($hideerrors)
-            @eval($s);
-        else
-            eval($s);
+        if ($hideerrors) {
+                    return @eval('return ' . $s . ';');
+        } else {
+                    return eval('return ' . $s . ';');
+        }
+    } else {
+        if ($hideerrors) {
+                    @eval($s);
+        } else {
+                    eval($s);
+        }
     }
 }
 
@@ -6679,8 +7039,9 @@ 
 {
     global $langs;
 
-    if (empty($codelang))
-        return '';
+    if (empty($codelang)) {
+            return '';
+    }
 
     if ($codelang == 'auto') {
         return '<span class="fa fa-globe"></span>';
@@ -6694,9 +7055,9 @@ 
         'sv_SV' => 'se'
     );
 
-    if (isset($langtocountryflag[$codelang]))
-        $flagImage = $langtocountryflag[$codelang];
-    else {
+    if (isset($langtocountryflag[$codelang])) {
+            $flagImage = $langtocountryflag[$codelang];
+    } else {
         $tmparray = explode('_', $codelang);
         $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
     }
@@ -6714,15 +7075,20 @@ 
 {
     global $mysoc;
 
-    if (strtoupper($countrycode) == 'MQ')
-        return 'fr_CA';
-    if (strtoupper($countrycode) == 'SE')
-        return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
+    if (strtoupper($countrycode) == 'MQ') {
+            return 'fr_CA';
+    }
+    if (strtoupper($countrycode) == 'SE') {
+            return 'sv_SE';
+    }
+    // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
     if (strtoupper($countrycode) == 'CH') {
-        if ($mysoc->country_code == 'FR')
-            return 'fr_CH';
-        if ($mysoc->country_code == 'DE')
-            return 'de_CH';
+        if ($mysoc->country_code == 'FR') {
+                    return 'fr_CH';
+        }
+        if ($mysoc->country_code == 'DE') {
+                    return 'de_CH';
+        }
     }
 
     // Locale list taken from:
@@ -6900,8 +7266,9 @@ 
     );
 
     $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);
-    if (in_array($buildprimarykeytotest, $locales))
-        return strtolower($countrycode) . '_' . strtoupper($countrycode);
+    if (in_array($buildprimarykeytotest, $locales)) {
+            return strtolower($countrycode) . '_' . strtoupper($countrycode);
+    }
 
     foreach ($locales as $locale) {
         $locale_language = locale_get_primary_language($locale);
@@ -6955,18 +7322,21 @@ 
 
             if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {
                 if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
-                    if ($values[0] != $type)
-                        continue;
+                    if ($values[0] != $type) {
+                                            continue;
+                    }
 
                     if (verifCond($values[4])) {
-                        if ($values[3])
-                            $langs->load($values[3]);
+                        if ($values[3]) {
+                                                    $langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
                             $substitutionarray = array();
                             complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));
                             $label = make_substitutions($reg[1], $substitutionarray);
-                        } else
-                            $label = $langs->trans($values[2]);
+                        } else {
+                                                    $label = $langs->trans($values[2]);
+                        }
 
                         //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
                         $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);
@@ -6974,30 +7344,32 @@ 
                         $head[$h][2] = str_replace('+', '', $values[1]);
                         $h++;
                     }
-                }
-                else if (count($values) == 5) {       // deprecated
+                } else if (count($values) == 5) {       // deprecated
                     dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
-                    if ($values[0] != $type)
-                        continue;
-                    if ($values[3])
-                        $langs->load($values[3]);
+                    if ($values[0] != $type) {
+                                            continue;
+                    }
+                    if ($values[3]) {
+                                            $langs->load($values[3]);
+                    }
                     if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
                         $substitutionarray = array();
                         complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));
                         $label = make_substitutions($reg[1], $substitutionarray);
-                    } else
-                        $label = $langs->trans($values[2]);
+                    } else {
+                                            $label = $langs->trans($values[2]);
+                    }
 
                     $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
                     $head[$h][1] = $label;
                     $head[$h][2] = str_replace('+', '', $values[1]);
                     $h++;
                 }
-            }
-            else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {
-                if ($values[0] != $type)
-                    continue;
+            } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {
+                if ($values[0] != $type) {
+                                    continue;
+                }
                 $tabname = str_replace('-', '', $values[1]);
                 foreach ($head as $key => $val) {
                     $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);
@@ -7039,10 +7411,11 @@ 
     global $action;
     global $micro_start_time;
 
-    if ($zone == 'private')
-        print "\n" . '<!-- Common footer for private page -->' . "\n";
-    else
-        print "\n" . '<!-- Common footer for public page -->' . "\n";
+    if ($zone == 'private') {
+            print "\n" . '<!-- Common footer for private page -->' . "\n";
+    } else {
+            print "\n" . '<!-- Common footer for public page -->' . "\n";
+    }
 
     // A div to store page_y POST parameter so we can read it using javascript
     print "\n<!-- A div to store page_y POST paramater -->\n";
@@ -7051,8 +7424,9 @@ 
     $parameters = array();
     $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks
     if (empty($reshook)) {
-        if (!empty($conf->global->MAIN_HTML_FOOTER))
-            print $conf->global->MAIN_HTML_FOOTER . "\n";
+        if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+                    print $conf->global->MAIN_HTML_FOOTER . "\n";
+        }
 
         print "\n";
         if (!empty($conf->use_javascript_ajax)) {
@@ -7075,8 +7449,9 @@ 
                 print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";
                 $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);
                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
@@ -7087,14 +7462,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);
                             $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;
+                        } else {
+                                                    $qualified = 1;
+                        }
 
                         if ($qualified) {
                             foreach ($defval as $paramkey => $paramval) {
@@ -7113,14 +7491,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);
                             $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;
+                        } else {
+                                                    $qualified = 1;
+                        }
 
                         if ($qualified) {
                             foreach ($defval as $paramkey => $paramval) {
@@ -7159,8 +7540,9 @@ 
                 print "\n";
                 print "/* JS CODE TO ENABLE to add memory info */\n";
                 print 'window.console && console.log("';
-                if (!empty($conf->global->MEMCACHED_SERVER))
-                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';
+                if (!empty($conf->global->MEMCACHED_SERVER)) {
+                                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';
+                }
                 print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');
                 if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
                     $micro_end_time = microtime(true);
@@ -7290,8 +7672,9 @@ 
 
     $crits = explode(' ', $value);
     $res = '';
-    if (!is_array($fields))
-        $fields = array($fields);
+    if (!is_array($fields)) {
+            $fields = array($fields);
+    }
 
     $nboffields = count($fields);
     $end2 = count($crits);
@@ -7354,8 +7737,9 @@ 
                 $tmpcrits = explode('|', $crit);
                 $i3 = 0;
                 foreach ($tmpcrits as $tmpcrit) {
-                    if (empty($tmpcrit))
-                        continue;
+                    if (empty($tmpcrit)) {
+                                            continue;
+                    }
 
                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
@@ -7391,8 +7775,9 @@ 
             }
             $i++;
         }
-        if ($newres)
-            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+        if ($newres) {
+                    $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+        }
         $j++;
     }
     $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";
@@ -7432,29 +7817,37 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {
     $dirName = dirname($file);
-    if ($dirName == '.')
-        $dirName = '';
+    if ($dirName == '.') {
+            $dirName = '';
+    }
 
     $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case
     $fileName = basename($fileName);
 
-    if (empty($extImgTarget))
-        $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
-    if (empty($extImgTarget))
-        $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
-    if (empty($extImgTarget))
-        $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
-    if (empty($extImgTarget))
-        $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
-    if (empty($extImgTarget))
-        $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+    }
 
-    if (!$extImgTarget)
-        return $file;
+    if (!$extImgTarget) {
+            return $file;
+    }
 
     $subdir = '';
-    if ($extName)
-        $subdir = 'thumbs/';
+    if ($extName) {
+            $subdir = 'thumbs/';
+    }
 
     return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb
 }
@@ -7472,8 +7865,9 @@ 
 {
     global $conf, $langs;
 
-    if (empty($conf->use_javascript_ajax))
-        return '';
+    if (empty($conf->use_javascript_ajax)) {
+            return '';
+    }
 
     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
     //$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -7481,18 +7875,20 @@ 
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
 
     if ($alldata == 1) {
-        if ($num_mime !== false)
-            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
-        else
-            return array();
+        if ($num_mime !== false) {
+                    return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+        } else {
+                    return array();
+        }
     }
 
     // old behavior
-    if ($num_mime !== false)
-        return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
-    else
-        return '';
-}
+    if ($num_mime !== false) {
+            return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
+    } else {
+            return '';
+    }
+    }
 
 /**
  * Make content of an input box selected when we click into input field.
@@ -7509,8 +7905,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-    if ($addlink)
-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+    if ($addlink) {
+            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+    }
     return $out;
 }
 
@@ -7892,8 +8289,9 @@ 
     if (!isset($dictvalues[$tablename])) {
         $dictvalues[$tablename] = array();
         $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';
-        if ($checkentity)
-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+        if ($checkentity) {
+                    $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+        }
 
         $resql = $db->query($sql);
         if ($resql) {
@@ -7905,11 +8303,14 @@ 
         }
     }
 
-    if (!empty($dictvalues[$tablename][$id]))
-        return $dictvalues[$tablename][$id]->{$field}; // Found
+    if (!empty($dictvalues[$tablename][$id])) {
+            return $dictvalues[$tablename][$id]->{$field};
+    }
+    // Found
     else { // Not found
-        if ($id > 0)
-            return $id;
+        if ($id > 0) {
+                    return $id;
+        }
         return '';
     }
 }
@@ -7939,8 +8340,9 @@ 
             $b = hexdec($hexb);
         }
         $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-        if ($bright > 0.6)
-            $res = 1;
+        if ($bright > 0.6) {
+                    $res = 1;
+        }
     }
     return $res;
 }
@@ -7959,8 +8361,10 @@ 
 
     //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
     //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-    if (empty($menuentry['enabled']))
-        return 0; // Entry disabled by condition
+    if (empty($menuentry['enabled'])) {
+            return 0;
+    }
+    // Entry disabled by condition
     if ($type_user && $menuentry['module']) {
         $tmploops = explode('|', $menuentry['module']);
         $found = 0;
@@ -7970,15 +8374,23 @@ 
                 break;
             }
         }
-        if (!$found)
-            return 0; // Entry is for menus all excluded to external users
+        if (!$found) {
+                    return 0;
+        }
+        // Entry is for menus all excluded to external users
+    }
+    if (!$menuentry['perms'] && $type_user) {
+            return 0;
+    }
+    // No permissions and user is external
+    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+            return 0;
+    }
+    // No permissions and option to hide when not allowed, even for internal user, is on
+    if (!$menuentry['perms']) {
+            return 2;
     }
-    if (!$menuentry['perms'] && $type_user)
-        return 0;            // No permissions and user is external
-    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
-        return 0; // No permissions and option to hide when not allowed, even for internal user, is on
-    if (!$menuentry['perms'])
-        return 2;               // No permissions and user is external
+    // No permissions and user is external
     return 1;
 }