alxarafe / alixar

dolibarr/htdocs/admin/translation.php

Braces +23 added lines, -12 removed lines

@@ -32,8 +32,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "products", "admin", "sms", "other", "errors"));
 
-if (!$user->admin)
+if (!$user->admin) {
     accessforbidden();
+}
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'alpha');
@@ -55,10 +56,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
     $sortfield = 'lang,transkey';
-if (!$sortorder)
+}
+if (!$sortorder) {
     $sortorder = 'ASC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admintranslation', 'globaladmin'));
@@ -78,8 +81,9 @@ 
 
 $parameters = array('socid' => $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');
+}
 
 include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
@@ -219,18 +223,24 @@ 
 
 print '<br>';
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
     $param .= '&contextpage=' . $contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit)
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
     $param .= '&limit=' . $limit;
-if ($optioncss != '')
+}
+if ($optioncss != '') {
     $param .= '&optioncss=' . $optioncss;
-if ($langcode)
+}
+if ($langcode) {
     $param .= '&langcode=' . urlencode($langcode);
-if ($transkey)
+}
+if ($transkey) {
     $param .= '&transkey=' . urlencode($transkey);
-if ($transvalue)
+}
+if ($transvalue) {
     $param .= '&transvalue=' . urlencode($transvalue);
+}
 
 
 print '<form action="' . $_SERVER["PHP_SELF"] . ((empty($user->entity) && $debug) ? '?debug=1' : '') . '" method="POST">';
@@ -255,8 +265,9 @@ 
         $disabled = ' disabled="disabled"';
     }
     $disablededit = '';
-    if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-        $disablededit = ' disabled';
+    if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
+            $disablededit = ' disabled';
+    }
 
     print '<div class="justify"><span class="opacitymedium">';
     print img_info() . ' ' . $langs->trans("SomeTranslationAreUncomplete");

dolibarr/htdocs/admin/company.php

Braces +67 added lines, -47 removed lines

@@ -59,8 +59,9 @@ 
 
 $parameters = array();
 $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');
+}
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha')) || ($action == 'updateedit')) {
     $tmparray = getCountry(GETPOST('country_id', 'int'), 'all', $db, $langs, 0);
@@ -116,20 +117,22 @@ 
                         if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg)) {
                             $imgThumbSmall = $reg[1];    // Save only basename
                             dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-                        } else
-                            dol_syslog($imgThumbSmall);
+                        } else {
+                                                    dol_syslog($imgThumbSmall);
+                        }
 
                         // Create mini thumb, Used on menu or for setup page for example
                         $imgThumbMini = vignette($dirforimage . $original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
                         if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg)) {
                             $imgThumbMini = $reg[1];     // Save only basename
                             dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-                        } else
-                            dol_syslog($imgThumbMini);
-                    } else
-                        dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
-                }
-                else if (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
+                        } else {
+                                                    dol_syslog($imgThumbMini);
+                        }
+                    } else {
+                                            dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
+                    }
+                } else if (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
                     $error++;
                     $langs->load("errors");
                     $tmparray = explode(':', $result);
@@ -221,21 +224,22 @@ 
             if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg)) {
                 $imgThumbSmall = $reg[1];   // Save only basename
                 dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-            } else
-                dol_syslog($imgThumbSmall);
+            } else {
+                            dol_syslog($imgThumbSmall);
+            }
 
             // Create mini thumbs. Used on menu or for setup page for example
             $imgThumbMini = vignette($conf->mycompany->dir_output . '/logos/' . $_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
             if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbMini, $reg)) {
                 $imgThumbMini = $reg[1];   // Save only basename
                 dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-            } else
-                dol_syslog($imgThumbMini);
+            } else {
+                            dol_syslog($imgThumbMini);
+            }
 
             header("Location: " . $_SERVER["PHP_SELF"]);
             exit;
-        }
-        else {
+        } else {
             $error++;
             $langs->load("errors");
             setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -253,20 +257,23 @@ 
     require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
     $logofile = $conf->mycompany->dir_output . '/logos/' . $mysoc->logo;
-    if ($mysoc->logo != '')
-        dol_delete_file($logofile);
+    if ($mysoc->logo != '') {
+            dol_delete_file($logofile);
+    }
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO", $conf->entity);
     $mysoc->logo = '';
 
     $logosmallfile = $conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small;
-    if ($mysoc->logo_small != '')
-        dol_delete_file($logosmallfile);
+    if ($mysoc->logo_small != '') {
+            dol_delete_file($logosmallfile);
+    }
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL", $conf->entity);
     $mysoc->logo_small = '';
 
     $logominifile = $conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini;
-    if ($mysoc->logo_mini != '')
-        dol_delete_file($logominifile);
+    if ($mysoc->logo_mini != '') {
+            dol_delete_file($logominifile);
+    }
     dolibarr_del_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI", $conf->entity);
     $mysoc->logo_mini = '';
 }
@@ -337,8 +344,9 @@ 
     print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td><td class="maxwidthonsmartphone">';
     //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
     print $form->select_country($mysoc->country_id, 'country_id');
-    if ($user->admin)
-        print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+    if ($user->admin) {
+            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+    }
     print '</td></tr>' . "\n";
 
 
@@ -553,8 +561,9 @@ 
     print '<td colspan="2">';
     print "<table>";
     print "<tr><td><label for=\"use_vat\">" . $langs->trans("VATIsUsedDesc") . "</label></td></tr>";
-    if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+    if ($mysoc->country_code == 'FR') {
+            print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+    }
     print "</table>";
     print "</td></tr>\n";
 
@@ -563,8 +572,9 @@ 
     print '<td colspan="2">';
     print "<table>";
     print "<tr><td><label for=\"no_vat\">" . $langs->trans("VATIsNotUsedDesc") . "</label></td></tr>";
-    if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+    if ($mysoc->country_code == 'FR') {
+            print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+    }
     print "</table>";
     print "</td></tr>\n";
 
@@ -740,8 +750,9 @@ 
     print '<tr class="oddeven"><td>' . $langs->trans("Web") . '</td><td>';
     $arrayofurl = preg_split('/\s/', $conf->global->MAIN_INFO_SOCIETE_WEB);
     foreach ($arrayofurl as $urltoshow) {
-        if ($urltoshow)
-            print dol_print_url($urltoshow, '_blank', 80);
+        if ($urltoshow) {
+                    print dol_print_url($urltoshow, '_blank', 80);
+        }
     }
     print '</td></tr>';
 
@@ -756,8 +767,9 @@ 
     print '<tr class="oddeven"><td>' . $langs->trans("Logo") . '</td><td>';
 
     $tagtd = 'tagtd ';
-    if ($conf->browser->layout == 'phone')
-        $tagtd = '';
+    if ($conf->browser->layout == 'phone') {
+            $tagtd = '';
+    }
     print '<div class="tagtable centpercent"><div class="tagtr inline-block centpercent valignmiddle"><div class="' . $tagtd . 'inline-block valignmiddle left">';
     print $mysoc->logo;
     print '</div><div class="' . $tagtd . 'inline-block valignmiddle left">';
@@ -820,8 +832,9 @@ 
         if (!empty($conf->global->MAIN_INFO_SIREN)) {
             print $conf->global->MAIN_INFO_SIREN;
             $s = $mysoc->id_prof_url(1, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -835,8 +848,9 @@ 
         if (!empty($conf->global->MAIN_INFO_SIRET)) {
             print $conf->global->MAIN_INFO_SIRET;
             $s = $mysoc->id_prof_url(2, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -850,8 +864,9 @@ 
         if (!empty($conf->global->MAIN_INFO_APE)) {
             print $conf->global->MAIN_INFO_APE;
             $s = $mysoc->id_prof_url(3, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -865,8 +880,9 @@ 
         if (!empty($conf->global->MAIN_INFO_RCS)) {
             print $conf->global->MAIN_INFO_RCS;
             $s = $mysoc->id_prof_url(4, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -880,8 +896,9 @@ 
         if (!empty($conf->global->MAIN_INFO_PROFID5)) {
             print $conf->global->MAIN_INFO_PROFID5;
             $s = $mysoc->id_prof_url(5, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -895,8 +912,9 @@ 
         if (!empty($conf->global->MAIN_INFO_PROFID6)) {
             print $conf->global->MAIN_INFO_PROFID6;
             $s = $mysoc->id_prof_url(6, $mysoc);
-            if ($s)
-                print ' - ' . $s;
+            if ($s) {
+                            print ' - ' . $s;
+            }
         } else {
             print '&nbsp;';
         }
@@ -978,8 +996,9 @@ 
     print '<td colspan="2">';
     print "<table>";
     print "<tr><td><label for=\"use_vat\">" . $langs->trans("VATIsUsedDesc") . "</label></td></tr>";
-    if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+    if ($mysoc->country_code == 'FR') {
+            print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsUsedExampleFR") . "</i></td></tr>\n";
+    }
     print "</table>";
     print "</td></tr>\n";
 
@@ -989,8 +1008,9 @@ 
     print '<td colspan="2">';
     print "<table>";
     print "<tr><td><label=\"no_vat\">" . $langs->trans("VATIsNotUsedDesc") . "</label></td></tr>";
-    if ($mysoc->country_code == 'FR')
-        print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+    if ($mysoc->country_code == 'FR') {
+            print "<tr><td><i>" . $langs->trans("Example") . ': ' . $langs->trans("VATIsNotUsedExampleFR") . "</i></td></tr>\n";
+    }
     print "</table>";
     print "</td></tr>\n";
 

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

Braces +70 added lines, -49 removed lines

@@ -83,8 +83,9 @@ 
         }
 
         if ($mode == 'top') {
-            if (empty($noout))
-                print_start_menu_array_empty();
+            if (empty($noout)) {
+                            print_start_menu_array_empty();
+            }
 
             $usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));
 
@@ -110,22 +111,28 @@ 
 
             // Output menu entries
             foreach ($this->menu->liste as $menkey => $menuval) {
-                if (empty($noout))
-                    print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-                if (empty($noout))
-                    print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-                if (empty($noout))
-                    print_end_menu_entry_empty($menuval['enabled']);
+                if (empty($noout)) {
+                                    print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+                }
+                if (empty($noout)) {
+                                    print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+                }
+                if (empty($noout)) {
+                                    print_end_menu_entry_empty($menuval['enabled']);
+                }
             }
 
             $showmode = 1;
-            if (empty($noout))
-                print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
-            if (empty($noout))
-                print_end_menu_entry_empty($showmode);
+            if (empty($noout)) {
+                            print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
+            }
+            if (empty($noout)) {
+                            print_end_menu_entry_empty($showmode);
+            }
 
-            if (empty($noout))
-                print_end_menu_array_empty();
+            if (empty($noout)) {
+                            print_end_menu_array_empty();
+            }
 
             if ($mode == 'jmobile') {
                 $this->topmenu = clone $this->menu;
@@ -161,8 +168,9 @@ 
                     print '<a class="alilevel0" href="#">';
 
                     // Add font-awesome
-                    if ($val['level'] == 0 && $val['mainmenu'] == 'home')
-                        print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+                    if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+                                            print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+                    }
 
                     print $val['titre'];
                     print '</a>' . "\n";
@@ -205,12 +213,14 @@ 
                         print str_pad('', 1) . '<li class="lilevel1 ui-btn-icon-right ui-btn">';  // ui-btn to highlight on clic
                         print '<a href="' . $relurl . '">';
                         if ($langs->trans(ucfirst($val['mainmenu']) . "Dashboard") == ucfirst($val['mainmenu']) . "Dashboard") {  // No translation
-                            if (in_array($val['mainmenu'], array('cashdesk', 'websites')))
-                                print $langs->trans("Access");
-                            else
-                                print $langs->trans("Dashboard");
-                        } else
-                            print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");
+                            if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) {
+                                                            print $langs->trans("Access");
+                            } else {
+                                                            print $langs->trans("Dashboard");
+                            }
+                        } else {
+                                                    print $langs->trans(ucfirst($val['mainmenu']) . "Dashboard");
+                        }
                         print '</a>';
                         print '</li>' . "\n";
                     }
@@ -228,15 +238,17 @@ 
                     $lastlevel2 = array();
                     foreach ($submenu->liste as $key2 => $val2) {  // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
                         $showmenu = true;
-                        if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled']))
-                            $showmenu = false;
+                        if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+                                                    $showmenu = false;
+                        }
 
                         // If at least one parent is not enabled, we do not show any menu of all children
                         if ($val2['level'] > 0) {
                             $levelcursor = $val2['level'] - 1;
                             while ($levelcursor >= 0) {
-                                if ($lastlevel2[$levelcursor] != 'enabled')
-                                    $showmenu = false;
+                                if ($lastlevel2[$levelcursor] != 'enabled') {
+                                                                    $showmenu = false;
+                                }
                                 $levelcursor--;
                             }
                         }
@@ -249,8 +261,9 @@ 
                             $relurl2 = dol_buildpath($val2['url'], 1);
                             $canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
                             //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-                            if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php')))
-                                $relurl2 = '';
+                            if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+                                                            $relurl2 = '';
+                            }
 
                             $disabled = '';
                             if (!$val2['enabled']) {
@@ -259,8 +272,10 @@ 
 
                             print str_pad('', $val2['level'] + 1);
                             print '<li class="lilevel' . ($val2['level'] + 1);
-                            if ($val2['level'] == 0)
-                                print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+                            if ($val2['level'] == 0) {
+                                                            print ' ui-btn-icon-right ui-btn';
+                            }
+                            // ui-btn to highlight on clic
                             print $disabled . '">';  // ui-btn to highlight on clic
                             if ($relurl2) {
                                 if ($val2['enabled']) { // Allowed
@@ -283,10 +298,12 @@ 
                             //var_dump($lastlevel2);
                             print $val2['titre'];
                             if ($relurl2) {
-                                if ($val2['enabled']) // Allowed
-                                    print '</a>';
-                                else
+                                if ($val2['enabled']) {
+                                    // Allowed
                                     print '</a>';
+                                } else {
+                                                                    print '</a>';
+                                }
                             }
                             print '</li>' . "\n";
                         }
@@ -361,8 +378,9 @@ 
                         $blockvmenuopened = true;
                         $lastopened = true;
                         for ($j = ($i + 1); $j < $num; $j++) {
-                            if (empty($menu_array[$j]['level']))
-                                $lastopened = false;
+                            if (empty($menu_array[$j]['level'])) {
+                                                            $lastopened = false;
+                            }
                         }
                         $alt = 0;   // For menu manager "empty", we force to not have blockvmenufirst defined
                         $lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
@@ -393,29 +411,32 @@ 
 
                     if ($this->menu->liste[$i]['level'] > 0) {
                         $cssmenu = '';
-                        if ($this->menu->liste[$i]['url'])
-                            $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+                        if ($this->menu->liste[$i]['url']) {
+                                                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+                        }
 
                         print '<div class="menu_contenu' . $cssmenu . '">';
 
                         if ($this->menu->liste[$i]['enabled']) {
                             print $tabstring;
-                            if ($this->menu->liste[$i]['url'])
-                                print '<a class="vsmenu" href="' . dol_buildpath($this->menu->liste[$i]['url'], 1) . '"' . ($this->menu->liste[$i]['target'] ? ' target="' . $this->menu->liste[$i]['target'] . '"' : '') . '>';
-                            else
-                                print '<span class="vsmenu">';
-                            if ($this->menu->liste[$i]['url'])
-                                print $this->menu->liste[$i]['titre'] . '</a>';
-                            else
-                                print '</span>';
-                        }
-                        else {
+                            if ($this->menu->liste[$i]['url']) {
+                                                            print '<a class="vsmenu" href="' . dol_buildpath($this->menu->liste[$i]['url'], 1) . '"' . ($this->menu->liste[$i]['target'] ? ' target="' . $this->menu->liste[$i]['target'] . '"' : '') . '>';
+                            } else {
+                                                            print '<span class="vsmenu">';
+                            }
+                            if ($this->menu->liste[$i]['url']) {
+                                                            print $this->menu->liste[$i]['titre'] . '</a>';
+                            } else {
+                                                            print '</span>';
+                            }
+                        } else {
                             print $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $this->menu->liste[$i]['titre'] . '</font>';
                         }
 
                         // If title is not pure text and contains a table, no carriage return added
-                        if (!strstr($this->menu->liste[$i]['titre'], '<table'))
-                            print '<br>';
+                        if (!strstr($this->menu->liste[$i]['titre'], '<table')) {
+                                                    print '<br>';
+                        }
                         print '</div>' . "\n";
                     }
 

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

Braces +237 added lines, -169 removed lines

@@ -35,12 +35,15 @@ 
 function versiontostring($versionarray)
 {
     $string = '?';
-    if (isset($versionarray[0]))
-        $string = $versionarray[0];
-    if (isset($versionarray[1]))
-        $string .= '.' . $versionarray[1];
-    if (isset($versionarray[2]))
-        $string .= '.' . $versionarray[2];
+    if (isset($versionarray[0])) {
+            $string = $versionarray[0];
+    }
+    if (isset($versionarray[1])) {
+            $string .= '.' . $versionarray[1];
+    }
+    if (isset($versionarray[2])) {
+            $string .= '.' . $versionarray[2];
+    }
     return $string;
 }
 
@@ -68,26 +71,36 @@ 
     while ($level < $maxcount) {
         $operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
         $operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
-        if (preg_match('/alpha|dev/i', $operande1))
-            $operande1 = -5;
-        if (preg_match('/alpha|dev/i', $operande2))
-            $operande2 = -5;
-        if (preg_match('/beta$/i', $operande1))
-            $operande1 = -4;
-        if (preg_match('/beta$/i', $operande2))
-            $operande2 = -4;
-        if (preg_match('/beta([0-9])+/i', $operande1))
-            $operande1 = -3;
-        if (preg_match('/beta([0-9])+/i', $operande2))
-            $operande2 = -3;
-        if (preg_match('/rc$/i', $operande1))
-            $operande1 = -2;
-        if (preg_match('/rc$/i', $operande2))
-            $operande2 = -2;
-        if (preg_match('/rc([0-9])+/i', $operande1))
-            $operande1 = -1;
-        if (preg_match('/rc([0-9])+/i', $operande2))
-            $operande2 = -1;
+        if (preg_match('/alpha|dev/i', $operande1)) {
+                    $operande1 = -5;
+        }
+        if (preg_match('/alpha|dev/i', $operande2)) {
+                    $operande2 = -5;
+        }
+        if (preg_match('/beta$/i', $operande1)) {
+                    $operande1 = -4;
+        }
+        if (preg_match('/beta$/i', $operande2)) {
+                    $operande2 = -4;
+        }
+        if (preg_match('/beta([0-9])+/i', $operande1)) {
+                    $operande1 = -3;
+        }
+        if (preg_match('/beta([0-9])+/i', $operande2)) {
+                    $operande2 = -3;
+        }
+        if (preg_match('/rc$/i', $operande1)) {
+                    $operande1 = -2;
+        }
+        if (preg_match('/rc$/i', $operande2)) {
+                    $operande2 = -2;
+        }
+        if (preg_match('/rc([0-9])+/i', $operande1)) {
+                    $operande1 = -1;
+        }
+        if (preg_match('/rc([0-9])+/i', $operande2)) {
+                    $operande2 = -1;
+        }
         $level++;
         //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
         if ($operande1 < $operande2) {
@@ -167,10 +180,11 @@ 
     if ($fp) {
         while (!feof($fp)) {
             // Warning fgets with second parameter that is null or 0 hang.
-            if ($linelengthlimit > 0)
-                $buf = fgets($fp, $linelengthlimit);
-            else
-                $buf = fgets($fp);
+            if ($linelengthlimit > 0) {
+                            $buf = fgets($fp, $linelengthlimit);
+            } else {
+                            $buf = fgets($fp);
+            }
 
             // Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
             if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg)) {
@@ -178,8 +192,9 @@ 
 
                 // restrict on database type
                 if (!empty($reg[1])) {
-                    if (!preg_match('/' . preg_quote($reg[1]) . '/i', $db->type))
-                        $qualified = 0;
+                    if (!preg_match('/' . preg_quote($reg[1]) . '/i', $db->type)) {
+                                            $qualified = 0;
+                    }
                 }
 
                 // restrict on version
@@ -196,8 +211,9 @@ 
                             $dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
                             //var_dump($reg[2]);
                             //var_dump($dbcollation);
-                            if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation))
-                                $qualified = 0;
+                            if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) {
+                                                            $qualified = 0;
+                            }
                             //var_dump($qualified);
                         }
                     }
@@ -212,8 +228,10 @@ 
 
             // Add line buf to buffer if not a comment
             if ($nocommentremoval || !preg_match('/^\s*--/', $buf)) {
-                if (empty($nocommentremoval))
-                    $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
+                if (empty($nocommentremoval)) {
+                                    $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf);
+                }
+                //remove comment from a line that not start with -- before add it to the buffer
                 $buffer .= trim($buf);
             }
 
@@ -221,18 +239,19 @@ 
 
             if (preg_match('/;/', $buffer)) { // If string contains ';', it's end of a request string, we save it in arraysql.
                 // Found new request
-                if ($buffer)
-                    $arraysql[$i] = $buffer;
+                if ($buffer) {
+                                    $arraysql[$i] = $buffer;
+                }
                 $i++;
                 $buffer = '';
             }
         }
 
-        if ($buffer)
-            $arraysql[$i] = $buffer;
+        if ($buffer) {
+                    $arraysql[$i] = $buffer;
+        }
         fclose($fp);
-    }
-    else {
+    } else {
         dol_syslog("Admin.lib::run_sql failed to open file " . $sqlfile, LOG_ERR);
     }
 
@@ -251,16 +270,19 @@ 
                 if ($resql) {
                     $obj = $db->fetch_object($resql);
                     $listofmaxrowid[$table] = $obj->max;
-                    if (empty($listofmaxrowid[$table]))
-                        $listofmaxrowid[$table] = 0;
-                }
-                else {
-                    if (!$silent)
-                        print '<tr><td valign="top" colspan="2">';
-                    if (!$silent)
-                        print '<div class="error">' . $langs->trans("Failed to get max rowid for " . $table) . "</div></td>";
-                    if (!$silent)
-                        print '</tr>';
+                    if (empty($listofmaxrowid[$table])) {
+                                            $listofmaxrowid[$table] = 0;
+                    }
+                } else {
+                    if (!$silent) {
+                                            print '<tr><td valign="top" colspan="2">';
+                    }
+                    if (!$silent) {
+                                            print '<div class="error">' . $langs->trans("Failed to get max rowid for " . $table) . "</div></td>";
+                    }
+                    if (!$silent) {
+                                            print '</tr>';
+                    }
                     $error++;
                     break;
                 }
@@ -296,14 +318,16 @@ 
                 $sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
             }
 
-            if (!empty($handler))
-                $sql = preg_replace('/__HANDLER__/i', "'" . $handler . "'", $sql);
+            if (!empty($handler)) {
+                            $sql = preg_replace('/__HANDLER__/i', "'" . $handler . "'", $sql);
+            }
 
             $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
             // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
-            if (!$silent)
-                print '<tr><td class="tdtop">' . $langs->trans("Request") . ' ' . ($i + 1) . " sql='" . dol_htmlentities($newsql, ENT_NOQUOTES) . "'</td></tr>\n";
+            if (!$silent) {
+                            print '<tr><td class="tdtop">' . $langs->trans("Request") . ' ' . ($i + 1) . " sql='" . dol_htmlentities($newsql, ENT_NOQUOTES) . "'</td></tr>\n";
+            }
             dol_syslog('Admin.lib::run_sql Request ' . ($i + 1), LOG_DEBUG);
             $sqlmodified = 0;
 
@@ -335,12 +359,15 @@ 
             while (preg_match('/__([0-9]+)__/', $newsql, $reg)) {
                 $cursor = $reg[1];
                 if (empty($listofinsertedrowid[$cursor])) {
-                    if (!$silent)
-                        print '<tr><td valign="top" colspan="2">';
-                    if (!$silent)
-                        print '<div class="error">' . $langs->trans("FileIsNotCorrect") . "</div></td>";
-                    if (!$silent)
-                        print '</tr>';
+                    if (!$silent) {
+                                            print '<tr><td valign="top" colspan="2">';
+                    }
+                    if (!$silent) {
+                                            print '<div class="error">' . $langs->trans("FileIsNotCorrect") . "</div></td>";
+                    }
+                    if (!$silent) {
+                                            print '</tr>';
+                    }
                     $error++;
                     break;
                 }
@@ -350,13 +377,15 @@ 
                 $sqlmodified++;
             }
 
-            if ($sqlmodified)
-                dol_syslog('Admin.lib::run_sql New Request ' . ($i + 1), LOG_DEBUG);
+            if ($sqlmodified) {
+                            dol_syslog('Admin.lib::run_sql New Request ' . ($i + 1), LOG_DEBUG);
+            }
 
             $result = $db->query($newsql, $usesavepoint);
             if ($result) {
-                if (!$silent)
-                    print '<!-- Result = OK -->' . "\n";
+                if (!$silent) {
+                                    print '<!-- Result = OK -->' . "\n";
+                }
 
                 if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg)) {
                     $cursorinsert++;
@@ -370,8 +399,9 @@ 
                 // 	          print '<td align="right">OK</td>';
             } else {
                 $errno = $db->errno();
-                if (!$silent)
-                    print '<!-- Result = ' . $errno . ' -->' . "\n";
+                if (!$silent) {
+                                    print '<!-- Result = ' . $errno . ' -->' . "\n";
+                }
 
                 // Define list of errors we accept (array $okerrors)
                 $okerrors = array(// By default
@@ -389,39 +419,47 @@ 
                     'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
                     'DB_ERROR_22P02'
                 );
-                if ($okerror == 'none')
-                    $okerrors = array();
+                if ($okerror == 'none') {
+                                    $okerrors = array();
+                }
 
                 // Is it an error we accept
                 if (!in_array($errno, $okerrors)) {
-                    if (!$silent)
-                        print '<tr><td valign="top" colspan="2">';
-                    if (!$silent)
-                        print '<div class="error">' . $langs->trans("Error") . " " . $db->errno() . ": " . $newsql . "<br>" . $db->error() . "</div></td>";
-                    if (!$silent)
-                        print '</tr>' . "\n";
+                    if (!$silent) {
+                                            print '<tr><td valign="top" colspan="2">';
+                    }
+                    if (!$silent) {
+                                            print '<div class="error">' . $langs->trans("Error") . " " . $db->errno() . ": " . $newsql . "<br>" . $db->error() . "</div></td>";
+                    }
+                    if (!$silent) {
+                                            print '</tr>' . "\n";
+                    }
                     dol_syslog('Admin.lib::run_sql Request ' . ($i + 1) . " Error " . $db->errno() . " " . $newsql . "<br>" . $db->error(), LOG_ERR);
                     $error++;
                 }
             }
 
-            if (!$silent)
-                print '</tr>' . "\n";
+            if (!$silent) {
+                            print '</tr>' . "\n";
+            }
         }
     }
 
     if ($error == 0) {
-        if (!$silent)
-            print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
-        if (!$silent)
-            print '<td align="right">' . $langs->trans("OK") . '</td></tr>' . "\n";
+        if (!$silent) {
+                    print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
+        }
+        if (!$silent) {
+                    print '<td align="right">' . $langs->trans("OK") . '</td></tr>' . "\n";
+        }
         $ok = 1;
-    }
-    else {
-        if (!$silent)
-            print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
-        if (!$silent)
-            print '<td align="right"><font class="error">' . $langs->trans("KO") . '</font></td></tr>' . "\n";
+    } else {
+        if (!$silent) {
+                    print '<tr><td>' . $langs->trans("ProcessMigrateScript") . '</td>';
+        }
+        if (!$silent) {
+                    print '<td align="right"><font class="error">' . $langs->trans("KO") . '</font></td></tr>' . "\n";
+        }
         $ok = 0;
     }
 
@@ -449,11 +487,13 @@ 
 
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
     $sql .= " WHERE (" . $db->decrypt('name') . " = '" . $db->escape($name) . "'";
-    if (is_numeric($name))
-        $sql .= " OR rowid = '" . $db->escape($name) . "'";
+    if (is_numeric($name)) {
+            $sql .= " OR rowid = '" . $db->escape($name) . "'";
+    }
     $sql .= ")";
-    if ($entity >= 0)
-        $sql .= " AND entity = " . $entity;
+    if ($entity >= 0) {
+            $sql .= " AND entity = " . $entity;
+    }
 
     dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -490,8 +530,9 @@ 
     $resql = $db->query($sql);
     if ($resql) {
         $obj = $db->fetch_object($resql);
-        if ($obj)
-            $value = $obj->value;
+        if ($obj) {
+                    $value = $obj->value;
+        }
     }
     return $value;
 }
@@ -529,8 +570,9 @@ 
 
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
     $sql .= " WHERE name = " . $db->encrypt($name, 1);
-    if ($entity >= 0)
-        $sql .= " AND entity = " . $entity;
+    if ($entity >= 0) {
+            $sql .= " AND entity = " . $entity;
+    }
 
     dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -849,8 +891,9 @@ 
                     // We remove session if it's not ourself
                     if ($idsess != $mysessionid) {
                         $res = @unlink($fullpath);
-                        if (!$res)
-                            $error++;
+                        if (!$res) {
+                                                    $error++;
+                        }
                     }
                 }
             }
@@ -858,11 +901,12 @@ 
     }
     @closedir($dh);
 
-    if (!$error)
-        return 1;
-    else
-        return -$error;
-}
+    if (!$error) {
+            return 1;
+    } else {
+            return -$error;
+    }
+    }
 
 /**
  *  Enable a module
@@ -893,8 +937,9 @@ 
     foreach ($modulesdir as $dir) {
         if (file_exists($dir . $modFile)) {
             $found = @include_once $dir . $modFile;
-            if ($found)
-                break;
+            if ($found) {
+                            break;
+            }
         }
     }
 
@@ -1003,8 +1048,9 @@ 
     global $db, $modules, $conf;
 
     // Check parameters
-    if (empty($value))
-        return 'ErrorBadParameter';
+    if (empty($value)) {
+            return 'ErrorBadParameter';
+    }
 
     $ret = '';
     $modName = $value;
@@ -1018,18 +1064,19 @@ 
     foreach ($modulesdir as $dir) {
         if (file_exists($dir . $modFile)) {
             $found = @include_once $dir . $modFile;
-            if ($found)
-                break;
+            if ($found) {
+                            break;
+            }
         }
     }
 
     if ($found) {
         $objMod = new $modName($db);
         $result = $objMod->remove();
-        if ($result <= 0)
-            $ret = $objMod->error;
-    }
-    else {
+        if ($result <= 0) {
+                    $ret = $objMod->error;
+        }
+    } else {
         //print $dir.$modFile;
         // TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
         include_once DOL_BASE_PATH . '/core/modules/DolibarrModules.class.php';
@@ -1105,13 +1152,16 @@ 
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
                         $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name)
-                            $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name)
-                            $modulequalified = 0;
+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+                                                    $modulequalified = 0;
+                        }
+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+                                                    $modulequalified = 0;
+                        }
                         //If module is not activated disqualified
-                        if (empty($conf->global->$const_name))
-                            $modulequalified = 0;
+                        if (empty($conf->global->$const_name)) {
+                                                    $modulequalified = 0;
+                        }
 
                         if ($modulequalified) {
                             // Load languages files of module
@@ -1122,8 +1172,10 @@ 
                             }
 
                             // Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
-                            if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries))
-                                $objMod->dictionaries = $objMod->dictionnaries;  // For backward compatibility
+                            if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {
+                                                            $objMod->dictionaries = $objMod->dictionnaries;
+                            }
+                            // For backward compatibility
 
                             if (!empty($objMod->dictionaries)) {
                                 //var_dump($objMod->dictionaries['tabname']);
@@ -1165,14 +1217,16 @@ 
                                     $nbtabcond++;
                                     $tabcond[] = $val;
                                 }
-                                if (!empty($objMod->dictionaries['tabhelp']))
-                                    foreach ($objMod->dictionaries['tabhelp'] as $val) {
+                                if (!empty($objMod->dictionaries['tabhelp'])) {
+                                                                    foreach ($objMod->dictionaries['tabhelp'] as $val) {
                                         $nbtabhelp++;
+                                }
                                         $tabhelp[] = $val;
                                     }
-                                if (!empty($objMod->dictionaries['tabfieldcheck']))
-                                    foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
+                                if (!empty($objMod->dictionaries['tabfieldcheck'])) {
+                                                                    foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
                                         $nbtabfieldcheck++;
+                                }
                                         $tabfieldcheck[] = $val;
                                     }
 
@@ -1186,14 +1240,14 @@ 
 
                             $j++;
                             $i++;
-                        } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        } else {
+                                                    dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        }
                     }
                 }
             }
             closedir($handle);
-        }
-        else {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1231,12 +1285,16 @@ 
                         // We discard modules according to features level (PS: if module is activated we always show it)
                         $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
 
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2)
-                            $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1)
-                            $modulequalified = 0;
-                        if (!empty($conf->global->$const_name))
-                            $modulequalified = 0; // already activated
+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+                                                    $modulequalified = 0;
+                        }
+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+                                                    $modulequalified = 0;
+                        }
+                        if (!empty($conf->global->$const_name)) {
+                                                    $modulequalified = 0;
+                        }
+                        // already activated
 
                         if ($modulequalified) {
                             // Load languages files of module
@@ -1245,14 +1303,14 @@ 
 
                                 setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
                             }
-                        } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        } else {
+                                                    dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        }
                     }
                 }
             }
             closedir($handle);
-        }
-        else {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1307,13 +1365,16 @@ 
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
                         $const_name = 'MAIN_MODULE_' . strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name)
-                            $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name)
-                            $modulequalified = 0;
+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+                                                    $modulequalified = 0;
+                        }
+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+                                                    $modulequalified = 0;
+                        }
                         //If module is not activated disqualified
-                        if (empty($conf->global->$const_name))
-                            $modulequalified = 0;
+                        if (empty($conf->global->$const_name)) {
+                                                    $modulequalified = 0;
+                        }
 
                         if ($modulequalified) {
                             // Load languages files of module
@@ -1335,14 +1396,14 @@ 
 
                             $j++;
                             $i++;
-                        } else
-                            dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        } else {
+                                                    dol_syslog("Module " . get_class($objMod) . " not qualified");
+                        }
                     }
                 }
             }
             closedir($handle);
-        }
-        else {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory " . $dir . ". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1366,8 +1427,9 @@ 
 
     $form = new Form($db);
 
-    if (!empty($strictw3c) && $strictw3c == 1)
-        print "\n" . '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    if (!empty($strictw3c) && $strictw3c == 1) {
+            print "\n" . '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    }
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
@@ -1376,8 +1438,9 @@ 
     $text = $langs->trans("Value");
     print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
     print '</td>';
-    if (empty($strictw3c))
-        print '<td align="center" width="80">' . $langs->trans("Action") . '</td>';
+    if (empty($strictw3c)) {
+            print '<td align="center" width="80">' . $langs->trans("Action") . '</td>';
+    }
     print "</tr>\n";
 
     $label = '';
@@ -1427,8 +1490,9 @@ 
 
             // Show constant
             print '<td>';
-            if (empty($strictw3c))
-                print '<input type="hidden" name="action" value="update">';
+            if (empty($strictw3c)) {
+                            print '<input type="hidden" name="action" value="update">';
+            }
             print '<input type="hidden" name="rowid' . (empty($strictw3c) ? '' : '[]') . '" value="' . $obj->rowid . '">';
             print '<input type="hidden" name="constname' . (empty($strictw3c) ? '' : '[]') . '" value="' . $const . '">';
             print '<input type="hidden" name="constnote_' . $obj->name . '" value="' . nl2br(dol_escape_htmltag($obj->note)) . '">';
@@ -1456,8 +1520,9 @@ 
                 print 'mymailmanlist<br>';
                 print 'mymailmanlist1,mymailmanlist2<br>';
                 print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-                if ($conf->categorie->enabled)
-                    print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+                if ($conf->categorie->enabled) {
+                                    print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+                }
                 print '</div>';
                 //print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
@@ -1504,16 +1569,16 @@ 
                         foreach ($formmail->lines_model as $modelmail) {
                             //var_dump($modelmail);
                             $moreonlabel = '';
-                            if (!empty($arrayofmessagename[$modelmail->label]))
-                                $moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
+                            if (!empty($arrayofmessagename[$modelmail->label])) {
+                                                            $moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
+                            }
                             $arrayofmessagename[$modelmail->label] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
                         }
                     }
                     //var_dump($arraydefaultmessage);
                     //var_dump($arrayofmessagename);
                     print $form->selectarray('constvalue_' . $obj->name, $arrayofmessagename, $obj->value, 'None', 1, 0, '', 0, 0, 0, '', '', 1);
-                }
-                else { // type = 'string' ou 'chaine'
+                } else { // type = 'string' ou 'chaine'
                     print '<input type="text" class="flat" size="48" name="constvalue' . (empty($strictw3c) ? '' : '[]') . '" value="' . dol_escape_htmltag($obj->value) . '">';
                 }
                 print '</td>';
@@ -1525,8 +1590,9 @@ 
                 print "</td>";
             }
             print "</tr>\n";
-            if (empty($strictw3c))
-                print "</form>\n";
+            if (empty($strictw3c)) {
+                            print "</form>\n";
+            }
         }
     }
     print '</table>';
@@ -1556,14 +1622,16 @@ 
             $modulename = strtolower($module->name);
             //print 'modulename='.$modulename;
             //if (empty($conf->global->$moduleconst)) continue;
-            if (!in_array($modulename, $listofmodules))
-                continue;
+            if (!in_array($modulename, $listofmodules)) {
+                            continue;
+            }
             //var_dump($modulename.' - '.$langs->trans('Module'.$module->numero.'Name'));
 
-            if ($i > 0)
-                $text .= ', ';
-            else
-                $text .= ' ';
+            if ($i > 0) {
+                            $text .= ', ';
+            } else {
+                            $text .= ' ';
+            }
             $i++;
             $text .= $langs->trans('Module' . $module->numero . 'Name');
         }

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

Braces +3 added lines, -2 removed lines

@@ -1044,8 +1044,9 @@
     if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
         $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
     }
-    if ($thousand == 'Space')
-        $thousand = ' ';
+    if ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     print "var dec='" . dol_escape_js($dec) . "'; var thousand='" . dol_escape_js($thousand) . "';\n";    // Set var in javascript
 
     ?>

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

Braces +54 added lines, -26 removed lines

@@ -34,8 +34,9 @@ 
 if (!defined('NOCSRFCHECK')) {
     define('NOCSRFCHECK', 1);
 }
-if (!defined('NOTOKENRENEWAL'))
+if (!defined('NOTOKENRENEWAL')) {
     define('NOTOKENRENEWAL', 1);
+}
 if (!defined('NOLOGIN')) {
     define('NOLOGIN', 1); // File must be accessed by logon page so without login
 }
@@ -68,8 +69,9 @@ 
 $fontsize = '0.86em';
 $fontsizesmaller = '0.75em';
 
-if (defined('THEME_ONLY_CONSTANT'))
+if (defined('THEME_ONLY_CONSTANT')) {
     return;
+}
 
 session_cache_limiter('public');
 
@@ -130,24 +132,33 @@ 
 $borderwidth = 1;
 
 // Case of option always editable
-if (!isset($conf->global->THEME_ELDY_BACKBODY))
+if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
     $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
-if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1))
+}
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
     $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
-if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1))
+}
+if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) {
     $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
-if (!isset($conf->global->THEME_ELDY_BACKTITLE1))
+}
+if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) {
     $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
-if (!isset($conf->global->THEME_ELDY_USE_HOVER))
+}
+if (!isset($conf->global->THEME_ELDY_USE_HOVER)) {
     $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
-if (!isset($conf->global->THEME_ELDY_USE_CHECKED))
+}
+if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) {
     $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
-if (!isset($conf->global->THEME_ELDY_LINEBREAK))
+}
+if (!isset($conf->global->THEME_ELDY_LINEBREAK)) {
     $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
-if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB))
+}
+if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
     $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
-if (!isset($conf->global->THEME_ELDY_TEXTLINK))
+}
+if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
     $conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -191,10 +202,11 @@ 
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackhmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460)
+if ($tmpval <= 460) {
     $colortextbackhmenu = 'FFFFFF';
-else
+} else {
     $colortextbackhmenu = '000000';
+}
 
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
@@ -216,8 +228,9 @@ 
         $colortexttitle = '000000';
         $colorshadowtitle = 'FFFFFF';
     }
-} else
+} else {
     $colorshadowtitle = '888888';
+}
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
@@ -239,10 +252,12 @@ 
 $colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
 $colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
 $colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
-if ($colorbacklinepairhover != '')
+if ($colorbacklinepairhover != '') {
     $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
-if ($colorbacklinepairchecked != '')
+}
+if ($colorbacklinepairchecked != '') {
     $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
+}
 $colorbackbody = join(',', colorStringToArray($colorbackbody));
 $colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
 $colortexttitle = join(',', colorStringToArray($colortexttitle));
@@ -950,7 +965,10 @@ 
 }
 
 .flexcontainer {
-<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;' . "\n"; ?>
+<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
+    echo 'display: inline-flex;' . "\n";
+}
+?>
 flex-flow: row wrap;
 justify-content: flex-start;
 }
@@ -1339,8 +1357,14 @@ 
 div.fiche {
 margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
 margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '29' : '6')); ?>px;
-<?php if (!empty($dol_hide_leftmenu)) print 'margin-bottom: 12px;' . "\n"; ?>
-<?php if (!empty($dol_hide_leftmenu)) print 'margin-top: 12px;' . "\n"; ?>
+<?php if (!empty($dol_hide_leftmenu)) {
+    print 'margin-bottom: 12px;' . "\n";
+}
+?>
+<?php if (!empty($dol_hide_leftmenu)) {
+    print 'margin-top: 12px;' . "\n";
+}
+?>
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
 margin: 20px !important;
@@ -1428,8 +1452,9 @@ 
 <?php
 if ($conf->browser->layout != 'phone') {
     print "padding-" . $left . ": 16px;\n";
-} else
+} else {
     print "margin-top: 10px;\n";
+}
 
 ?>
 }
@@ -1917,10 +1942,12 @@ 
 // Put here list of menu entries we are sure we don't want
         $divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
         foreach ($mainmenuusedarray as $val) {
-            if (empty($val) || in_array($val, $divalreadydefined))
-                continue;
-            if (in_array($val, $divnotrequired))
-                continue;
+            if (empty($val) || in_array($val, $divalreadydefined)) {
+                            continue;
+            }
+            if (in_array($val, $divnotrequired)) {
+                            continue;
+            }
             //print "XXX".$val;
             // Search img file in module dir
             $found = 0;
@@ -1936,8 +1963,9 @@ 
             if (!$found) {
                 $url = dol_buildpath($path . '/theme/' . $theme . '/img/menus/generic' . $generic . "_over.png", 1);
                 $found = 1;
-                if ($generic < 4)
-                    $generic++;
+                if ($generic < 4) {
+                                    $generic++;
+                }
                 print "/* A mainmenu entry was found but img file " . $val . ".png not found (check /" . $val . "/img/" . $val . ".png), so we use a generic one */\n";
             }
             if ($found) {

dolibarr/htdocs/main.inc.php

Braces +399 added lines, -263 removed lines

@@ -213,16 +213,18 @@ 
     foreach ($tmplist as $tmpkey) {
         $postkey = $tmpautoset[0] . '_' . $tmpkey;
         //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-        if (!empty($_POST[$postkey]))
-            $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        if (!empty($_POST[$postkey])) {
+                    $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        }
     }
     $cookiename = $tmpautoset[0];
     $cookievalue = json_encode($cookiearrayvalue);
     //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
     setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
-    if (empty($cookievalue))
-        unset($_COOKIE[$cookiename]);
-}
+    if (empty($cookievalue)) {
+            unset($_COOKIE[$cookiename]);
+    }
+    }
 
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -231,8 +233,9 @@ 
 
 $sessionname = 'DOLSESSID_' . $prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]))
+if (!empty($_COOKIE[$sessiontimeout])) {
     ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
@@ -263,11 +266,13 @@ 
     $conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone')
-        $conf->dol_no_mouse_hover = 1;
-    if ($conf->browser->layout == 'phone')
-        $conf->global->MAIN_TESTMENUHIDER = 1;
-}
+    if ($conf->browser->layout == 'phone') {
+            $conf->dol_no_mouse_hover = 1;
+    }
+    if ($conf->browser->layout == 'phone') {
+            $conf->global->MAIN_TESTMENUHIDER = 1;
+    }
+    }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -312,10 +317,14 @@ 
 }
 
 // Loading of additional presentation includes
-if (!defined('NOREQUIREHTML'))
-    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax)
-    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREHTML')) {
+    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 
 
@@ -346,8 +355,9 @@ 
 // Creation of a token against CSRF vulnerabilities
 if (!defined('NOTOKENRENEWAL')) {
     // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken']))
-        $_SESSION['token'] = $_SESSION['newtoken'];
+    if (isset($_SESSION['newtoken'])) {
+            $_SESSION['token'] = $_SESSION['newtoken'];
+    }
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
@@ -369,14 +379,16 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules', 'alpha'))
+if (GETPOST('disablemodules', 'alpha')) {
     $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+}
 if (!empty($_SESSION["disablemodules"])) {
     $disabled_modules = explode(',', $_SESSION["disablemodules"]);
     foreach ($disabled_modules as $module) {
         if ($module) {
-            if (empty($conf->$module))
-                $conf->$module = new stdClass();
+            if (empty($conf->$module)) {
+                            $conf->$module = new stdClass();
+            }
             $conf->$module->enabled = false;
             if ($module == 'fournisseur') {  // Special case
                 $conf->supplier_order->enabled = 0;
@@ -398,11 +410,13 @@ 
         $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
     } else {
         // Authentication mode
-        if (empty($dolibarr_main_authentication))
-            $dolibarr_main_authentication = 'http,dolibarr';
+        if (empty($dolibarr_main_authentication)) {
+                    $dolibarr_main_authentication = 'http,dolibarr';
+        }
         // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user))
-            $dolibarr_auto_user = 'auto';
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+                    $dolibarr_auto_user = 'auto';
+        }
     }
     // Set authmode
     $authmode = explode(',', $dolibarr_main_authentication);
@@ -479,35 +493,41 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done later
             }
         }
 
         $allowedmethodtopostusername = 2;
-        if (defined('MAIN_AUTHENTICATION_POST_METHOD'))
-            $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+                    $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        }
         $usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
         $passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
         $entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Define if we received data to test the login.
         $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode))
-            $goontestloop = true;
-        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user))
-            $goontestloop = true;
-        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1))
-            $goontestloop = true;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
+                    $goontestloop = true;
+        }
+        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) {
+                    $goontestloop = true;
+        }
+        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) {
+                    $goontestloop = true;
+        }
 
         if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
             include_once DOL_BASE_PATH . '/core/class/translate.class.php';
             $langs = new Translate("", $conf);
             $langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-            if (defined('MAIN_LANG_DEFAULT'))
-                $langcode = constant('MAIN_LANG_DEFAULT');
+            if (defined('MAIN_LANG_DEFAULT')) {
+                            $langcode = constant('MAIN_LANG_DEFAULT');
+            }
             $langs->setDefaultLang($langcode);
         }
 
@@ -529,8 +549,9 @@ 
                     $datenow = dol_now();
                     $datefirst = dol_stringtotime($_POST["dst_first"]);
                     $datesecond = dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond)
-                        $dol_dst = 1;
+                    if ($datenow >= $datefirst && $datenow < $datesecond) {
+                                            $dol_dst = 1;
+                    }
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
@@ -542,8 +563,9 @@ 
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"]))
-                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) {
+                                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                }
 
                 // Call trigger for the "security events" log
                 $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword") . ' - login=' . GETPOST("username", "alpha", 2);
@@ -560,8 +582,9 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done in next chapter
             }
@@ -571,10 +594,11 @@ 
         if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
             // No data to test login, so we show the login page
             dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
-            if (defined('NOREDIRECTBYMAINTOLOGIN'))
-                return 'ERROR_NOT_LOGGED';
-            else
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+                            return 'ERROR_NOT_LOGGED';
+            } else {
+                            dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            }
             exit;
         }
 
@@ -613,21 +637,24 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
         }
-    }
-    else {
+    } else {
         // We are already into an authenticated session
         $login = $_SESSION["dol_login"];
         $entity = $_SESSION["dol_entity"];
@@ -669,20 +696,23 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
-        }
-        else {
+        } else {
             // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
 
@@ -691,8 +721,9 @@ 
                 $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
                 $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
                 // Clean $relativepathstring
-                if (constant('DOL_BASE_URI'))
-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                if (constant('DOL_BASE_URI')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                 //var_dump($relativepathstring);
@@ -743,16 +774,21 @@ 
         $_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
         $_SESSION["dol_entity"] = $conf->entity;
         // Store value into session (values stored only if defined)
-        if (!empty($dol_hide_topmenu))
-            $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
-        if (!empty($dol_hide_leftmenu))
-            $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
-        if (!empty($dol_optimize_smallscreen))
-            $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
-        if (!empty($dol_no_mouse_hover))
-            $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
-        if (!empty($dol_use_jmobile))
-            $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        if (!empty($dol_hide_topmenu)) {
+                    $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+        }
+        if (!empty($dol_hide_leftmenu)) {
+                    $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+        }
+        if (!empty($dol_optimize_smallscreen)) {
+                    $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+        }
+        if (!empty($dol_no_mouse_hover)) {
+                    $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+        }
+        if (!empty($dol_use_jmobile)) {
+                    $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        }
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
 
@@ -777,8 +813,9 @@ 
         $hookmanager->initHooks(array('login'));
         $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginfo' => $loginfo);
         $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0)
-            $error++;
+        if ($reshook < 0) {
+                    $error++;
+        }
 
         if ($error) {
             $db->rollback();
@@ -816,10 +853,14 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))
-        $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))
-        $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+            $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+    }
+    // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+            $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+    }
+    // Can be 0
 
 
 
@@ -848,8 +889,9 @@ 
     if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
         $conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
     }
-} else
+} else {
     $conf->use_javascript_ajax = 0;
+}
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {   // If we must enable text browser
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
@@ -858,25 +900,32 @@ 
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
     $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))
+}
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
     $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen']))
+}
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
     $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))
+}
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
     $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))
+}
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
     $conf->dol_use_jmobile = 1;
-if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic')
+}
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
     $conf->dol_no_mouse_hover = 1;
+}
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 ) {
     $conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile))
+if (!empty($conf->dol_use_jmobile)) {
     $conf->use_javascript_ajax = 1;
+}
 // Replace themes bugged with jmobile with eldy
 if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
     $conf->theme = 'eldy';
@@ -900,8 +949,9 @@ 
 if (!defined('NOLOGIN')) {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (!$user->login)
-        accessforbidden();
+    if (!$user->login) {
+            accessforbidden();
+    }
 
     // Check if user is active
     if ($user->statut < 1) {
@@ -976,15 +1026,18 @@ 
 
     // Load the menu manager (only if not already done)
     $file_menu = $conf->standard_menu;
-    if (GETPOST('menu', 'alpha'))
-        $file_menu = GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+    if (GETPOST('menu', 'alpha')) {
+            $file_menu = GETPOST('menu', 'alpha');
+    }
+    // example: menu=eldy_menu.php
     if (!class_exists('MenuManager')) {
         $menufound = 0;
         $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
-            if (class_exists('MenuManager'))
-                break;
+            if (class_exists('MenuManager')) {
+                            break;
+            }
         }
         if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
             dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
@@ -1134,18 +1187,20 @@ 
     }
     print '<!doctype html>' . "\n";
 
-    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST))
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
-    else
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
+    } else {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    }
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead)) {
         $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
 
         print "<head>\n";
 
-        if (GETPOST('dol_basehref', 'alpha'))
-            print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        if (GETPOST('dol_basehref', 'alpha')) {
+                    print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        }
 
         // Displays meta
         print '<meta charset="UTF-8">' . "\n";
@@ -1155,10 +1210,13 @@ 
 
         // Favicon
         $favicon = dol_buildpath('/theme/' . $conf->theme . '/img/favicon.ico', 1);
-        if (!empty($conf->global->MAIN_FAVICON_URL))
-            $favicon = $conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile))
-            print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n"; // Not required into an Android webview
+        if (!empty($conf->global->MAIN_FAVICON_URL)) {
+                    $favicon = $conf->global->MAIN_FAVICON_URL;
+        }
+        if (empty($conf->dol_use_jmobile)) {
+                    print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n";
+        }
+        // Not required into an Android webview
 
 
 
@@ -1170,47 +1228,59 @@ 
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
         // Auto refresh page
-        if (GETPOST('autorefresh', 'int') > 0)
-            print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        if (GETPOST('autorefresh', 'int') > 0) {
+                    print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        }
 
         // Displays title
         $appli = constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-            $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+                    $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        }
 
         print '<title>';
         $titletoshow = '';
-        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE))
-            $titletoshow = dol_htmlentities($title);
-        else if ($title)
-            $titletoshow = dol_htmlentities($appli . ' - ' . $title);
-        else
-            $titletoshow = dol_htmlentities($appli);
-
-        if (!is_object($hookmanager))
-            $hookmanager = new HookManager($db);
+        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+                    $titletoshow = dol_htmlentities($title);
+        } else if ($title) {
+                    $titletoshow = dol_htmlentities($appli . ' - ' . $title);
+        } else {
+                    $titletoshow = dol_htmlentities($appli);
+        }
+
+        if (!is_object($hookmanager)) {
+                    $hookmanager = new HookManager($db);
+        }
         $hookmanager->initHooks("main");
         $parameters = array('title' => $titletoshow);
         $result = $hookmanager->executeHooks('setHtmlTitle', $parameters);  // Note that $action and $object may have been modified by some hooks
-        if ($result > 0)
-            $titletoshow = $hookmanager->resPrint;    // Replace Title to show
-        else
-            $titletoshow .= $hookmanager->resPrint;      // Concat to Title to show
+        if ($result > 0) {
+                    $titletoshow = $hookmanager->resPrint;
+        }
+        // Replace Title to show
+        else {
+                    $titletoshow .= $hookmanager->resPrint;
+        }
+        // Concat to Title to show
 
         print $titletoshow;
         print '</title>';
 
         print "\n";
 
-        if (GETPOST('version', 'int'))
-            $ext = 'version=' . GETPOST('version', 'int'); // usefull to force no cache on css/js
-        if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER))
-            $ext .= '&testmenuhider=' . (GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version', 'int')) {
+                    $ext = 'version=' . GETPOST('version', 'int');
+        }
+        // usefull to force no cache on css/js
+        if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) {
+                    $ext .= '&testmenuhider=' . (GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
+        }
 
         $themeparam = '&lang=' . $langs->defaultlang . '&amp;theme=' . $conf->theme . (GETPOST('optioncss', 'aZ09') ? '&amp;optioncss=' . GETPOST('optioncss', 'aZ09', 1) : '') . '&amp;userid=' . $user->id . '&amp;entity=' . $conf->entity;
         $themeparam .= ($ext ? '&amp;' . $ext : '');
-        if (!empty($_SESSION['dol_resetcache']))
-            $themeparam .= '&amp;dol_resetcache=' . $_SESSION['dol_resetcache'];
+        if (!empty($_SESSION['dol_resetcache'])) {
+                    $themeparam .= '&amp;dol_resetcache=' . $_SESSION['dol_resetcache'];
+        }
         if (GETPOST('dol_hide_topmenu', 'int')) {
             $themeparam .= '&amp;dol_hide_topmenu=' . GETPOST('dol_hide_topmenu', 'int');
         }
@@ -1231,14 +1301,21 @@ 
         if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
             print '<!-- Includes CSS for JQuery (Ajax library) -->' . "\n";
             $jquerytheme = 'base';
-            if (!empty($conf->global->MAIN_USE_JQUERY_THEME))
-                $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-            if (constant('JS_JQUERY_UI'))
-                print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";  // JQuery
-            else
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n";    // JQuery
-            if (!defined('DISABLE_JQUERY_JNOTIFY'))
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";          // JNotify
+            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+                            $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+            }
+            if (constant('JS_JQUERY_UI')) {
+                            print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JQuery
+            else {
+                            print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JQuery
+            if (!defined('DISABLE_JQUERY_JNOTIFY')) {
+                            print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JNotify
             if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
                 $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
                 print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/' . $tmpplugin . '/dist/css/' . $tmpplugin . '.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
@@ -1266,8 +1343,9 @@ 
 
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
-        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME))
-            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+                    print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        }
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
@@ -1275,13 +1353,15 @@ 
             foreach ($arraycss as $modcss => $filescss) {
                 $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
-                    if (empty($cssfile))
-                        dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    if (empty($cssfile)) {
+                                            dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    }
                     // cssfile is a relative path
                     print '<!-- Includes CSS added by module ' . $modcss . ' -->' . "\n" . '<link rel="stylesheet" type="text/css" href="' . dol_buildpath($cssfile, 1);
                     // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-                    if (!preg_match('/\.css$/i', $cssfile))
-                        print $themeparam;
+                    if (!preg_match('/\.css$/i', $cssfile)) {
+                                            print $themeparam;
+                    }
                     print '">' . "\n";
                 }
             }
@@ -1291,8 +1371,9 @@ 
             foreach ($arrayofcss as $cssfile) {
                 print '<!-- Includes CSS added by page -->' . "\n" . '<link rel="stylesheet" type="text/css" title="default" href="' . dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i', $cssfile))
-                    print $themeparam;
+                if (!preg_match('/\.css$/i', $cssfile)) {
+                                    print $themeparam;
+                }
                 print '">' . "\n";
             }
         }
@@ -1301,22 +1382,26 @@ 
         if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax)) {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->' . "\n";
-            if (defined('JS_JQUERY') && constant('JS_JQUERY'))
-                print '<script type="text/javascript" src="' . JS_JQUERY . 'jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+                            print '<script type="text/javascript" src="' . JS_JQUERY . 'jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            } else {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
             if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED')) {
-                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE'))
-                    print '<script type="text/javascript" src="' . JS_JQUERY_MIGRATE . 'jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                else
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            }
-            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI'))
-                print '<script type="text/javascript" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            if (!defined('DISABLE_JQUERY_TABLEDND'))
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/tablednd/jquery.tablednd.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) {
+                                    print '<script type="text/javascript" src="' . JS_JQUERY_MIGRATE . 'jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                } else {
+                                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                }
+            }
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+                            print '<script type="text/javascript" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            } else {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
+            if (!defined('DISABLE_JQUERY_TABLEDND')) {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/tablednd/jquery.tablednd.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
                 print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1387,10 +1472,12 @@ 
             // Browser notifications
             if (!defined('DISABLE_BROWSER_NOTIF')) {
                 $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER))
-                    $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone')
-                    $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                                    $enablebrowsernotif = true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                                    $enablebrowsernotif = false;
+                }
                 if ($enablebrowsernotif) {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = ' . $conf->browser->layout . ')-->' . "\n";
                     //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_notification.js.php' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1427,10 +1514,12 @@ 
             }
         }
 
-        if (!empty($head))
-            print $head . "\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER))
-            print $conf->global->MAIN_HTML_HEADER . "\n";
+        if (!empty($head)) {
+                    print $head . "\n";
+        }
+        if (!empty($conf->global->MAIN_HTML_HEADER)) {
+                    print $conf->global->MAIN_HTML_HEADER . "\n";
+        }
 
         print "<!-- Alixar debugBar header -->";
         print Debug::getRenderHeader(); // Includes Alixar debugBar header
@@ -1495,15 +1584,20 @@ 
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
             $appli = $conf->global->MAIN_APPLICATION_TITLE;
             if (preg_match('/\d\.\d/', $appli)) {
-                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                    $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-            } else
-                $appli .= " " . DOL_VERSION;
-        } else
-            $appli .= " " . DOL_VERSION;
+                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                    $appli .= " (" . DOL_VERSION . ")";
+                }
+                // If new title contains a version that is different than core
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
+        } else {
+                    $appli .= " " . DOL_VERSION;
+        }
 
-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        }
 
         $logouttext = '';
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -1541,12 +1635,15 @@ 
         $parameters = array();
         $result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (is_numeric($result)) {
-            if ($result == 0)
-                $toprightmenu .= $hookmanager->resPrint;  // add
-            else
-                $toprightmenu = $hookmanager->resPrint;      // replace
-        }
-        else {
+            if ($result == 0) {
+                            $toprightmenu .= $hookmanager->resPrint;
+            }
+            // add
+            else {
+                            $toprightmenu = $hookmanager->resPrint;
+            }
+            // replace
+        } else {
             $toprightmenu .= $result; // For backward compatibility
         }
 
@@ -1566,8 +1663,9 @@ 
 
             if (is_array($_POST)) {
                 foreach ($_POST as $key => $value) {
-                    if ($key !== 'action' && $key !== 'password' && !is_array($value))
-                        $qs .= '&' . $key . '=' . urlencode($value);
+                    if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
+                                            $qs .= '&' . $key . '=' . urlencode($value);
+                    }
                 }
             }
             $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
@@ -1586,8 +1684,9 @@ 
             $helppage = '';
             $mode = '';
 
-            if (empty($helppagename))
-                $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            if (empty($helppagename)) {
+                            $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            }
 
             // Get helpbaseurl, helppage and mode from helppagename and langs
             $arrayres = getHelpParamFor($helppagename, $langs);
@@ -1604,13 +1703,15 @@ 
                 }
                 $title = $appli . '<br>';
                 $title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
-                if ($mode == 'wiki')
-                    $title .= ' - ' . $langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                if ($mode == 'wiki') {
+                                    $title .= ' - ' . $langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                }
                 $text .= '<a class="help" target="_blank" rel="noopener" href="';
-                if ($mode == 'wiki')
-                    $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
-                else
-                    $text .= sprintf($helpbaseurl, $helppage);
+                if ($mode == 'wiki') {
+                                    $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+                } else {
+                                    $text .= sprintf($helpbaseurl, $helppage);
+                }
                 $text .= '">';
                 //$text.=img_picto('', 'helpdoc_top').' ';
                 $text .= '<span class="fa fa-question-circle atoplogin"></span>';
@@ -1637,9 +1738,10 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-        print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
-}
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+    }
+    }
 
 /**
  *  Show left menu bar
@@ -1663,8 +1765,9 @@ 
     $searchform = '';
     $bookmarks = '';
 
-    if (!empty($menu_array_before))
-        dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (!empty($menu_array_before)) {
+            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    }
 
     if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
         // Instantiate hooks of thirdparty module
@@ -1672,8 +1775,10 @@ 
 
         print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-        if ($conf->browser->layout == 'phone')
-            $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') {
+                    $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+        }
+        // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
         print "\n";
 
@@ -1700,8 +1805,9 @@ 
         $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             $searchform .= $hookmanager->resPrint;
-        } else
-            $searchform = $hookmanager->resPrint;
+        } else {
+                    $searchform = $hookmanager->resPrint;
+        }
 
         // Force special value for $searchform
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
@@ -1745,38 +1851,49 @@ 
         if (empty($conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
             $doliurl = 'https://www.dolibarr.org';
             //local communities
-            if (preg_match('/fr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.fr';
-            if (preg_match('/es/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.es';
-            if (preg_match('/de/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.de';
-            if (preg_match('/it/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.it';
-            if (preg_match('/gr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.gr';
+            if (preg_match('/fr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.fr';
+            }
+            if (preg_match('/es/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.es';
+            }
+            if (preg_match('/de/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.de';
+            }
+            if (preg_match('/it/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.it';
+            }
+            if (preg_match('/gr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.gr';
+            }
 
             $appli = constant('DOL_APPLICATION_TITLE');
             if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = $conf->global->MAIN_APPLICATION_TITLE;
                 $doliurl = '';
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
             print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-            if ($doliurl)
-                print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-            else
-                print '<span class="help">';
+            if ($doliurl) {
+                            print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+            } else {
+                            print '<span class="help">';
+            }
             print $appli;
-            if ($doliurl)
-                print '</a>';
-            else
-                print '</span>';
+            if ($doliurl) {
+                            print '</a>';
+            } else {
+                            print '</span>';
+            }
             print '</div>' . "\n";
         }
 
@@ -1823,9 +1940,10 @@ 
     print "\n";
     print '<!-- Begin right area -->' . "\n";
 
-    if (empty($leftmenuwithoutmainarea))
-        main_area($title);
-}
+    if (empty($leftmenuwithoutmainarea)) {
+            main_area($title);
+    }
+    }
 
 /**
  *  Begin main area
@@ -1837,16 +1955,18 @@ 
 {
     global $conf, $langs;
 
-    if (empty($conf->dol_hide_leftmenu))
-        print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+    }
 
     print "\n";
 
     print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-        print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+            print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    }
+    }
 
 /**
  *  Return helpbaseurl, helppage and mode
@@ -1870,18 +1990,21 @@ 
         // If WIKI URL
         if (preg_match('/^es/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (preg_match('/^fr/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (empty($helppage)) { // If help page not already found
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         $mode = 'wiki';
     }
@@ -1912,8 +2035,9 @@ 
     $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
     $ret .= '<input type="hidden" name="mode" value="search">';
     $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag($user->login) . '">';
-    if ($showtitlebefore)
-        $ret .= $title . ' ';
+    if ($showtitlebefore) {
+            $ret .= $title . ' ';
+    }
     $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
     $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
     $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -1956,10 +2080,12 @@ 
             foreach ($user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -1970,8 +2096,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
         // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -1979,12 +2106,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != $conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != $conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -2011,20 +2141,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty($conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty($conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty($conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";

dolibarr/htdocs/projet/class/task.class.php

Braces +213 added lines, -158 removed lines

@@ -244,8 +244,9 @@ 
             $sql .= ", t2.rang as task_parent_position";
         }
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as t";
-        if (!empty($loadparentdata))
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t2 ON t.fk_task_parent = t2.rowid";
+        if (!empty($loadparentdata)) {
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t2 ON t.fk_task_parent = t2.rowid";
+        }
         $sql .= " WHERE ";
         if (!empty($ref)) {
             $sql .= "t.ref = '" . $this->db->escape($ref) . "'";
@@ -560,8 +561,9 @@ 
             $this->errors[] = "Error " . $this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
-            if ($obj)
-                $ret = $obj->nb;
+            if ($obj) {
+                            $ret = $obj->nb;
+            }
             $this->db->free($resql);
         }
 
@@ -593,8 +595,9 @@ 
             $this->errors[] = "Error " . $this->db->lasterror();
         } else {
             $obj = $this->db->fetch_object($resql);
-            if ($obj)
-                $ret = $obj->nb;
+            if ($obj) {
+                            $ret = $obj->nb;
+            }
             $this->db->free($resql);
         }
 
@@ -621,15 +624,19 @@ 
     {
         global $conf, $langs, $user;
 
-        if (!empty($conf->dol_no_mouse_hover))
-            $notooltip = 1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) {
+                    $notooltip = 1;
+        }
+        // Force disable tooltips
 
         $result = '';
         $label = '<u>' . $langs->trans("ShowTask") . '</u>';
-        if (!empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (!empty($this->label))
-            $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        if (!empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        }
+        if (!empty($this->label)) {
+                    $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+        }
         if ($this->date_start || $this->date_end) {
             $label .= "<br>" . get_date_range($this->date_start, $this->date_end, '', $langs, 0);
         }
@@ -637,10 +644,12 @@ 
         $url = DOL_URL_ROOT . '/projet/tasks/' . $mode . '.php?id=' . $this->id . ($option == 'withproject' ? '&withproject=1' : '');
         // Add param to save lastsearch_values or not
         $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"]))
-            $add_save_lastsearch_values = 1;
-        if ($add_save_lastsearch_values)
-            $url .= '&save_lastsearch_values=1';
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+                    $add_save_lastsearch_values = 1;
+        }
+        if ($add_save_lastsearch_values) {
+                    $url .= '&save_lastsearch_values=1';
+        }
 
         $linkclose = '';
         if (empty($notooltip)) {
@@ -659,13 +668,16 @@ 
         $picto = 'projecttask';
 
         $result .= $linkstart;
-        if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2)
-            $result .= $this->ref;
+        if ($withpicto) {
+                    $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        }
+        if ($withpicto != 2) {
+                    $result .= $this->ref;
+        }
         $result .= $linkend;
-        if ($withpicto != 2)
-            $result .= (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        if ($withpicto != 2) {
+                    $result .= (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+        }
 
         return $result;
     }
@@ -717,8 +729,10 @@ 
         //print $usert.'-'.$userp.'-'.$projectid.'-'.$socid.'-'.$mode.'<br>';
         // List of tasks (does not care about permissions. Filtering will be done later)
         $sql = "SELECT ";
-        if ($filteronprojuser > 0 || $filterontaskuser > 0)
-            $sql .= " DISTINCT";  // We may get several time the same record if user has several roles on same project/task
+        if ($filteronprojuser > 0 || $filterontaskuser > 0) {
+                    $sql .= " DISTINCT";
+        }
+        // We may get several time the same record if user has several roles on same project/task
         $sql .= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
         $sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
         $sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
@@ -750,8 +764,9 @@ 
                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_task as t on t.fk_projet = p.rowid";
             }
             $sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
-        } else
-            return 'BadValueForParameterMode';
+        } else {
+                    return 'BadValueForParameterMode';
+        }
 
         if ($filteronprojuser > 0) {
             $sql .= " AND p.rowid = ec.element_id";
@@ -770,16 +785,21 @@ 
             $sql .= " AND ec2.statut = 4";
             $sql .= " AND ctc2.source = 'internal'";
         }
-        if ($socid)
-            $sql .= " AND p.fk_soc = " . $socid;
-        if ($projectid)
-            $sql .= " AND p.rowid in (" . $projectid . ")";
-        if ($filteronproj)
-            $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
-        if ($filteronprojstatus && $filteronprojstatus != '-1')
-            $sql .= " AND p.fk_statut IN (" . $filteronprojstatus . ")";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
+        if ($socid) {
+                    $sql .= " AND p.fk_soc = " . $socid;
+        }
+        if ($projectid) {
+                    $sql .= " AND p.rowid in (" . $projectid . ")";
+        }
+        if ($filteronproj) {
+                    $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
+        }
+        if ($filteronprojstatus && $filteronprojstatus != '-1') {
+                    $sql .= " AND p.fk_statut IN (" . $filteronprojstatus . ")";
+        }
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
         $sql .= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;exit;
@@ -870,41 +890,54 @@ 
 
         /* Liste des taches et role sur les projets ou taches */
         $sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-        if ($userp)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as pt";
-        if ($usert && $filteronprojstatus > -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "projet_task as pt";
-        if ($usert && $filteronprojstatus <= -1)
-            $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt";
+        if ($userp) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet as pt";
+        }
+        if ($usert && $filteronprojstatus > -1) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "projet_task as pt";
+        }
+        if ($usert && $filteronprojstatus <= -1) {
+                    $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt";
+        }
         $sql .= ", " . MAIN_DB_PREFIX . "element_contact as ec";
         $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
         $sql .= " WHERE pt.rowid = ec.element_id";
-        if ($userp && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_statut = " . $filteronprojstatus;
-        if ($usert && $filteronprojstatus > -1)
-            $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = " . $filteronprojstatus;
-        if ($userp)
-            $sql .= " AND ctc.element = 'project'";
-        if ($usert)
-            $sql .= " AND ctc.element = 'project_task'";
+        if ($userp && $filteronprojstatus > -1) {
+                    $sql .= " AND pt.fk_statut = " . $filteronprojstatus;
+        }
+        if ($usert && $filteronprojstatus > -1) {
+                    $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = " . $filteronprojstatus;
+        }
+        if ($userp) {
+                    $sql .= " AND ctc.element = 'project'";
+        }
+        if ($usert) {
+                    $sql .= " AND ctc.element = 'project_task'";
+        }
         $sql .= " AND ctc.rowid = ec.fk_c_type_contact";
-        if ($userp)
-            $sql .= " AND ec.fk_socpeople = " . $userp->id;
-        if ($usert)
-            $sql .= " AND ec.fk_socpeople = " . $usert->id;
+        if ($userp) {
+                    $sql .= " AND ec.fk_socpeople = " . $userp->id;
+        }
+        if ($usert) {
+                    $sql .= " AND ec.fk_socpeople = " . $usert->id;
+        }
         $sql .= " AND ec.statut = 4";
         $sql .= " AND ctc.source = 'internal'";
         if ($projectid) {
-            if ($userp)
-                $sql .= " AND pt.rowid in (" . $projectid . ")";
-            if ($usert)
-                $sql .= " AND pt.fk_projet in (" . $projectid . ")";
+            if ($userp) {
+                            $sql .= " AND pt.rowid in (" . $projectid . ")";
+            }
+            if ($usert) {
+                            $sql .= " AND pt.fk_projet in (" . $projectid . ")";
+            }
         }
         if ($taskid) {
-            if ($userp)
-                $sql .= " ERROR SHOULD NOT HAPPENS";
-            if ($usert)
-                $sql .= " AND pt.rowid = " . $taskid;
+            if ($userp) {
+                            $sql .= " ERROR SHOULD NOT HAPPENS";
+            }
+            if ($usert) {
+                            $sql .= " AND pt.rowid = " . $taskid;
+            }
         }
         //print $sql;
 
@@ -915,15 +948,15 @@ 
             $i = 0;
             while ($i < $num) {
                 $obj = $this->db->fetch_object($resql);
-                if (empty($arrayroles[$obj->pid]))
-                    $arrayroles[$obj->pid] = $obj->code;
-                else
-                    $arrayroles[$obj->pid] .= ',' . $obj->code;
+                if (empty($arrayroles[$obj->pid])) {
+                                    $arrayroles[$obj->pid] = $obj->code;
+                } else {
+                                    $arrayroles[$obj->pid] .= ',' . $obj->code;
+                }
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -944,10 +977,11 @@ 
         $num = count($tab);
         $i = 0;
         while ($i < $num) {
-            if ($source == 'thirdparty')
-                $contactAlreadySelected[$i] = $tab[$i]['socid'];
-            else
-                $contactAlreadySelected[$i] = $tab[$i]['id'];
+            if ($source == 'thirdparty') {
+                            $contactAlreadySelected[$i] = $tab[$i]['socid'];
+            } else {
+                            $contactAlreadySelected[$i] = $tab[$i]['id'];
+            }
             $i++;
         }
         return $contactAlreadySelected;
@@ -975,10 +1009,12 @@ 
         }
 
         // Clean parameters
-        if (isset($this->timespent_note))
-            $this->timespent_note = trim($this->timespent_note);
-        if (empty($this->timespent_datehour))
-            $this->timespent_datehour = $this->timespent_date;
+        if (isset($this->timespent_note)) {
+                    $this->timespent_note = trim($this->timespent_note);
+        }
+        if (empty($this->timespent_datehour)) {
+                    $this->timespent_datehour = $this->timespent_date;
+        }
 
         $this->db->begin();
 
@@ -1023,8 +1059,10 @@ 
             // Recalculate amount of time spent for task and update denormalized field
             $sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
             $sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt where ptt.fk_task = " . $this->id . ")";
-            if (isset($this->progress))
-                $sql .= ", progress = " . $this->progress; // Do not overwrite value if not provided
+            if (isset($this->progress)) {
+                            $sql .= ", progress = " . $this->progress;
+            }
+            // Do not overwrite value if not provided
             $sql .= " WHERE rowid = " . $this->id;
 
             dol_syslog(get_class($this) . "::addTimeSpent", LOG_DEBUG);
@@ -1063,10 +1101,12 @@ 
     {
         global $langs;
 
-        if (is_object($userobj))
-            $userid = $userobj->id;
-        else
-            $userid = $userobj; // old method
+        if (is_object($userobj)) {
+                    $userid = $userobj->id;
+        } else {
+                    $userid = $userobj;
+        }
+        // old method
 
         $id = $this->id;
         if (empty($id) && empty($userid)) {
@@ -1085,12 +1125,15 @@ 
         $sql .= " SUM(" . $this->db->ifsql("t.thm IS NULL", 1, 0) . ") as nblinesnull";
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task_time as t";
         $sql .= " WHERE 1 = 1";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
-        if ($id > 0)
-            $sql .= " AND t.fk_task = " . $id;
-        if ($userid > 0)
-            $sql .= " AND t.fk_user = " . $userid;
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
+        if ($id > 0) {
+                    $sql .= " AND t.fk_task = " . $id;
+        }
+        if ($userid > 0) {
+                    $sql .= " AND t.fk_user = " . $userid;
+        }
 
         dol_syslog(get_class($this) . "::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1127,8 +1170,9 @@ 
     {
         global $langs;
 
-        if (empty($id))
-            $id = $this->id;
+        if (empty($id)) {
+                    $id = $this->id;
+        }
 
         $result = array();
 
@@ -1251,8 +1295,9 @@ 
         $sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
         $sql .= " AND ptt.fk_user = " . $userobj->id;
         $sql .= " AND pt.entity IN (" . getEntity('project') . ")";
-        if ($morewherefilter)
-            $sql .= $morewherefilter;
+        if ($morewherefilter) {
+                    $sql .= $morewherefilter;
+        }
 
         dol_syslog(get_class($this) . "::fetchAllTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1315,10 +1360,12 @@ 
         $ret = 0;
 
         // Clean parameters
-        if (empty($this->timespent_datehour))
-            $this->timespent_datehour = $this->timespent_date;
-        if (isset($this->timespent_note))
-            $this->timespent_note = trim($this->timespent_note);
+        if (empty($this->timespent_datehour)) {
+                    $this->timespent_datehour = $this->timespent_date;
+        }
+        if (isset($this->timespent_note)) {
+                    $this->timespent_note = trim($this->timespent_note);
+        }
 
         $this->db->begin();
 
@@ -1339,13 +1386,14 @@ 
                 if ($result < 0) {
                     $this->db->rollback();
                     $ret = -1;
-                } else
-                    $ret = 1;
+                } else {
+                                    $ret = 1;
+                }
                 // End call triggers
-            } else
-                $ret = 1;
-        }
-        else {
+            } else {
+                            $ret = 1;
+            }
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             $ret = -1;
@@ -1366,8 +1414,9 @@ 
             }
         }
 
-        if ($ret >= 0)
-            $this->db->commit();
+        if ($ret >= 0) {
+                    $this->db->commit();
+        }
         return $ret;
     }
 
@@ -1674,48 +1723,48 @@ 
         } elseif ($mode == 1) {
             return $langs->trans($this->statuts_short[$statut]);
         } elseif ($mode == 2) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts_short[$statut]);
-        }
-        elseif ($mode == 3) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
-        }
-        elseif ($mode == 4) {
-            if ($statut == 0)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 1)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 2)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 3)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 4)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
-            elseif ($statut == 5)
-                return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts[$statut]);
-        }
-        elseif ($mode == 5) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts_short[$statut]);
+            }
+        } elseif ($mode == 3) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0');
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1');
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3');
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5');
+            }
+        } elseif ($mode == 4) {
+            if ($statut == 0) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 1) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut1') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 2) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut3') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 3) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 4) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts[$statut]);
+            } elseif ($statut == 5) {
+                            return img_picto($langs->trans($this->statuts_short[$statut]), 'statut5') . ' ' . $langs->trans($this->statuts[$statut]);
+            }
+        } elseif ($mode == 5) {
             /* if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
               elseif ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut1');
               elseif ($statut==2) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut3');
@@ -1800,12 +1849,14 @@ 
         $sql .= " AND p.fk_statut = 1";
         $sql .= " AND t.fk_projet = p.rowid";
         $sql .= " AND t.progress < 100";         // tasks to do
-        if (!$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        if (!$user->rights->projet->all->lire) {
+                    $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        if ($socid) {
+                    $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         // if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
         //print $sql;
@@ -1866,19 +1917,23 @@ 
         $sql = "SELECT count(p.rowid) as nb";
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s on p.fk_soc = s.rowid";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+        }
         $sql .= ", " . MAIN_DB_PREFIX . "projet_task as t";
         $sql .= " WHERE p.entity IN (" . getEntity('project', 0) . ')';
         $sql .= " AND t.fk_projet = p.rowid";         // tasks to do
-        if ($mine || !$user->rights->projet->all->lire)
-            $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        if ($mine || !$user->rights->projet->all->lire) {
+                    $sql .= " AND p.rowid IN (" . $projectsListId . ")";
+        }
         // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-        if ($socid)
-            $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id . ") OR (s.rowid IS NULL))";
+        if ($socid) {
+                    $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+        }
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id . ") OR (s.rowid IS NULL))";
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {

dolibarr/htdocs/home/home.php

Braces +12 added lines, -8 removed lines

@@ -352,8 +352,9 @@ 
                 }
 
 
-                if (!empty($langfile[$key]))
-                    $langs->load($langfile[$key]);
+                if (!empty($langfile[$key])) {
+                                    $langs->load($langfile[$key]);
+                }
                 $text = $langs->trans($titres[$key]);
                 //$sep=($conf->dol_use_jmobile?'<br>':' ');
                 $boxstat .= '<a href="' . $links[$key] . '" class="boxstatsindicator thumbstat nobold nounderline">';
@@ -524,21 +525,24 @@ 
 //load_board can return an integer if failed or WorkboardResponse if OK
 $valid_dashboardlines = array();
 foreach ($dashboardlines as $tmp) {
-    if ($tmp instanceof WorkboardResponse)
-        $valid_dashboardlines[] = $tmp;
-}
+    if ($tmp instanceof WorkboardResponse) {
+            $valid_dashboardlines[] = $tmp;
+    }
+    }
 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
 foreach ($valid_dashboardlines as $board) {
     if ($board->nbtodolate > 0) {
-        if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE))
-            $totaltodo += $board->nbtodo;
+        if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+                    $totaltodo += $board->nbtodo;
+        }
         $totallate += $board->nbtodolate;
     }
 }
 //var_dump($totallate, $totaltodo);
-if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) && !empty($totaltodo))
+if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) && !empty($totaltodo)) {
     $totallate = round($totallate / $totaltodo * 100, 2);
+}
 //var_dump($totallate);
 $boxwork = '';
 $boxwork .= '<div class="box">';