alxarafe / alixar

dolibarr/htdocs/admin/modules.php

Braces +192 added lines, -133 removed lines

@@ -42,8 +42,9 @@ 
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));

 

 $mode = GETPOST('mode', 'alpha');

-if (empty($mode))

-    $mode = 'common';

+if (empty($mode)) {
+    $mode = 'common';
+}
 $action = GETPOST('action', 'alpha');

 //var_dump($_POST);exit;

 $value = GETPOST('value', 'alpha');

@@ -64,8 +65,9 @@ 
 $dolistore = new Dolistore(false);

 

 

-if (!$user->admin)

-    accessforbidden();

+if (!$user->admin) {
+    accessforbidden();
+}
 

 $specialtostring = array(0 => 'common', 1 => 'interfaces', 2 => 'other', 3 => 'functional', 4 => 'marketplace');

 

@@ -86,15 +88,19 @@ 
 

 $param = '';

 if (!GETPOST('buttonreset', 'alpha')) {

-    if ($search_keyword)

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

-    if ($search_status && $search_status != '-1')

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

-    if ($search_nature && $search_nature != '-1')

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

-    if ($search_version && $search_version != '-1')

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

-}

+    if ($search_keyword) {
+            $param .= '&search_keyword=' . urlencode($search_keyword);
+    }
+    if ($search_status && $search_status != '-1') {
+            $param .= '&search_status=' . urlencode($search_status);
+    }
+    if ($search_nature && $search_nature != '-1') {
+            $param .= '&search_nature=' . urlencode($search_nature);
+    }
+    if ($search_version && $search_version != '-1') {
+            $param .= '&search_version=' . urlencode($search_version);
+    }
+    }

 

 $dirins = DOL_DOCUMENT_ROOT . '/custom';

 $urldolibarrmodules = 'https://www.dolistore.com/';

@@ -111,8 +117,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)

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

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

 if (GETPOST('buttonreset', 'alpha')) {

     $search_keyword = '';

@@ -206,9 +213,9 @@ 
 

 if ($action == 'set' && $user->admin) {

     $resarray = activateModule($value);

-    if (!empty($resarray['errors']))

-        setEventMessages('', $resarray['errors'], 'errors');

-    else {

+    if (!empty($resarray['errors'])) {
+            setEventMessages('', $resarray['errors'], 'errors');
+    } else {

         //var_dump($resarray);exit;

         if ($resarray['nbperms'] > 0) {

             $tmpsql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "user WHERE admin <> 1";

@@ -220,15 +227,15 @@ 
                     $msg = $langs->trans('ModuleEnabledAdminMustCheckRights');

                     setEventMessages($msg, null, 'warnings');

                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

     }

     //header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));

     header("Location: ?controller=admin&method=modules&mode=" . $mode . $param . ($page_y ? '&page_y=' . $page_y : ''));

     exit;

-}

-else if ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {

+} else if ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes') {

     $result = unActivateModule($value);

     if ($result) {

         setEventMessages($result, null, 'errors');

@@ -308,16 +315,20 @@ 
 

                                 // 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' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2)))

-                                    $modulequalified = 0;

-                                if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1)))

-                                    $modulequalified = 0;

-                                if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0)))

-                                    $modulequalified = 0;

+                                if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) {
+                                                                    $modulequalified = 0;
+                                }
+                                if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) {
+                                                                    $modulequalified = 0;
+                                }
+                                if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) {
+                                                                    $modulequalified = 0;
+                                }
 

                                 // We discard modules according to property ->hidden

-                                if (!empty($objMod->hidden))

-                                    $modulequalified = 0;

+                                if (!empty($objMod->hidden)) {
+                                                                    $modulequalified = 0;
+                                }
 

                                 if ($modulequalified > 0) {

                                     $publisher = dol_escape_htmltag($objMod->getPublisher());

@@ -363,16 +374,21 @@ 
                                     //print $i.'-'.$dirmod[$i].'<br>';

                                     // Set categ[$i]

                                     $specialstring = 'unknown';

-                                    if ($objMod->version == 'development' || $objMod->version == 'experimental')

-                                        $specialstring = 'expdev';

-                                    if (isset($categ[$specialstring]))

-                                        $categ[$specialstring] ++;     // Array of all different modules categories

-                                    else

-                                        $categ[$specialstring] = 1;

+                                    if ($objMod->version == 'development' || $objMod->version == 'experimental') {
+                                                                            $specialstring = 'expdev';
+                                    }
+                                    if (isset($categ[$specialstring])) {
+                                                                            $categ[$specialstring] ++;
+                                    }
+                                    // Array of all different modules categories

+                                    else {
+                                                                            $categ[$specialstring] = 1;
+                                    }
                                     $j++;

                                     $i++;

-                                } else

-                                    dol_syslog("Module " . get_class($objMod) . " not qualified");

+                                } else {
+                                                                    dol_syslog("Module " . get_class($objMod) . " not qualified");
+                                }
                             } catch (Exception $e) {

                                 dol_syslog("Failed to load " . $dir . $file . " " . $e->getMessage(), LOG_ERR);

                             }

@@ -395,8 +411,9 @@ 
     if (!empty($modules[$value])) {

         $objMod = $modules[$value];

 

-        if (!empty($objMod->langfiles))

-            $langs->loadLangs($objMod->langfiles);

+        if (!empty($objMod->langfiles)) {
+                    $langs->loadLangs($objMod->langfiles);
+        }
 

         $form = new Form($db);

         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?value=' . $value . '&mode=' . $mode . $param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);

@@ -412,19 +429,24 @@ 
 

 $nbofactivatedmodules = count($conf->modules);

 $moreinfo = $langs->trans("TotalNumberOfActivatedModules", ($nbofactivatedmodules - 1), count($modules));

-if ($nbofactivatedmodules <= 1)

-    $moreinfo .= ' ' . img_warning($langs->trans("YouMustEnableOneModule"));

+if ($nbofactivatedmodules <= 1) {
+    $moreinfo .= ' ' . img_warning($langs->trans("YouMustEnableOneModule"));
+}
 print load_fiche_titre($langs->trans("ModulesSetup"), $moreinfo, 'title_setup');

 

 // Start to show page

-if ($mode == 'common')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDesc") . "</span><br>\n";

-if ($mode == 'marketplace')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesMarketPlaceDesc") . "</span><br>\n";

-if ($mode == 'deploy')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules")) . "</span><br>\n";

-if ($mode == 'develop')

-    print '<span class="opacitymedium">' . $langs->trans("ModulesDevelopDesc") . "</span><br>\n";

+if ($mode == 'common') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDesc") . "</span><br>\n";
+}
+if ($mode == 'marketplace') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesMarketPlaceDesc") . "</span><br>\n";
+}
+if ($mode == 'deploy') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules")) . "</span><br>\n";
+}
+if ($mode == 'develop') {
+    print '<span class="opacitymedium">' . $langs->trans("ModulesDevelopDesc") . "</span><br>\n";
+}
 

 $head = modules_prepare_head();

 

@@ -436,8 +458,9 @@ 
     dol_set_focus('#search_keyword');

 

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

-    if ($optioncss != '')

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

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

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

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

@@ -454,12 +477,15 @@ 
     $moreforfilter .= '</div>';

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

         $array_version = array('stable' => $langs->transnoentitiesnoconv("Stable"));

-        if ($conf->global->MAIN_FEATURES_LEVEL < 0)

-            $array_version['deprecated'] = $langs->trans("Deprecated");

-        if ($conf->global->MAIN_FEATURES_LEVEL > 0)

-            $array_version['experimental'] = $langs->trans("Experimental");

-        if ($conf->global->MAIN_FEATURES_LEVEL > 1)

-            $array_version['development'] = $langs->trans("Development");

+        if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
+                    $array_version['deprecated'] = $langs->trans("Deprecated");
+        }
+        if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+                    $array_version['experimental'] = $langs->trans("Experimental");
+        }
+        if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+                    $array_version['development'] = $langs->trans("Development");
+        }
         $moreforfilter .= '<div class="divsearchfield">';

         $moreforfilter .= $langs->trans('Version') . ': ' . $form->selectarray('search_version', $array_version, $search_version, 1);

         $moreforfilter .= '</div>';

@@ -487,8 +513,9 @@ 
 

     $parameters = array();

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

-    if ($reshook < 0)

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

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

     // Show list of modules

 

@@ -507,8 +534,10 @@ 
 

         //print $objMod->name." - ".$key." - ".$objMod->version."<br>";

         //if (($mode != (isset($specialtostring[$special])?$specialtostring[$special]:'unknown') && $mode != 'expdev')

-        if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental')

-            continue;    // Discard if not for current tab

+        if ($mode == 'expdev' && $objMod->version != 'development' && $objMod->version != 'experimental') {
+                    continue;
+        }
+        // Discard if not for current tab

 

         if (!$objMod->getName()) {

             dol_syslog("Error for module " . $key . " - Property name of module looks empty", LOG_WARNING);

@@ -528,40 +557,52 @@ 
         if ($search_keyword) {

             $qualified = 0;

             if (preg_match('/' . preg_quote($search_keyword) . '/i', $modulename) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduletechnicalname) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesc) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduledesclong) || preg_match('/' . preg_quote($search_keyword) . '/i', $moduleauthor)

-            )

-                $qualified = 1;

-            if (!$qualified)

-                continue;

+            ) {
+                            $qualified = 1;
+            }
+            if (!$qualified) {
+                            continue;
+            }
         }

         if ($search_status) {

-            if ($search_status == 'active' && empty($conf->global->$const_name))

-                continue;

-            if ($search_status == 'disabled' && !empty($conf->global->$const_name))

-                continue;

+            if ($search_status == 'active' && empty($conf->global->$const_name)) {
+                            continue;
+            }
+            if ($search_status == 'disabled' && !empty($conf->global->$const_name)) {
+                            continue;
+            }
         }

         if ($search_nature) {

-            if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external')

-                continue;

+            if (preg_match('/^external/', $search_nature) && $objMod->isCoreOrExternalModule() != 'external') {
+                            continue;
+            }
             if (preg_match('/^external_(.*)$/', $search_nature, $reg)) {

                 //print $reg[1].'-'.dol_escape_htmltag($objMod->getPublisher());

                 $publisher = dol_escape_htmltag($objMod->getPublisher());

-                if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher)

-                    continue;

-                if (!$reg[1] && !empty($publisher))

-                    continue;

+                if ($reg[1] && dol_escape_htmltag($reg[1]) != $publisher) {
+                                    continue;
+                }
+                if (!$reg[1] && !empty($publisher)) {
+                                    continue;
+                }
             }

-            if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external')

-                continue;

+            if ($search_nature == 'core' && $objMod->isCoreOrExternalModule() == 'external') {
+                            continue;
+            }
         }

         if ($search_version) {

-            if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable')

-                continue;

-            if ($objMod->version != 'development' && ($search_version == 'development'))

-                continue;

-            if ($objMod->version != 'experimental' && ($search_version == 'experimental'))

-                continue;

-            if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated'))

-                continue;

+            if (($objMod->version == 'development' || $objMod->version == 'experimental' || preg_match('/deprecated/', $objMod->version)) && $search_version == 'stable') {
+                            continue;
+            }
+            if ($objMod->version != 'development' && ($search_version == 'development')) {
+                            continue;
+            }
+            if ($objMod->version != 'experimental' && ($search_version == 'experimental')) {
+                            continue;
+            }
+            if (!preg_match('/deprecated/', $objMod->version) && ($search_version == 'deprecated')) {
+                            continue;
+            }
         }

 

         // Load all lang files of module

@@ -599,12 +640,15 @@ 
         // Version (with picto warning or not)

         $version = $objMod->getVersion(0);

         $versiontrans = '';

-        if (preg_match('/development/i', $version))

-            $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');

-        if (preg_match('/experimental/i', $version))

-            $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');

-        if (preg_match('/deprecated/i', $version))

-            $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');

+        if (preg_match('/development/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
+        }
+        if (preg_match('/experimental/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
+        }
+        if (preg_match('/deprecated/i', $version)) {
+                    $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
+        }
         $versiontrans .= $objMod->getVersion(1);

 

         // Define imginfo

@@ -614,8 +658,9 @@ 
         }

 

         print '<tr class="oddeven">' . "\n";

-        if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS))

-            print '<td width="20px">' . ++$linenum . '</td>';

+        if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
+                    print '<td width="20px">' . ++$linenum . '</td>';
+        }
 

         // Picto + Name of module

         print '  <td width="200px">';

@@ -623,12 +668,12 @@ 
         //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);

         //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);

         if (!empty($objMod->picto)) {

-            if (preg_match('/^\//i', $objMod->picto))

-                print img_picto($alttext, $objMod->picto, ' width="14px"', 1);

-            else

-                print img_object($alttext, $objMod->picto, 'class="valignmiddle" width="14px"');

-        }

-        else {

+            if (preg_match('/^\//i', $objMod->picto)) {
+                            print img_picto($alttext, $objMod->picto, ' width="14px"', 1);
+            } else {
+                            print img_object($alttext, $objMod->picto, 'class="valignmiddle" width="14px"');
+            }
+        } else {

             print img_object($alttext, 'generic', 'class="valignmiddle"');

         }

         print ' <span class="valignmiddle">' . $objMod->getName() . '</span>';

@@ -673,16 +718,16 @@ 
             if (!empty($objMod->disabled)) {

                 print $langs->trans("Disabled");

             } else if (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {

-                if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed())

-                    print $langs->trans("Used");

-                else {

+                if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+                                    print $langs->trans("Used");
+                } else {

                     print img_picto($langs->trans("Required"), 'switch_on');

                     print $langs->trans("Required");

                 }

-                if (!empty($conf->multicompany->enabled) && $user->entity)

-                    $disableSetup++;

-            }

-            else {

+                if (!empty($conf->multicompany->enabled) && $user->entity) {
+                                    $disableSetup++;
+                }
+            } else {

                 if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {

                     //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

                     print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=reset_confirm&amp;confirm_message_code=' . $objMod->warnings_unactivation[$mysoc->country_code] . '&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';

@@ -700,14 +745,19 @@ 
             // Link config

             if (!empty($objMod->config_page_url) && !$disableSetup) {

                 $backtourlparam = '';

-                if ($search_keyword != '')

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_keyword=' . $search_keyword; // No urlencode here, done later

-                if ($search_nature > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_nature=' . $search_nature;

-                if ($search_version > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_version=' . $search_version;

-                if ($search_status > -1)

-                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_status=' . $search_status;

+                if ($search_keyword != '') {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_keyword=' . $search_keyword;
+                }
+                // No urlencode here, done later

+                if ($search_nature > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_nature=' . $search_nature;
+                }
+                if ($search_version > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_version=' . $search_version;
+                }
+                if ($search_status > -1) {
+                                    $backtourlparam .= ($backtourlparam ? '&' : '?') . 'search_status=' . $search_status;
+                }
                 $backtourl = $_SERVER["PHP_SELF"] . $backtourlparam;

 

                 if (is_array($objMod->config_page_url)) {

@@ -766,10 +816,12 @@ 
                                 if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^' . $mysoc->country_code . '/', $keycountry))) {

                                     $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());

                                     $warningmessage .= ($warningmessage ? "\n" : "") . ($warningmessage ? "\n" : "") . $langs->trans("Module") . ' : ' . $objMod->getName();

-                                    if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("Publisher") . ' : ' . $objMod->editor_name;

-                                    if (!empty($objMod->editor_name))

-                                        $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("ModuleTriggeringThisWarning") . ' : ' . $modules[$keymodule]->getName();

+                                    if (!empty($objMod->editor_name)) {
+                                                                            $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("Publisher") . ' : ' . $objMod->editor_name;
+                                    }
+                                    if (!empty($objMod->editor_name)) {
+                                                                            $warningmessage .= ($warningmessage ? "\n" : "") . $langs->trans("ModuleTriggeringThisWarning") . ' : ' . $modules[$keymodule]->getName();
+                                    }
                                 }

                             }

                         }

@@ -778,8 +830,9 @@ 
                 print '<!-- Message to show: ' . $warningmessage . ' -->' . "\n";

                 //print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

                 print '<a class="reposition" href="?controller=admin&method=modules&id=' . $objMod->numero . '&amp;module_position=' . $module_position . '&amp;action=set&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '"';

-                if ($warningmessage)

-                    print ' onclick="return confirm(\'' . dol_escape_js($warningmessage) . '\');"';

+                if ($warningmessage) {
+                                    print ' onclick="return confirm(\'' . dol_escape_js($warningmessage) . '\');"';
+                }
                 print '>';

                 print img_picto($langs->trans("Disabled"), 'switch_off');

                 print "</a>\n";

@@ -898,8 +951,9 @@ 
     $dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);

     $allowonlineinstall = true;

     $allowfromweb = 1;

-    if (dol_is_file($dolibarrdataroot . '/installmodules.lock'))

-        $allowonlineinstall = false;

+    if (dol_is_file($dolibarrdataroot . '/installmodules.lock')) {
+            $allowonlineinstall = false;
+    }
 

     $fullurl = '<a href="' . $urldolibarrmodules . '" target="_blank">' . $urldolibarrmodules . '</a>';

     $message = '';

@@ -958,18 +1012,23 @@ 
 

             $max = $conf->global->MAIN_UPLOAD_DOC;  // En Kb

             $maxphp = @ini_get('upload_max_filesize'); // En inconnu

-            if (preg_match('/k$/i', $maxphp))

-                $maxphp = $maxphp * 1;

-            if (preg_match('/m$/i', $maxphp))

-                $maxphp = $maxphp * 1024;

-            if (preg_match('/g$/i', $maxphp))

-                $maxphp = $maxphp * 1024 * 1024;

-            if (preg_match('/t$/i', $maxphp))

-                $maxphp = $maxphp * 1024 * 1024 * 1024;

+            if (preg_match('/k$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1;
+            }
+            if (preg_match('/m$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024;
+            }
+            if (preg_match('/g$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024 * 1024;
+            }
+            if (preg_match('/t$/i', $maxphp)) {
+                            $maxphp = $maxphp * 1024 * 1024 * 1024;
+            }
             // Now $max and $maxphp are in Kb

             $maxmin = $max;

-            if ($maxphp > 0)

-                $maxmin = min($max, $maxphp);

+            if ($maxphp > 0) {
+                            $maxmin = min($max, $maxphp);
+            }
 

             if ($maxmin > 0) {

                 print '<script type="text/javascript">

dolibarr/htdocs/core/get_info.php

Braces +4 added lines, -2 removed lines

@@ -128,8 +128,10 @@
     } else {

         $toprightmenu = $hookmanager->resPrint; // replace

     }

-} else

-    $toprightmenu .= $result; // For backward compatibility

+} else {
+    $toprightmenu .= $result;
+}
+// For backward compatibility

 

 

 

dolibarr/htdocs/user/class/user.class.php

Braces +308 added lines, -226 removed lines

@@ -247,10 +247,14 @@ 
                 $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

             }

         } else {  // The fetch was forced on an entity

-            if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))

-                $sql .= " WHERE u.entity IS NOT NULL";    // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

-            else

-                $sql .= " WHERE u.entity IN (0, " . (($entity != '' && $entity >= 0) ? $entity : $conf->entity) . ")";   // search in entity provided in parameter

+            if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+                            $sql .= " WHERE u.entity IS NOT NULL";
+            }
+            // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database

+            else {
+                            $sql .= " WHERE u.entity IN (0, " . (($entity != '' && $entity >= 0) ? $entity : $conf->entity) . ")";
+            }
+            // search in entity provided in parameter

         }

 

         if ($sid) {    // permet une recherche du user par son SID ActiveDirectory ou Samba

@@ -342,16 +346,16 @@ 
 

                 // Protection when module multicompany was set, admin was set to first entity and then, the module was disabled,

                 // in such case, this admin user must be admin for ALL entities.

-                if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1)

-                    $this->entity = 0;

+                if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) {
+                                    $this->entity = 0;
+                }
 

                 // Retreive all extrafield

                 // fetch optionals attributes and labels

                 $this->fetch_optionals();

 

                 $this->db->free($result);

-            }

-            else {

+            } else {

                 $this->error = "USERNOTFOUND";

                 dol_syslog(get_class($this) . "::fetch user not found", LOG_DEBUG);

 

@@ -377,13 +381,13 @@ 
                 while ($i < $num) {

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

                     $p = (!empty($obj->param) ? $obj->param : '');

-                    if (!empty($p))

-                        $this->conf->$p = $obj->value;

+                    if (!empty($p)) {
+                                            $this->conf->$p = $obj->value;
+                    }
                     $i++;

                 }

                 $this->db->free($resql);

-            }

-            else {

+            } else {

                 $this->error = $this->db->lasterror();

                 return -2;

             }

@@ -492,12 +496,12 @@ 
             // Where pour la liste des droits a ajouter

             $whereforadd = "id=" . $this->db->escape($rid);

             // Ajout des droits induits

-            if (!empty($subperms))

-                $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";

-            else if (!empty($perms))

-                $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";

-        }

-        else {

+            if (!empty($subperms)) {
+                            $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
+            } else if (!empty($perms)) {
+                            $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
+            }
+        } else {

             // On a pas demande un droit en particulier mais une liste de droits

             // sur la base d'un nom de module de de perms

             // Where pour la liste des droits a ajouter

@@ -506,8 +510,9 @@ 
                     $whereforadd = 'allmodules';

                 } else {

                     $whereforadd = "module='" . $this->db->escape($allmodule) . "'";

-                    if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                    if (!empty($allperms)) {
+                                            $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";
+                    }
                 }

             }

         }

@@ -531,16 +536,17 @@ 
                     $nid = $obj->id;

 

                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id . " AND fk_id=" . $nid . " AND entity = " . $entity;

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
                     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error($this->db);

             }

@@ -610,12 +616,13 @@ 
             // Where pour la liste des droits a supprimer

             $wherefordel = "id=" . $this->db->escape($rid);

             // Suppression des droits induits

-            if ($subperms == 'lire' || $subperms == 'read')

-                $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";

-            if ($perms == 'lire' || $perms == 'read')

-                $wherefordel .= " OR (module='$module')";

-        }

-        else {

+            if ($subperms == 'lire' || $subperms == 'read') {
+                            $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
+            }
+            if ($perms == 'lire' || $perms == 'read') {
+                            $wherefordel .= " OR (module='$module')";
+            }
+        } else {

             // On a demande suppression d'un droit sur la base d'un nom de module ou perms

             // Where pour la liste des droits a supprimer

             if (!empty($allmodule)) {

@@ -623,8 +630,9 @@ 
                     $wherefordel = 'allmodules';

                 } else {

                     $wherefordel = "module='" . $this->db->escape($allmodule) . "'";

-                    if (!empty($allperms))

-                        $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";

+                    if (!empty($allperms)) {
+                                            $whereforadd .= " AND perms='" . $this->db->escape($allperms) . "'";
+                    }
                 }

             }

         }

@@ -650,13 +658,13 @@ 
                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights";

                     $sql .= " WHERE fk_user = " . $this->id . " AND fk_id=" . $nid;

                     $sql .= " AND entity = " . $entity;

-                    if (!$this->db->query($sql))

-                        $error++;

+                    if (!$this->db->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error($this->db);

             }

@@ -734,8 +742,9 @@ 
         }

         $sql .= " AND ur.fk_user= " . $this->id;

         $sql .= " AND r.perms IS NOT NULL";

-        if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+        if ($moduletag) {
+                    $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";
+        }
 

         $resql = $this->db->query($sql);

         if ($resql) {

@@ -749,21 +758,26 @@ 
                 $subperms = $obj->subperms;

 

                 if ($perms) {

-                    if (!isset($this->rights) || !is_object($this->rights))

-                        $this->rights = new stdClass(); // For avoid error

+                    if (!isset($this->rights) || !is_object($this->rights)) {
+                                            $this->rights = new stdClass();
+                    }
+                    // For avoid error

                     if ($module) {

-                        if (!isset($this->rights->$module) || !is_object($this->rights->$module))

-                            $this->rights->$module = new stdClass();

+                        if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+                                                    $this->rights->$module = new stdClass();
+                        }
                         if ($subperms) {

-                            if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms))

-                                $this->rights->$module->$perms = new stdClass();

-                            if (empty($this->rights->$module->$perms->$subperms))

-                                $this->nb_rights++;

+                            if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+                                                            $this->rights->$module->$perms = new stdClass();
+                            }
+                            if (empty($this->rights->$module->$perms->$subperms)) {
+                                                            $this->nb_rights++;
+                            }
                             $this->rights->$module->$perms->$subperms = 1;

-                        }

-                        else {

-                            if (empty($this->rights->$module->$perms))

-                                $this->nb_rights++;

+                        } else {

+                            if (empty($this->rights->$module->$perms)) {
+                                                            $this->nb_rights++;
+                            }
                             $this->rights->$module->$perms = 1;

                         }

                     }

@@ -792,8 +806,9 @@ 
         $sql .= " AND gr.fk_usergroup = gu.fk_usergroup";

         $sql .= " AND gu.fk_user = " . $this->id;

         $sql .= " AND r.perms IS NOT NULL";

-        if ($moduletag)

-            $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";

+        if ($moduletag) {
+                    $sql .= " AND r.module = '" . $this->db->escape($moduletag) . "'";
+        }
 

         $resql = $this->db->query($sql);

         if ($resql) {

@@ -807,23 +822,29 @@ 
                 $subperms = $obj->subperms;

 

                 if ($perms) {

-                    if (!isset($this->rights) || !is_object($this->rights))

-                        $this->rights = new stdClass(); // For avoid error

-                    if (!isset($this->rights->$module) || !is_object($this->rights->$module))

-                        $this->rights->$module = new stdClass();

+                    if (!isset($this->rights) || !is_object($this->rights)) {
+                                            $this->rights = new stdClass();
+                    }
+                    // For avoid error

+                    if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+                                            $this->rights->$module = new stdClass();
+                    }
                     if ($subperms) {

-                        if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms))

-                            $this->rights->$module->$perms = new stdClass();

-                        if (empty($this->rights->$module->$perms->$subperms))

-                            $this->nb_rights++;

+                        if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+                                                    $this->rights->$module->$perms = new stdClass();
+                        }
+                        if (empty($this->rights->$module->$perms->$subperms)) {
+                                                    $this->nb_rights++;
+                        }
                         $this->rights->$module->$perms->$subperms = 1;

-                    }

-                    else {

-                        if (empty($this->rights->$module->$perms))

-                            $this->nb_rights++;

+                    } else {

+                        if (empty($this->rights->$module->$perms)) {
+                                                    $this->nb_rights++;
+                        }
                         // if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group

-                        if (!is_object($this->rights->$module->$perms))

-                            $this->rights->$module->$perms = 1;

+                        if (!is_object($this->rights->$module->$perms)) {
+                                                    $this->rights->$module->$perms = 1;
+                        }
                     }

                 }

                 $i++;

@@ -832,10 +853,12 @@ 
         }

 

         // For backward compatibility

-        if (isset($this->rights->propale) && !isset($this->rights->propal))

-            $this->rights->propal = $this->rights->propale;

-        if (isset($this->rights->propal) && !isset($this->rights->propale))

-            $this->rights->propale = $this->rights->propal;

+        if (isset($this->rights->propale) && !isset($this->rights->propal)) {
+                    $this->rights->propal = $this->rights->propale;
+        }
+        if (isset($this->rights->propal) && !isset($this->rights->propale)) {
+                    $this->rights->propale = $this->rights->propal;
+        }
 

         if (!$moduletag) {

             // Si module etait non defini, alors on a tout charge, on peut donc considerer

@@ -860,10 +883,11 @@ 
         $error = 0;

 

         // Check parameters

-        if ($this->statut == $statut)

-            return 0;

-        else

-            $this->statut = $statut;

+        if ($this->statut == $statut) {
+                    return 0;
+        } else {
+                    $this->statut = $statut;
+        }
 

         $this->db->begin();

 

@@ -1030,8 +1054,10 @@ 
 

         // Clean parameters

         $this->login = trim($this->login);

-        if (!isset($this->entity))

-            $this->entity = $conf->entity; // If not defined, we use default value

+        if (!isset($this->entity)) {
+                    $this->entity = $conf->entity;
+        }
+        // If not defined, we use default value

 

         dol_syslog(get_class($this) . "::create login=" . $this->login . ", user=" . (is_object($user) ? $user->id : ''), LOG_DEBUG);

 

@@ -1167,8 +1193,9 @@ 
         $this->country_id = $contact->country_id;

         $this->employee = 0;

 

-        if (empty($login))

-            $login = strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));

+        if (empty($login)) {
+                    $login = strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
+        }
         $this->login = $login;

 

         $this->db->begin();

@@ -1178,8 +1205,9 @@ 
         if ($result > 0) {

             $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

             $sql .= " SET fk_socpeople=" . $contact->id;

-            if ($contact->socid)

-                $sql .= ", fk_soc=" . $contact->socid;

+            if ($contact->socid) {
+                            $sql .= ", fk_soc=" . $contact->socid;
+            }
             $sql .= " WHERE rowid=" . $this->id;

             $resql = $this->db->query($sql);

 

@@ -1240,8 +1268,9 @@ 
         $this->state_id = $member->state_id;

         $this->country_id = $member->country_id;

 

-        if (empty($login))

-            $login = strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));

+        if (empty($login)) {
+                    $login = strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));
+        }
         $this->login = $login;

 

         $this->db->begin();

@@ -1250,8 +1279,9 @@ 
         $result = $this->create($user);

         if ($result > 0) {

             $newpass = $this->setPassword($user, $this->pass);

-            if (is_numeric($newpass) && $newpass < 0)

-                $result = -2;

+            if (is_numeric($newpass) && $newpass < 0) {
+                            $result = -2;
+            }
 

             if ($result > 0 && $member->fk_soc) { // If member is linked to a thirdparty

                 $sql = "UPDATE " . MAIN_DB_PREFIX . "user";

@@ -1317,8 +1347,9 @@ 
 

             $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";

             $result = $this->db->query($sql);

-            if (!$result)

-                return -1;

+            if (!$result) {
+                            return -1;
+            }
             $i++;

         }

 

@@ -1403,8 +1434,10 @@ 
         $sql .= ", api_key = " . ($this->api_key ? "'" . $this->db->escape($this->api_key) . "'" : "null");

         $sql .= ", gender = " . ($this->gender != -1 ? "'" . $this->db->escape($this->gender) . "'" : "null"); // 'man' or 'woman'

         $sql .= ", birth=" . (strval($this->birth) != '' ? "'" . $this->db->idate($this->birth) . "'" : 'null');

-        if (!empty($user->admin))

-            $sql .= ", admin = " . $this->admin; // admin flag can be set/unset only by an admin user

+        if (!empty($user->admin)) {
+                    $sql .= ", admin = " . $this->admin;
+        }
+        // admin flag can be set/unset only by an admin user

         $sql .= ", address = '" . $this->db->escape($this->address) . "'";

         $sql .= ", zip = '" . $this->db->escape($this->zip) . "'";

         $sql .= ", town = '" . $this->db->escape($this->town) . "'";

@@ -1427,14 +1460,18 @@ 
         $sql .= ", photo = " . ($this->photo ? "'" . $this->db->escape($this->photo) . "'" : "null");

         $sql .= ", openid = " . ($this->openid ? "'" . $this->db->escape($this->openid) . "'" : "null");

         $sql .= ", fk_user = " . ($this->fk_user > 0 ? "'" . $this->db->escape($this->fk_user) . "'" : "null");

-        if (isset($this->thm) || $this->thm != '')

-            $sql .= ", thm= " . ($this->thm != '' ? "'" . $this->db->escape($this->thm) . "'" : "null");

-        if (isset($this->tjm) || $this->tjm != '')

-            $sql .= ", tjm= " . ($this->tjm != '' ? "'" . $this->db->escape($this->tjm) . "'" : "null");

-        if (isset($this->salary) || $this->salary != '')

-            $sql .= ", salary= " . ($this->salary != '' ? "'" . $this->db->escape($this->salary) . "'" : "null");

-        if (isset($this->salaryextra) || $this->salaryextra != '')

-            $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . $this->db->escape($this->salaryextra) . "'" : "null");

+        if (isset($this->thm) || $this->thm != '') {
+                    $sql .= ", thm= " . ($this->thm != '' ? "'" . $this->db->escape($this->thm) . "'" : "null");
+        }
+        if (isset($this->tjm) || $this->tjm != '') {
+                    $sql .= ", tjm= " . ($this->tjm != '' ? "'" . $this->db->escape($this->tjm) . "'" : "null");
+        }
+        if (isset($this->salary) || $this->salary != '') {
+                    $sql .= ", salary= " . ($this->salary != '' ? "'" . $this->db->escape($this->salary) . "'" : "null");
+        }
+        if (isset($this->salaryextra) || $this->salaryextra != '') {
+                    $sql .= ", salaryextra= " . ($this->salaryextra != '' ? "'" . $this->db->escape($this->salaryextra) . "'" : "null");
+        }
         $sql .= ", weeklyhours= " . ($this->weeklyhours != '' ? "'" . $this->db->escape($this->weeklyhours) . "'" : "null");

         $sql .= ", entity = '" . $this->db->escape($this->entity) . "'";

         $sql .= ", default_range = " . ($this->default_range > 0 ? $this->default_range : 'null');

@@ -1452,8 +1489,9 @@ 
                 if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {

                     // Si mot de passe saisi et different de celui en base

                     $result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);

-                    if (!$nbrowsaffected)

-                        $nbrowsaffected++;

+                    if (!$nbrowsaffected) {
+                                            $nbrowsaffected++;
+                    }
                 }

             }

 

@@ -1679,8 +1717,9 @@ 
 

         // Mise a jour

         if (!$changelater) {

-            if (!is_object($this->oldcopy))

-                $this->oldcopy = clone $this;

+            if (!is_object($this->oldcopy)) {
+                            $this->oldcopy = clone $this;
+            }
 

             $this->db->begin();

 

@@ -1798,8 +1837,9 @@ 
         $outputlangs->loadLangs(array("main", "errors", "users", "other"));

 

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

         $subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword", $appli);

 

@@ -2127,8 +2167,9 @@ 
             $label .= '<br>';

             $label .= '<br><u>' . $langs->trans("Connection") . '</u>';

             $label .= '<br><b>' . $langs->trans("IPAddress") . '</b>: ' . $_SERVER["REMOTE_ADDR"];

-            if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY))

-                $label .= '<br><b>' . $langs->trans("ConnectedOnMultiCompany") . ':</b> ' . $conf->entity . ' (user entity ' . $this->entity . ')';

+            if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+                            $label .= '<br><b>' . $langs->trans("ConnectedOnMultiCompany") . ':</b> ' . $conf->entity . ' (user entity ' . $this->entity . ')';
+            }
             $label .= '<br><b>' . $langs->trans("AuthenticationMode") . ':</b> ' . $_SESSION["dol_authmode"] . (empty($dolibarr_main_demo) ? '' : ' (demo)');

             $label .= '<br><b>' . $langs->trans("ConnectedSince") . ':</b> ' . dol_print_date($this->datelastlogin, "dayhour", 'tzuser');

             $label .= '<br><b>' . $langs->trans("PreviousConnexion") . ':</b> ' . dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');

@@ -2139,13 +2180,16 @@ 
             $label .= '<br><b>' . $langs->trans("Browser") . ':</b> ' . $conf->browser->name . ($conf->browser->version ? ' ' . $conf->browser->version : '') . ' (' . $_SERVER['HTTP_USER_AGENT'] . ')';

             $label .= '<br><b>' . $langs->trans("Layout") . ':</b> ' . $conf->browser->layout;

             $label .= '<br><b>' . $langs->trans("Screen") . ':</b> ' . $_SESSION['dol_screenwidth'] . ' x ' . $_SESSION['dol_screenheight'];

-            if ($conf->browser->layout == 'phone')

-                $label .= '<br><b>' . $langs->trans("Phone") . ':</b> ' . $langs->trans("Yes");

-            if (!empty($_SESSION["disablemodules"]))

-                $label .= '<br><b>' . $langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));

+            if ($conf->browser->layout == 'phone') {
+                            $label .= '<br><b>' . $langs->trans("Phone") . ':</b> ' . $langs->trans("Yes");
+            }
+            if (!empty($_SESSION["disablemodules"])) {
+                            $label .= '<br><b>' . $langs->trans("DisabledModules") . ':</b> <br>' . join(', ', explode(',', $_SESSION["disablemodules"]));
+            }
         }

-        if ($infologin < 0)

-            $label = '';

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

         // $url = DOL_URL_ROOT . '/user/card.php?id=' . $this->id;

         $url = BASE_URI . '?controller=user&method=card&id=' . $this->id;

@@ -2156,10 +2200,12 @@ 
         if ($option != 'nolink') {

             // 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';
+            }
         }

 

         $linkstart = '<a href="' . $url . '"';

@@ -2188,25 +2234,31 @@ 
         $result .= (($option == 'nolink') ? '' : $linkstart);

         if ($withpictoimg) {

             $paddafterimage = '';

-            if (abs($withpictoimg) == 1)

-                $paddafterimage = 'style="margin-right: 3px;"';

+            if (abs($withpictoimg) == 1) {
+                            $paddafterimage = 'style="margin-right: 3px;"';
+            }
             // Only picto

-            if ($withpictoimg > 0)

-                $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';

+            if ($withpictoimg > 0) {
+                            $picto = '<!-- picto user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '">' . img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</div>';
+            }
             // Picto must be a photo

-            else

-                $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';

+            else {
+                            $picto = '<!-- picto photo user --><div class="inline-block nopadding userimg' . ($morecss ? ' ' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>' . Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1) . '</div>';
+            }
             $result .= $picto;

         }

         if ($withpictoimg > -2 && $withpictoimg != 2) {

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';

-            if ($mode == 'login')

-                $result .= dol_trunc($this->login, $maxlen);

-            else

-                $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '</div>';

+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '<div class="inline-block nopadding valignmiddle usertext' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') . ($morecss ? ' ' . $morecss : '') . '">';
+            }
+            if ($mode == 'login') {
+                            $result .= dol_trunc($this->login, $maxlen);
+            } else {
+                            $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+            }
+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '</div>';
+            }
         }

         $result .= (($option == 'nolink') ? '' : $linkend);

         //if ($withpictoimg == -1) $result.='</div>';

@@ -2244,8 +2296,9 @@ 
         $linkend = '</a>';

 

         //Check user's rights to see an other user

-        if ((!$user->rights->user->user->lire && $this->id != $user->id))

-            $option = 'nolink';

+        if ((!$user->rights->user->user->lire && $this->id != $user->id)) {
+                    $option = 'nolink';
+        }
 

         if ($option == 'xxx') {

             //$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';

@@ -2259,8 +2312,9 @@ 
         }

 

         $result .= $linkstart;

-        if ($withpicto)

-            $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');

+        if ($withpicto) {
+                    $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+        }
         $result .= $this->login;

         $result .= $linkend;

         return $result;

@@ -2292,40 +2346,41 @@ 
         $langs->load('users');

 

         if ($mode == 0) {

-            if ($statut == 1)

-                return $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled');

-        }

-        elseif ($mode == 1) {

-            if ($statut == 1)

-                return $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled');

-        }

-        elseif ($mode == 2) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

-        }

-        elseif ($mode == 3) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

-        }

-        elseif ($mode == 4) {

-            if ($statut == 1)

-                return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');

-            elseif ($statut == 0)

-                return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');

-        }

-        elseif ($mode == 5) {

-            if ($statut == 1)

-                return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');

-            elseif ($statut == 0)

-                return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');

+            if ($statut == 1) {
+                            return $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled');
+            }
+        } elseif ($mode == 1) {

+            if ($statut == 1) {
+                            return $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled');
+            }
+        } elseif ($mode == 2) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');
+            }
+        } elseif ($mode == 3) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+            }
+        } elseif ($mode == 4) {

+            if ($statut == 1) {
+                            return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"') . ' ' . $langs->trans('Enabled');
+            } elseif ($statut == 0) {
+                            return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"') . ' ' . $langs->trans('Disabled');
+            }
+        } elseif ($mode == 5) {

+            if ($statut == 1) {
+                            return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
+            } elseif ($statut == 0) {
+                            return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+            }
         }

     }

 

@@ -2344,12 +2399,13 @@ 
         // phpcs:enable

         global $conf;

         $dn = '';

-        if ($mode == 0)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . $conf->global->LDAP_USER_DN;

-        elseif ($mode == 1)

-            $dn = $conf->global->LDAP_USER_DN;

-        elseif ($mode == 2)

-            $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS];

+        if ($mode == 0) {
+                    $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS] . "," . $conf->global->LDAP_USER_DN;
+        } elseif ($mode == 1) {
+                    $dn = $conf->global->LDAP_USER_DN;
+        } elseif ($mode == 2) {
+                    $dn = $conf->global->LDAP_KEY_USERS . "=" . $info[$conf->global->LDAP_KEY_USERS];
+        }
         return $dn;

     }

 

@@ -2396,38 +2452,51 @@ 
 

                 // Check if it is the LDAP key and if its value has been changed

                 if (!empty($conf->global->LDAP_KEY_USERS) && $conf->global->LDAP_KEY_USERS == $conf->global->$constname) {

-                    if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname)

-                        $keymodified = true; // For check if LDAP key has been modified

+                    if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
+                                            $keymodified = true;
+                    }
+                    // For check if LDAP key has been modified

                 }

             }

         }

-        if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS))

-            $info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;

-        if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP))

-            $info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;

-        if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN))

-            $info[$conf->global->LDAP_FIELD_TOWN] = $this->town;

-        if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION))

-            $info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);

+        if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS)) {
+                    $info[$conf->global->LDAP_FIELD_ADDRESS] = $this->address;
+        }
+        if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP)) {
+                    $info[$conf->global->LDAP_FIELD_ZIP] = $this->zip;
+        }
+        if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN)) {
+                    $info[$conf->global->LDAP_FIELD_TOWN] = $this->town;
+        }
+        if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION)) {
+                    $info[$conf->global->LDAP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 2);
+        }
         if ($this->socid > 0) {

             $soc = new Societe($this->db);

             $soc->fetch($this->socid);

 

             $info[$conf->global->LDAP_FIELD_COMPANY] = $soc->name;

-            if ($soc->client == 1)

-                $info["businessCategory"] = "Customers";

-            if ($soc->client == 2)

-                $info["businessCategory"] = "Prospects";

-            if ($soc->fournisseur == 1)

-                $info["businessCategory"] = "Suppliers";

+            if ($soc->client == 1) {
+                            $info["businessCategory"] = "Customers";
+            }
+            if ($soc->client == 2) {
+                            $info["businessCategory"] = "Prospects";
+            }
+            if ($soc->fournisseur == 1) {
+                            $info["businessCategory"] = "Suppliers";
+            }
         }

 

         // When password is modified

         if (!empty($this->pass)) {

-            if (!empty($conf->global->LDAP_FIELD_PASSWORD))

-                $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte

-            if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))

-                $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)

+            if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+                            $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass;
+            }
+            // this->pass = mot de passe non crypte

+            if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+                            $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4);
+            }
+            // Create OpenLDAP MD5 password (TODO add type of encryption)

         }

         // Set LDAP password if possible

         elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password

@@ -2441,10 +2510,14 @@ 
             }

             // Use $this->pass_indatabase value if exists

             elseif (!empty($this->pass_indatabase)) {

-                if (!empty($conf->global->LDAP_FIELD_PASSWORD))

-                    $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte

-                if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED))

-                    $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption

+                if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+                                    $info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase;
+                }
+                // $this->pass_indatabase = mot de passe non crypte

+                if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+                                    $info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4);
+                }
+                // md5 for OpenLdap TODO add type of encryption

             }

         }

 

@@ -2467,10 +2540,12 @@ 
 

             $info["phpgwContactOwner"] = $this->egroupware_id;

 

-            if ($this->email)

-                $info["rfc822Mailbox"] = $this->email;

-            if ($this->phone_mobile)

-                $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;

+            if ($this->email) {
+                            $info["rfc822Mailbox"] = $this->email;
+            }
+            if ($this->phone_mobile) {
+                            $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+            }
         }

 

         return $info;

@@ -2595,15 +2670,17 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "user";

         if ($option == 'superadmin') {

             $sql .= " WHERE entity = 0";

-            if ($admin >= 0)

-                $sql .= " AND admin = " . $admin;

-        }

-        else {

+            if ($admin >= 0) {
+                            $sql .= " AND admin = " . $admin;
+            }
+        } else {

             $sql .= " WHERE entity IN (" . getEntity('user', 0) . ")";

-            if ($limitTo == 'active')

-                $sql .= " AND statut = 1";

-            if ($admin >= 0)

-                $sql .= " AND admin = " . $admin;

+            if ($limitTo == 'active') {
+                            $sql .= " AND statut = 1";
+            }
+            if ($admin >= 0) {
+                            $sql .= " AND admin = " . $admin;
+            }
         }

 

         $resql = $this->db->query($sql);

@@ -2756,8 +2833,9 @@ 
         } else {

             $sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

         }

-        if ($filter)

-            $sql .= " AND " . $filter;

+        if ($filter) {
+                    $sql .= " AND " . $filter;
+        }
 

         dol_syslog(get_class($this) . "::get_full_tree get user list", LOG_DEBUG);

         $resql = $this->db->query($sql);

@@ -2839,14 +2917,16 @@ 
             dol_syslog("Build childid for id = " . $idtoscan);

             foreach ($this->users as $id => $val) {

                 //var_dump($val['fullpath']);

-                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath']))

-                    $childids[$val['id']] = $val['id'];

+                if (preg_match('/_' . $idtoscan . '_/', $val['fullpath'])) {
+                                    $childids[$val['id']] = $val['id'];
+                }
             }

         }

         $this->cache_childids[$this->id] = $childids;

 

-        if ($addcurrentuser)

-            $childids[$this->id] = $this->id;

+        if ($addcurrentuser) {
+                    $childids[$this->id] = $this->id;
+        }
 

         return $childids;

     }

@@ -2990,8 +3070,9 @@ 
         // phpcs:enable

         $user_property = '';

 

-        if (empty($rowid))

-            return '';

+        if (empty($rowid)) {
+                    return '';
+        }
 

         $sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";

         $sql .= " FROM " . MAIN_DB_PREFIX . "user";

@@ -3004,14 +3085,14 @@ 
             if ($nump) {

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

 

-                if ($mode == 'email')

-                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";

-                else if ($mode == 'mobile')

-                    $user_property = $obj->user_mobile;

+                if ($mode == 'email') {
+                                    $user_property = dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">";
+                } else if ($mode == 'mobile') {
+                                    $user_property = $obj->user_mobile;
+                }
             }

             return $user_property;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -3054,8 +3135,9 @@ 
             $sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';

         }

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

-        if ($limit)

-            $sql .= $this->db->plimit($limit + 1, $offset);

+        if ($limit) {
+                    $sql .= $this->db->plimit($limit + 1, $offset);
+        }
 

         dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);

 

dolibarr/htdocs/accountancy/index.php

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict"));

 

 // Security check

-if ($user->societe_id > 0)

-    accessforbidden();

+if ($user->societe_id > 0) {
+    accessforbidden();
+}
 

 /*

  * Actions