alxarafe / alixar

dolibarr/htdocs/product/card.php

Braces +132 added lines, -100 removed lines

@@ -110,16 +110,18 @@ 
 if ($id > 0 || !empty($ref)) {

     $result = $object->fetch($id, $ref);

 

-    if (!empty($conf->product->enabled))

-        $upload_dir = $conf->product->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

-    elseif (!empty($conf->service->enabled))

-        $upload_dir = $conf->service->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

+    if (!empty($conf->product->enabled)) {
+            $upload_dir = $conf->product->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);
+    } elseif (!empty($conf->service->enabled)) {
+            $upload_dir = $conf->service->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);
+    }
 

     if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {    // For backward compatiblity, we scan also old dirs

-        if (!empty($conf->product->enabled))

-            $upload_dirold = $conf->product->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

-        else

-            $upload_dirold = $conf->service->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

+        if (!empty($conf->product->enabled)) {
+                    $upload_dirold = $conf->product->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";
+        } else {
+                    $upload_dirold = $conf->service->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";
+        }
     }

 }

 

@@ -148,20 +150,23 @@ 
  * Actions

  */

 

-if ($cancel)

-    $action = '';

+if ($cancel) {
+    $action = '';
+}
 

 $usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));

 $usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));

 $usercandelete = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer));

 $createbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance))

-    $createbarcode = 0;

+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) {
+    $createbarcode = 0;
+}
 

 $parameters = array('id' => $id, 'ref' => $ref, 'objcanvas' => $objcanvas);

 $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 (empty($reshook)) {

     // Type

@@ -195,14 +200,15 @@ 
             exit;

         } else {

             $langs->load("errors");

-            if ($result == -1)

-                $errors[] = 'ErrorBadBarCodeSyntax';

-            else if ($result == -2)

-                $errors[] = 'ErrorBarCodeRequired';

-            else if ($result == -3)

-                $errors[] = 'ErrorBarCodeAlreadyUsed';

-            else

-                $errors[] = 'FailedToValidateBarCode';

+            if ($result == -1) {
+                            $errors[] = 'ErrorBadBarCodeSyntax';
+            } else if ($result == -2) {
+                            $errors[] = 'ErrorBarCodeRequired';
+            } else if ($result == -3) {
+                            $errors[] = 'ErrorBarCodeAlreadyUsed';
+            } else {
+                            $errors[] = 'FailedToValidateBarCode';
+            }
 

             $error++;

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

@@ -236,14 +242,16 @@ 
             $object->label = GETPOST('label');

             $object->price_base_type = GETPOST('price_base_type');

 

-            if ($object->price_base_type == 'TTC')

-                $object->price_ttc = GETPOST('price');

-            else

-                $object->price = GETPOST('price');

-            if ($object->price_base_type == 'TTC')

-                $object->price_min_ttc = GETPOST('price_min');

-            else

-                $object->price_min = GETPOST('price_min');

+            if ($object->price_base_type == 'TTC') {
+                            $object->price_ttc = GETPOST('price');
+            } else {
+                            $object->price = GETPOST('price');
+            }
+            if ($object->price_base_type == 'TTC') {
+                            $object->price_min_ttc = GETPOST('price_min');
+            } else {
+                            $object->price_min = GETPOST('price_min');
+            }
 

             $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'

             // We must define tva_tx, npr and local taxes

@@ -369,8 +377,9 @@ 
 

             // Fill array 'array_options' with data from add form

             $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-            if ($ret < 0)

-                $error++;

+            if ($ret < 0) {
+                            $error++;
+            }
 

             if (!$error) {

                 $id = $object->create($user);

@@ -384,10 +393,11 @@ 
                 header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);

                 exit;

             } else {

-                if (count($object->errors))

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

-                else

-                    setEventMessages($langs->trans($object->error), null, 'errors');

+                if (count($object->errors)) {
+                                    setEventMessages($object->error, $object->errors, 'errors');
+                } else {
+                                    setEventMessages($langs->trans($object->error), null, 'errors');
+                }
                 $action = "create";

             }

         }

@@ -489,8 +499,9 @@ 
 

                 // Fill array 'array_options' with data from add form

                 $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-                if ($ret < 0)

-                    $error++;

+                if ($ret < 0) {
+                                    $error++;
+                }
 

                 if (!$error && $object->check()) {

                     if ($object->update($object->id, $user) > 0) {

@@ -500,18 +511,19 @@ 
 

                         $action = 'view';

                     } else {

-                        if (count($object->errors))

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

-                        else

-                            setEventMessages($langs->trans($object->error), null, 'errors');

+                        if (count($object->errors)) {
+                                                    setEventMessages($object->error, $object->errors, 'errors');
+                        } else {
+                                                    setEventMessages($langs->trans($object->error), null, 'errors');
+                        }
                         $action = 'edit';

                     }

-                }

-                else {

-                    if (count($object->errors))

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

-                    else

-                        setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');

+                } else {

+                    if (count($object->errors)) {
+                                            setEventMessages($object->error, $object->errors, 'errors');
+                    } else {
+                                            setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+                    }
                     $action = 'edit';

                 }

             }

@@ -648,8 +660,9 @@ 
 

             $tva_tx = get_default_tva($mysoc, $soc, $object->id);

             $tva_npr = get_default_npr($mysoc, $soc, $object->id);

-            if (empty($tva_tx))

-                $tva_npr = 0;

+            if (empty($tva_tx)) {
+                            $tva_npr = 0;
+            }
             $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);

             $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);

 

@@ -783,8 +796,9 @@ 
 $form = new Form($db);

 $formfile = new FormFile($db);

 $formproduct = new FormProduct($db);

-if (!empty($conf->accounting->enabled))

-    $formaccounting = new FormAccounting($db);

+if (!empty($conf->accounting->enabled)) {
+    $formaccounting = new FormAccounting($db);
+}
 

 // Load object modBarCodeProduct

 $res = 0;

@@ -793,8 +807,9 @@ 
     $dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);

     foreach ($dirbarcode as $dirroot) {

         $res = dol_include_once($dirroot . $module . '.php');

-        if ($res)

-            break;

+        if ($res) {
+                    break;
+        }
     }

     if ($res > 0) {

         $modBarCodeProduct = new $module();

@@ -809,13 +824,13 @@ 
     if (empty($object->error) && $id) {

         $object = new Product($db);

         $result = $object->fetch($id);

-        if ($result <= 0)

-            dol_print_error('', $object->error);

+        if ($result <= 0) {
+                    dol_print_error('', $object->error);
+        }
     }

     $objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates

     $objcanvas->display_canvas($action);       // Show template

-}

-else {

+} else {

     // -----------------------------------------

     // When used in standard mode

     // -----------------------------------------

@@ -865,8 +880,9 @@ 
 

         print '<tr>';

         $tmpcode = '';

-        if (!empty($modCodeProduct->code_auto))

-            $tmpcode = $modCodeProduct->getNextValue($object, $type);

+        if (!empty($modCodeProduct->code_auto)) {
+                    $tmpcode = $modCodeProduct->getNextValue($object, $type);
+        }
         print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="' . dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode) . '">';

         if ($refalreadyexists) {

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

@@ -897,24 +913,27 @@ 
         }

 

         $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
 

         if ($showbarcode) {

             print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

             if (isset($_POST['fk_barcode_type'])) {

                 $fk_barcode_type = GETPOST('fk_barcode_type');

             } else {

-                if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

-                    $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+                if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+                                    $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+                }
             }

             require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

             $formbarcode = new FormBarCode($db);

             print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

             print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

             $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-            if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+            if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                            $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+            }
             print '<input class="maxwidth100" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

             print '</td></tr>';

         }

@@ -1016,8 +1035,9 @@ 
             // Origin country

             print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

             print $form->select_country(GETPOST('country_id', 'int'), '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>';

         }

 

@@ -1167,8 +1187,9 @@ 
             require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

 

             $type = $langs->trans('Product');

-            if ($object->isService())

-                $type = $langs->trans('Service');

+            if ($object->isService()) {
+                            $type = $langs->trans('Service');
+            }
             //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");

             // Main official, simple, and not duplicated code

             // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";

@@ -1229,8 +1250,9 @@ 
 

             // Barcode

             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-                $showbarcode = 0;

+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                            $showbarcode = 0;
+            }
 

             if ($showbarcode) {

                 print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

@@ -1238,16 +1260,18 @@ 
                     $fk_barcode_type = GETPOST('fk_barcode_type');

                 } else {

                     $fk_barcode_type = $object->barcode_type;

-                    if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

-                        $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+                    if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+                                            $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+                    }
                 }

                 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

                 $formbarcode = new FormBarCode($db);

                 print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

                 print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

                 $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-                if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                    $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+                if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                                    $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+                }
                 print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

                 print '</td></tr>';

             }

@@ -1359,8 +1383,9 @@ 
                 // Origin country

                 print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

                 print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');

-                if ($user->admin)

-                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if ($user->admin) {
+                                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                }
                 print '</td></tr>';

             }

 

@@ -1470,8 +1495,9 @@ 
         // Fiche en mode visu

         else {

             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-                $showbarcode = 0;

+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                            $showbarcode = 0;
+            }
 

             $head = product_prepare_head($object);

             $titre = $langs->trans("CardProduct" . $object->type);

@@ -1483,8 +1509,9 @@ 
             $object->next_prev_filter = " fk_product_type = " . $object->type;

 

             $shownav = 1;

-            if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL)))

-                $shownav = 0;

+            if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+                            $shownav = 0;
+            }
 

             dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');

 

@@ -1510,8 +1537,9 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';

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

                 print '</td>';

-                if (($action != 'editbarcodetype') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcodetype&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) {
+                                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcodetype&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+                }
                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcodetype' || $action == 'editbarcode') {

@@ -1531,14 +1559,16 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';

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

                 print '</td>';

-                if (($action != 'editbarcode') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcode&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                if (($action != 'editbarcode') && $usercancreate && $createbarcode) {
+                                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcode&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+                }
                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcode') {

                     $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-                    if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                        $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+                    if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                                            $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+                    }
 

                     // print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';

                     print '<form method="POST" href="' . BASE_URI . '?controller=product&method=card&id=' . $object->id . '">';

@@ -1548,8 +1578,7 @@ 
                     print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . $tmpcode . '">';

                     print '&nbsp;<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

                     print '</form>';

-                }

-                else {

+                } else {

                     print $object->barcode;

                 }

                 print '</td></tr>' . "\n";

@@ -1709,13 +1738,14 @@ 
                     print '<tr><td>' . $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . '</td><td colspan="2">';

                     if ($object->length != '' || $object->width != '' || $object->height != '') {

                         print $object->length;

-                        if ($object->width)

-                            print " x " . $object->width;

-                        if ($object->height)

-                            print " x " . $object->height;

+                        if ($object->width) {
+                                                    print " x " . $object->width;
+                        }
+                        if ($object->height) {
+                                                    print " x " . $object->height;
+                        }
                         print ' ' . measuring_units_string($object->length_units, "size");

-                    }

-                    else {

+                    } else {

                         print '&nbsp;';

                     }

                     print "</td></tr>\n";

@@ -1803,8 +1833,9 @@ 
 }

 

 $tmpcode = '';

-if (!empty($modCodeProduct->code_auto))

-    $tmpcode = $modCodeProduct->getNextValue($object, $object->type);

+if (!empty($modCodeProduct->code_auto)) {
+    $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
+}
 

 // Define confirmation messages

 $formquestionclone = array(

@@ -1842,8 +1873,9 @@ 
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

     if (empty($reshook)) {

         if ($usercancreate) {

-            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1)

-                print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&amp;id=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';

+            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) {
+                            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&amp;id=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';
+            }
 

             if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {

                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {

dolibarr/htdocs/product/class/product.class.php

Braces +15 added lines, -10 removed lines

@@ -4149,25 +4149,29 @@ 
 

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

             $result = $this->load_stats_commande(0, '1,2', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_commande_client = $this->stats_commande['qty'];

         }

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

             $result = $this->load_stats_sending(0, '1,2', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_sending_client = $this->stats_expedition['qty'];

         }

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

             $result = $this->load_stats_commande_fournisseur(0, '1,2,3,4', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];

 

             $result = $this->load_stats_reception(0, '4', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_reception_fournisseur = $this->stats_reception['qty'];

         }

 

@@ -4203,8 +4207,9 @@ 
         $parameters = array('id' => $this->id);

         // Note that $action and $object may have been modified by some hooks

         $reshook = $hookmanager->executeHooks('loadvirtualstock', $parameters, $this, $action);

-        if ($reshook > 0)

-            $this->stock_theorique = $hookmanager->resArray['stock_theorique'];

+        if ($reshook > 0) {
+                    $this->stock_theorique = $hookmanager->resArray['stock_theorique'];
+        }
 

         return 1;

     }

dolibarr/htdocs/product/list.php

Braces +150 added lines, -103 removed lines

@@ -340,34 +340,48 @@ 
     $sql .= " AND pac.rowid IS NULL";

 }

 

-if ($search_ref)

-    $sql .= natural_search('p.ref', $search_ref);

-if ($search_label)

-    $sql .= natural_search('p.label', $search_label);

-if ($search_barcode)

-    $sql .= natural_search('p.barcode', $search_barcode);

-if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1)

-    $sql .= " AND p.tosell = " . $db->escape($search_tosell);

-if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)

-    $sql .= " AND p.tobuy = " . $db->escape($search_tobuy);

-if (dol_strlen($canvas) > 0)

-    $sql .= " AND p.canvas = '" . $db->escape($canvas) . "'";

-if ($catid > 0)

-    $sql .= " AND cp.fk_categorie = " . $catid;

-if ($catid == -2)

-    $sql .= " AND cp.fk_categorie IS NULL";

-if ($search_categ > 0)

-    $sql .= " AND cp.fk_categorie = " . $db->escape($search_categ);

-if ($search_categ == -2)

-    $sql .= " AND cp.fk_categorie IS NULL";

-if ($fourn_id > 0)

-    $sql .= " AND pfp.fk_soc = " . $fourn_id;

-if ($search_tobatch != '' && $search_tobatch >= 0)

-    $sql .= " AND p.tobatch = " . $db->escape($search_tobatch);

-if ($search_accountancy_code_sell)

-    $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);

-if ($search_accountancy_code_buy)

-    $sql .= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);

+if ($search_ref) {
+    $sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_label) {
+    $sql .= natural_search('p.label', $search_label);
+}
+if ($search_barcode) {
+    $sql .= natural_search('p.barcode', $search_barcode);
+}
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1) {
+    $sql .= " AND p.tosell = " . $db->escape($search_tosell);
+}
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1) {
+    $sql .= " AND p.tobuy = " . $db->escape($search_tobuy);
+}
+if (dol_strlen($canvas) > 0) {
+    $sql .= " AND p.canvas = '" . $db->escape($canvas) . "'";
+}
+if ($catid > 0) {
+    $sql .= " AND cp.fk_categorie = " . $catid;
+}
+if ($catid == -2) {
+    $sql .= " AND cp.fk_categorie IS NULL";
+}
+if ($search_categ > 0) {
+    $sql .= " AND cp.fk_categorie = " . $db->escape($search_categ);
+}
+if ($search_categ == -2) {
+    $sql .= " AND cp.fk_categorie IS NULL";
+}
+if ($fourn_id > 0) {
+    $sql .= " AND pfp.fk_soc = " . $fourn_id;
+}
+if ($search_tobatch != '' && $search_tobatch >= 0) {
+    $sql .= " AND p.tobatch = " . $db->escape($search_tobatch);
+}
+if ($search_accountancy_code_sell) {
+    $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
+}
+if ($search_accountancy_code_buy) {
+    $sql .= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
+}
 

 // Add where from extra fields

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

@@ -384,9 +398,10 @@ 
 }

 // Add fields from extrafields

 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)

-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key : '');

-}

+    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+            $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key : '');
+    }
+    }

 // Add fields from hooks

 $parameters = array();

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

@@ -504,10 +519,12 @@ 
         //'presend'=>$langs->trans("SendByMail"),

         //'builddoc'=>$langs->trans("PDFMerge"),

     );

-    if ($user->rights->produit->supprimer)

-        $arrayofmassactions['predelete'] = $langs->trans("Delete");

-    if (in_array($massaction, array('presend', 'predelete')))

-        $arrayofmassactions = array();

+    if ($user->rights->produit->supprimer) {
+            $arrayofmassactions['predelete'] = $langs->trans("Delete");
+    }
+    if (in_array($massaction, array('presend', 'predelete'))) {
+            $arrayofmassactions = array();
+    }
     $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

 

     $newcardbutton = '';

@@ -527,8 +544,9 @@ 
     }

 

     print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formulaire">';

-    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="formfilteraction" id="formfilteraction" value="list">';

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

@@ -536,8 +554,9 @@ 
     print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

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

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

-    if (empty($arrayfields['p.fk_product_type']['checked']))

-        print '<input type="hidden" name="search_type" value="' . dol_escape_htmltag($search_type) . '">';

+    if (empty($arrayfields['p.fk_product_type']['checked'])) {
+            print '<input type="hidden" name="search_type" value="' . dol_escape_htmltag($search_type) . '">';
+    }
 

     print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);

 

@@ -556,8 +575,9 @@ 
     }

 

     if ($sall) {

-        foreach ($fieldstosearchall as $key => $val)

-            $fieldstosearchall[$key] = $langs->trans($val);

+        foreach ($fieldstosearchall as $key => $val) {
+                    $fieldstosearchall[$key] = $langs->trans($val);
+        }
         print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall) . '</div>';

     }

 

@@ -580,10 +600,11 @@ 
 

     $parameters = array();

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

-    if (empty($reshook))

-        $moreforfilter .= $hookmanager->resPrint;

-    else

-        $moreforfilter = $hookmanager->resPrint;

+    if (empty($reshook)) {
+            $moreforfilter .= $hookmanager->resPrint;
+    } else {
+            $moreforfilter = $hookmanager->resPrint;
+    }
 

     if ($moreforfilter) {

         print '<div class="liste_titre liste_titre_bydiv centpercent">';

@@ -593,8 +614,9 @@ 
 

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

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

-    if ($massactionbutton)

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

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

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

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

@@ -821,8 +843,9 @@ 
             $result = $db->query($sql);

             if ($result) {

                 $objtp = $db->fetch_object($result);

-                if (!empty($objtp->label))

-                    $obj->label = $objtp->label;

+                if (!empty($objtp->label)) {
+                                    $obj->label = $objtp->label;
+                }
             }

         }

 

@@ -855,36 +878,41 @@ 
             print '<td class="tdoverflowmax200">';

             print $product_static->getNomUrl(1);

             print "</td>\n";

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Ref supplier

         if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {

             print '<td class="tdoverflowmax200">';

             print $product_static->getNomUrl(1);

             print "</td>\n";

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Label

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

             print '<td class="tdoverflowmax200">' . dol_trunc($obj->label, 40) . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Type

         if (!empty($arrayfields['p.fk_product_type']['checked'])) {

             print '<td>' . $obj->fk_product_type . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Barcode

         if (!empty($arrayfields['p.barcode']['checked'])) {

             print '<td>' . $obj->barcode . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Duration

@@ -906,22 +934,25 @@ 
                 print $obj->duration;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Sell price

         if (!empty($arrayfields['p.sellprice']['checked'])) {

             print '<td class="right nowraponall">';

             if ($obj->tosell) {

-                if ($obj->price_base_type == 'TTC')

-                    print price($obj->price_ttc) . ' ' . $langs->trans("TTC");

-                else

-                    print price($obj->price) . ' ' . $langs->trans("HT");

+                if ($obj->price_base_type == 'TTC') {
+                                    print price($obj->price_ttc) . ' ' . $langs->trans("TTC");
+                } else {
+                                    print price($obj->price) . ' ' . $langs->trans("HT");
+                }
             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Better buy price

@@ -934,14 +965,16 @@ 
                         if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) {

                             $htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);

                             print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise) . ' ' . $langs->trans("HT"), $htmltext);

-                        } else

-                            print price($product_fourn->fourn_unitprice) . ' ' . $langs->trans("HT");

+                        } else {
+                                                    print price($product_fourn->fourn_unitprice) . ' ' . $langs->trans("HT");
+                        }
                     }

                 }

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Number of buy prices

@@ -970,8 +1003,9 @@ 
                 print $obj->seuil_stock_alerte;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Desired stock

         if (!empty($arrayfields['p.desiredstock']['checked'])) {

@@ -980,52 +1014,60 @@ 
                 print $obj->desiredstock;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Stock real

         if (!empty($arrayfields['p.stock']['checked'])) {

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

-                if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
+                                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';
+                }
                 print $product_static->stock_reel;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Stock virtual

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

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

-                if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
+                                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';
+                }
                 print $product_static->stock_theorique;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Lot/Serial

         if (!empty($arrayfields['p.tobatch']['checked'])) {

             print '<td align="center">';

             print yn($obj->tobatch);

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_sell']['checked'])) {

             print '<td>' . $obj->accountancy_code_sell . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {

             print '<td>' . $obj->accountancy_code_buy . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Extra fields

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

@@ -1038,16 +1080,18 @@ 
             print '<td align="center">';

             print dol_print_date($obj->date_creation, 'dayhour', 'tzuser');

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Date modification

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

             print '<td align="center">';

             print dol_print_date($obj->date_update, 'dayhour', 'tzuser');

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Status (to sell)

@@ -1059,8 +1103,9 @@ 
                 print $product_static->LibStatut($obj->tosell, 5, 0);

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Status (to buy)

         if (!empty($arrayfields['p.tobuy']['checked'])) {

@@ -1071,20 +1116,23 @@ 
                 print $product_static->LibStatut($obj->tobuy, 5, 1);

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Action

         print '<td class="nowrap" align="center">';

         if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

             $selected = 0;

-            if (in_array($obj->rowid, $arrayofselected))

-                $selected = 1;

+            if (in_array($obj->rowid, $arrayofselected)) {
+                            $selected = 1;
+            }
             print '<input id="cb' . $obj->rowid . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->rowid . '"' . ($selected ? ' checked="checked"' : '') . '>';

         }

         print '</td>';

-        if (!$i)

-            $totalarray['nbfield'] ++;

+        if (!$i) {
+                    $totalarray['nbfield'] ++;
+        }
 

         print "</tr>\n";

         $i++;

@@ -1095,8 +1143,7 @@ 
     print "</table>";

     print "</div>";

     print '</form>';

-}

-else {

+} else {

     dol_print_error($db);

 }

 

dolibarr/htdocs/core/lib/functions.lib.php

Braces +1466 added lines, -1053 removed lines

@@ -74,8 +74,9 @@ 
       if ($found) return $result;

       } */

 

-    if (isset($class::$member))

-        return $class::$member;

+    if (isset($class::$member)) {
+            return $class::$member;
+    }
     dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

     return null;

 }

@@ -126,8 +127,9 @@ 
     } else {

         $out = '';

         $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-        if (in_array($element, $addzero))

-            $out .= '0,';

+        if (in_array($element, $addzero)) {
+                    $out .= '0,';
+        }
         $out .= $conf->entity;

         return $out;

     }

@@ -306,32 +308,35 @@ 
 {

     global $mysoc, $user, $conf;

 

-    if (empty($paramname))

-        return 'BadFirstParameterForGETPOST';

+    if (empty($paramname)) {
+            return 'BadFirstParameterForGETPOST';
+    }
     if (empty($check)) {

         dol_syslog("Deprecated use of GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

     }

 

-    if (empty($method))

-        $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-    elseif ($method == 1)

-        $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-    elseif ($method == 2)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-    elseif ($method == 3)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-    elseif ($method == 4)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));

-    else

-        return 'BadThirdParameterForGETPOST';

+    if (empty($method)) {
+            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+    } elseif ($method == 1) {
+            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+    } elseif ($method == 2) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+    } elseif ($method == 3) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+    } elseif ($method == 4) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+    } else {
+            return 'BadThirdParameterForGETPOST';
+    }
 

     if (empty($method) || $method == 3 || $method == 4) {

         $relativepathstring = $_SERVER["PHP_SELF"];

         // Clean $relativepathstring

-        if (constant('DOL_URL_ROOT'))

-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+        if (constant('DOL_URL_ROOT')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

         //var_dump($relativepathstring);

@@ -380,14 +385,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $foundintru = 0;

                                     foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                            $foundintru = 1;

+                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                    $foundintru = 1;
+                                        }
                                     }

-                                    if (!$foundintru)

-                                        $qualified = 1;

+                                    if (!$foundintru) {
+                                                                            $qualified = 1;
+                                    }
                                     //var_dump($defkey.'-'.$qualified);

-                                } else

-                                    $qualified = 1;

+                                } else {
+                                                                    $qualified = 1;
+                                }
 

                                 if ($qualified) {

                                     //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -414,20 +422,24 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                         foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                            if ($out)

-                                                $out .= ', ';

+                                            if ($out) {
+                                                                                            $out .= ', ';
+                                            }
                                             if ($paramname == 'sortfield') {

                                                 $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                             }

@@ -447,14 +459,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $foundintru = 0;

                                     foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                            $foundintru = 1;

+                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                    $foundintru = 1;
+                                        }
                                     }

-                                    if (!$foundintru)

-                                        $qualified = 1;

+                                    if (!$foundintru) {
+                                                                            $qualified = 1;
+                                    }
                                     //var_dump($defkey.'-'.$qualified);

-                                } else

-                                    $qualified = 1;

+                                } else {
+                                                                    $qualified = 1;
+                                }
 

                                 if ($qualified) {

                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -526,8 +541,10 @@ 
                 $newout = $user->fk_user;

             } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                 $newout = $conf->entity;

-            } else

-                $newout = '';     // Key not found, we replace with empty string

+            } else {
+                            $newout = '';
+            }
+            // Key not found, we replace with empty string

 

 

 

@@ -556,18 +573,20 @@ 
             }

             break;

         case 'intcomma':

-            if (preg_match('/[^0-9,-]+/i', $out))

-                $out = '';

+            if (preg_match('/[^0-9,-]+/i', $out)) {
+                            $out = '';
+            }
             break;

         case 'alpha':

             if (!is_array($out)) {

                 $out = trim($out);

                 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                 // '../' is dangerous because it allows dir transversals

-                if (preg_match('/"/', $out))

-                    $out = '';

-                else if (preg_match('/\.\.\//', $out))

-                    $out = '';

+                if (preg_match('/"/', $out)) {
+                                    $out = '';
+                } else if (preg_match('/\.\.\//', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'san_alpha':

@@ -576,27 +595,31 @@ 
         case 'aZ':

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'aZ09':

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'array':

-            if (!is_array($out) || empty($out))

-                $out = array();

+            if (!is_array($out) || empty($out)) {
+                            $out = array();
+            }
             break;

         case 'nohtml':  // Recommended for most scalar parameters

             $out = dol_string_nohtmltag($out, 0);

@@ -606,16 +629,18 @@ 
                 $out = trim($out);

                 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                 // '../' is dangerous because it allows dir transversals

-                if (preg_match('/"/', $out))

-                    $out = '';

-                else if (preg_match('/\.\.\//', $out))

-                    $out = '';

+                if (preg_match('/"/', $out)) {
+                                    $out = '';
+                } else if (preg_match('/\.\.\//', $out)) {
+                                    $out = '';
+                }
                 $out = dol_string_nohtmltag($out);

             }

             break;

         case 'custom':

-            if (empty($filter))

-                return 'BadFourthParameterForGETPOST';

+            if (empty($filter)) {
+                            return 'BadFourthParameterForGETPOST';
+            }
             $out = filter_var($out, $filter, $options);

             break;

     }

@@ -655,10 +680,11 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) { // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

-                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME')

-                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;

-                else if (isset($_SERVER["SERVER_NAME"]))

-                    return $_SERVER["SERVER_NAME"];

+                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+                                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+                } else if (isset($_SERVER["SERVER_NAME"])) {
+                                    return $_SERVER["SERVER_NAME"];
+                }
             }

             return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

         }

@@ -729,22 +755,27 @@ 
             }

         }

         if ($returnemptyifnotfound) {        // Not found into alternate dir

-            if ($returnemptyifnotfound == 1 || !file_exists($res))

-                return '';

+            if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                            return '';
+            }
         }

-    }

-    else {    // For an url path

+    } else {    // For an url path

         // We try to get local path of file on filesystem from url

         // Note that trying to know if a file on disk exist by forging path on disk from url

         // works only for some web server and some setup. This is bugged when

         // using proxy, rewriting, virtual path, etc...

         $res = '';

-        if ($type == 1)

-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value

-        if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

-        if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+        if ($type == 1) {
+                    $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;
+        }
+        // Standard value

+        if ($type == 2) {
+                    $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;
+        }
+        // Standard value

+        if ($type == 3) {
+                    $res = DOL_URL_ROOT . '/' . $path;
+        }
 

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

@@ -824,13 +855,15 @@ 
 function dol_size($size, $type = '')

 {

     global $conf;

-    if (empty($conf->dol_optimize_smallscreen))

-        return $size;

-    if ($type == 'width' && $size > 250)

-        return 250;

-    else

-        return 10;

-}

+    if (empty($conf->dol_optimize_smallscreen)) {
+            return $size;
+    }
+    if ($type == 'width' && $size > 250) {
+            return 250;
+    } else {
+            return 10;
+    }
+    }

 

 /**

  * 	Clean a string to use it as a file name

@@ -929,8 +962,9 @@ 
 {

     $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

     $forbidden_chars_to_remove = array();

-    if (is_array($badcharstoreplace))

-        $forbidden_chars_to_replace = $badcharstoreplace;

+    if (is_array($badcharstoreplace)) {
+            $forbidden_chars_to_replace = $badcharstoreplace;
+    }
     //$forbidden_chars_to_remove=array("(",")");

 

     return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

@@ -967,9 +1001,9 @@ 
     if (empty($mode)) {

         $substitjs["'"] = "\\'";

         $substitjs['"'] = "\\'";

-    } else if ($mode == 1)

-        $substitjs["'"] = "\\'";

-    else if ($mode == 2) {

+    } else if ($mode == 1) {
+            $substitjs["'"] = "\\'";
+    } else if ($mode == 2) {

         $substitjs['"'] = '\\"';

     } else if ($mode == 3) {

         $substitjs["'"] = "\\'";

@@ -991,10 +1025,12 @@ 
 {

     // escape quotes and backslashes, newlines, etc.

     $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-    if (!$keepb)

-        $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-    if (!$keepn)

-        $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+    if (!$keepb) {
+            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+    }
+    if (!$keepn) {
+            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+    }
     return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

 }

 

@@ -1045,8 +1081,9 @@ 
     global $conf, $user;

 

     // If syslog module enabled

-    if (empty($conf->syslog->enabled))

-        return;

+    if (empty($conf->syslog->enabled)) {
+            return;
+    }
 

     if ($ident < 0) {

         foreach ($conf->loghandlers as $loghandlerinstance) {

@@ -1060,8 +1097,9 @@ 
         if (!in_array($level, $logLevels, true)) {

             throw new Exception('Incorrect log level');

         }

-        if ($level > $conf->global->SYSLOG_LEVEL)

-            return;

+        if ($level > $conf->global->SYSLOG_LEVEL) {
+                    return;
+        }
 

         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

         // If adding log inside HTML page is required

@@ -1086,24 +1124,30 @@ 
         );

 

         // This is when server run behind a reverse proxy

-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                    $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+        }
         // This is when server run normally on a server

-        else if (!empty($_SERVER["REMOTE_ADDR"]))

-            $data['ip'] = $_SERVER['REMOTE_ADDR'];

+        else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                    $data['ip'] = $_SERVER['REMOTE_ADDR'];
+        }
         // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-        else if (!empty($_SERVER['SERVER_ADDR']))

-            $data['ip'] = $_SERVER['SERVER_ADDR'];

+        else if (!empty($_SERVER['SERVER_ADDR'])) {
+                    $data['ip'] = $_SERVER['SERVER_ADDR'];
+        }
         // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-        else if (!empty($_SERVER['COMPUTERNAME']))

-            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+        else if (!empty($_SERVER['COMPUTERNAME'])) {
+                    $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+        }
         // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-        else if (!empty($_SERVER['LOGNAME']))

-            $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+        else if (!empty($_SERVER['LOGNAME'])) {
+                    $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+        }
         // Loop on each log handler and send output

         foreach ($conf->loghandlers as $loghandlerinstance) {

-            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                continue;

+            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                            continue;
+            }
             $loghandlerinstance->export($data, $suffixinfilename);

         }

         unset($data);

@@ -1159,13 +1203,15 @@ 
 

     // Show title

     $showtitle = 1;

-    if (!empty($conf->dol_optimize_smallscreen))

-        $showtitle = 0;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $showtitle = 0;
+    }
     if (!empty($title) && $showtitle) {

         $limittitle = 30;

         $out .= '<a class="tabTitle">';

-        if ($picto)

-            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+        if ($picto) {
+                    $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+        }
         $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

         $out .= '</a>';

     }

@@ -1174,12 +1220,14 @@ 
     $maxkey = -1;

     if (is_array($links) && !empty($links)) {

         $keys = array_keys($links);

-        if (count($keys))

-            $maxkey = max($keys);

+        if (count($keys)) {
+                    $maxkey = max($keys);
+        }
     }

 

-    if (!empty($conf->dol_optimize_smallscreen))

-        $conf->global->MAIN_MAXTABS_IN_CARD = 2;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $conf->global->MAIN_MAXTABS_IN_CARD = 2;
+    }
 

     // Show tabs

     $bactive = false;

@@ -1192,8 +1240,9 @@ 
     for ($i = 0; $i <= $maxkey; $i++) {

         if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

             // If active tab is already present

-            if ($i >= $limittoshow)

-                $limittoshow--;

+            if ($i >= $limittoshow) {
+                            $limittoshow--;
+            }
         }

     }

 

@@ -1234,12 +1283,12 @@ 
             }

             $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

             if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                if (!empty($links[$i][0]))

-                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                else

-                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-            }

-            else if (!empty($links[$i][1])) {

+                if (!empty($links[$i][0])) {
+                                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                } else {
+                                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                }
+            } else if (!empty($links[$i][1])) {

                 $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                 $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                 $outmore .= '</a>' . "\n";

@@ -1250,8 +1299,9 @@ 
         }

         $displaytab = $i;

     }

-    if ($popuptab)

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

+    if ($popuptab) {
+            $outmore .= '</div>';
+    }
 

     if ($displaytab > $limittoshow) {

         $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1274,8 +1324,9 @@ 
 

     $out .= "</div>\n";

 

-    if (!$notab || $notab == -1)

-        $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+    if (!$notab || $notab == -1) {
+            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+    }
 

     $parameters = array('tabname' => $active, 'out' => $out);

     $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1305,11 +1356,12 @@ 
  */

 function dol_get_fiche_end($notab = 0)

 {

-    if (!$notab || $notab == -1)

-        return "\n</div>\n";

-    else

-        return '';

-}

+    if (!$notab || $notab == -1) {
+            return "\n</div>\n";
+    } else {
+            return '';
+    }
+    }

 

 /**

  *  Show tab footer of a card.

@@ -1340,40 +1392,55 @@ 
     $showimage = 1;

     $entity = (empty($object->entity) ? $conf->entity : $object->entity);

     $showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-        $showbarcode = 0;

+    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+            $showbarcode = 0;
+    }
     $modulepart = 'unknown';

 

-    if ($object->element == 'societe')

-        $modulepart = 'societe';

-    if ($object->element == 'contact')

-        $modulepart = 'contact';

-    if ($object->element == 'member')

-        $modulepart = 'memberphoto';

-    if ($object->element == 'user')

-        $modulepart = 'userphoto';

-    if ($object->element == 'product')

-        $modulepart = 'product';

+    if ($object->element == 'societe') {
+            $modulepart = 'societe';
+    }
+    if ($object->element == 'contact') {
+            $modulepart = 'contact';
+    }
+    if ($object->element == 'member') {
+            $modulepart = 'memberphoto';
+    }
+    if ($object->element == 'user') {
+            $modulepart = 'userphoto';
+    }
+    if ($object->element == 'product') {
+            $modulepart = 'product';
+    }
 

     if (class_exists("Imagick")) {

-        if ($object->element == 'propal')

-            $modulepart = 'propal';

-        if ($object->element == 'commande')

-            $modulepart = 'commande';

-        if ($object->element == 'facture')

-            $modulepart = 'facture';

-        if ($object->element == 'fichinter')

-            $modulepart = 'ficheinter';

-        if ($object->element == 'contrat')

-            $modulepart = 'contract';

-        if ($object->element == 'supplier_proposal')

-            $modulepart = 'supplier_proposal';

-        if ($object->element == 'order_supplier')

-            $modulepart = 'supplier_order';

-        if ($object->element == 'invoice_supplier')

-            $modulepart = 'supplier_invoice';

-        if ($object->element == 'expensereport')

-            $modulepart = 'expensereport';

+        if ($object->element == 'propal') {
+                    $modulepart = 'propal';
+        }
+        if ($object->element == 'commande') {
+                    $modulepart = 'commande';
+        }
+        if ($object->element == 'facture') {
+                    $modulepart = 'facture';
+        }
+        if ($object->element == 'fichinter') {
+                    $modulepart = 'ficheinter';
+        }
+        if ($object->element == 'contrat') {
+                    $modulepart = 'contract';
+        }
+        if ($object->element == 'supplier_proposal') {
+                    $modulepart = 'supplier_proposal';
+        }
+        if ($object->element == 'order_supplier') {
+                    $modulepart = 'supplier_order';
+        }
+        if ($object->element == 'invoice_supplier') {
+                    $modulepart = 'supplier_invoice';
+        }
+        if ($object->element == 'expensereport') {
+                    $modulepart = 'expensereport';
+        }
     }

 

     if ($object->element == 'product') {

@@ -1381,11 +1448,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);

         $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

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

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

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

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1401,11 +1469,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

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

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

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

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1430,8 +1499,10 @@ 
                     } else {

                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                     }

-                    if (empty($subdir))

-                        $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                    if (empty($subdir)) {
+                                            $subdir = 'errorgettingsubdirofobject';
+                    }
+                    // Protection to avoid to return empty path

 

                     $filepath = $dir_output . $subdir . "/";

 

@@ -1452,14 +1523,16 @@ 
                             if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                 include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                 $ret = dol_convert_file($file, 'png', $fileimage);

-                                if ($ret < 0)

-                                    $error++;

+                                if ($ret < 0) {
+                                                                    $error++;
+                                }
                             }

                         }

 

                         $heightforphotref = 70;

-                        if (!empty($conf->dol_optimize_smallscreen))

-                            $heightforphotref = 60;

+                        if (!empty($conf->dol_optimize_smallscreen)) {
+                                                    $heightforphotref = 60;
+                        }
                         // Si fichier png PDF d'1 page trouve

                         if (file_exists($fileimage)) {

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1495,8 +1568,10 @@ 
                     $width = 14;

                     $cssclass = 'photorefcenter';

                     $picto = $object->picto;

-                    if ($object->element == 'project' && !$object->public)

-                        $picto = 'project'; // instead of projectpub

+                    if ($object->element == 'project' && !$object->public) {
+                                            $picto = 'project';
+                    }
+                    // instead of projectpub

                     $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                 }

                 $morehtmlleft .= '<!-- No photo to show -->';

@@ -1507,8 +1582,9 @@ 
         }

     }

 

-    if ($showbarcode)

-        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+    if ($showbarcode) {
+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+    }
 

     if ($object->element == 'societe') {

         if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1532,35 +1608,37 @@ 
         }

     } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

         $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')

-            $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+        }
         $morehtmlstatus .= $tmptxt;

-    }

-    elseif ($object->element == 'contrat' || $object->element == 'contract') {

-        if ($object->statut == 0)

-            $morehtmlstatus .= $object->getLibStatut(5);

-        else

-            $morehtmlstatus .= $object->getLibStatut(4);

-    }

-    elseif ($object->element == 'facturerec') {

-        if ($object->frequency == 0)

-            $morehtmlstatus .= $object->getLibStatut(2);

-        else

-            $morehtmlstatus .= $object->getLibStatut(5);

-    }

-    elseif ($object->element == 'project_task') {

+    } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+        if ($object->statut == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(4);
+        }
+    } elseif ($object->element == 'facturerec') {

+        if ($object->frequency == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(2);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        }
+    } elseif ($object->element == 'project_task') {

         $object->fk_statut = 1;

-        if ($object->progress > 0)

-            $object->fk_statut = 2;

-        if ($object->progress >= 100)

-            $object->fk_statut = 3;

+        if ($object->progress > 0) {
+                    $object->fk_statut = 2;
+        }
+        if ($object->progress >= 100) {
+                    $object->fk_statut = 3;
+        }
         $tmptxt = $object->getLibStatut(5);

         $morehtmlstatus .= $tmptxt;  // No status on task

-    }

-    else { // Generic case

+    } else { // Generic case

         $tmptxt = $object->getLibStatut(6);

-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')

-            $tmptxt = $object->getLibStatut(5);

+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5);
+        }
         $morehtmlstatus .= $tmptxt;

     }

 

@@ -1574,13 +1652,15 @@ 
     }

 

     // Add alias for thirdparty

-    if (!empty($object->name_alias))

-        $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+    if (!empty($object->name_alias)) {
+            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+    }
 

     // Add label

     if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-        if (!empty($object->label))

-            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+        if (!empty($object->label)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+        }
     }

 

     if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1613,15 +1693,19 @@ 
 {

     global $conf, $langs;

     $ret = '';

-    if ($fieldrequired)

-        $ret .= '<span class="fieldrequired">';

-    if (($conf->dol_use_jmobile != 4))

-        $ret .= '<label for="' . $fieldkey . '">';

+    if ($fieldrequired) {
+            $ret .= '<span class="fieldrequired">';
+    }
+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '<label for="' . $fieldkey . '">';
+    }
     $ret .= $langs->trans($langkey);

-    if (($conf->dol_use_jmobile != 4))

-        $ret .= '</label>';

-    if ($fieldrequired)

-        $ret .= '</span>';

+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '</label>';
+    }
+    if ($fieldrequired) {
+            $ret .= '</span>';
+    }
     return $ret;

 }

 

@@ -1636,8 +1720,9 @@ 
 {

     global $bc;

     $ret = ' ' . $bc[$var];

-    if ($moreclass)

-        $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+    if ($moreclass) {
+            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+    }
     return $ret;

 }

 

@@ -1668,18 +1753,18 @@ 
         if ($object->state) {

             $ret .= ($ret ? ", " : '') . $object->state;

         }

-        if ($object->zip)

-            $ret .= ($ret ? ", " : '') . $object->zip;

-    }

-    else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+        if ($object->zip) {
+                    $ret .= ($ret ? ", " : '') . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

         $ret .= ($ret ? $sep : '' ) . $object->town;

         if ($object->state) {

             $ret .= ($ret ? ", " : '') . $object->state;

         }

-        if ($object->zip)

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-    }

-    else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+        if ($object->zip) {
+                    $ret .= ($ret ? $sep : '' ) . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

         $ret .= ($ret ? $sep : '' ) . $object->zip;

         $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

         if ($object->state) {

@@ -1696,8 +1781,9 @@ 
             $ret .= ($ret ? ", " : '') . $object->state;

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
     if ($withcountry) {

         $langs->load("dict");

         $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1718,9 +1804,10 @@ 
 {

     if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

         return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-    } else

-        return 'Error date into a not supported range';

-}

+    } else {
+            return 'Error date into a not supported range';
+    }
+    }

 

 /**

  * 	Output date in a string format according to outputlangs (or langs if not defined).

@@ -1766,10 +1853,12 @@ 
             }

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

-    if (!$format)

-        $format = 'daytextshort';

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
+    if (!$format) {
+            $format = 'daytextshort';
+    }
     $reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

     $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

     if ($formatwithoutreduce != $format) {

@@ -1778,40 +1867,46 @@ 
     }  // so format 'dayreduceformat' is processed like day

     // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

     // TODO Add format daysmallyear and dayhoursmallyear

-    if ($format == 'day')

-        $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);

-    else if ($format == 'hour')

-        $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);

-    else if ($format == 'hourduration')

-        $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);

-    else if ($format == 'daytext')

-        $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);

-    else if ($format == 'daytextshort')

-    // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-        $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);

-    else if ($format == 'dayhour')

-        $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);

-    else if ($format == 'dayhoursec')

-        $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);

-    else if ($format == 'dayhourtext')

-        $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);

-    else if ($format == 'dayhourtextshort')

-        $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);

+    if ($format == 'day') {
+            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+    } else if ($format == 'hour') {
+            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+    } else if ($format == 'hourduration') {
+            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+    } else if ($format == 'daytext') {
+            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+    } else if ($format == 'daytextshort') {
+        // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+        $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+    } else if ($format == 'dayhour') {
+            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+    } else if ($format == 'dayhoursec') {
+            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+    } else if ($format == 'dayhourtext') {
+            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+    } else if ($format == 'dayhourtextshort') {
+            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+    }
     // Format not sensitive to language

-    else if ($format == 'dayhourlog')

-        $format = '%Y%m%d%H%M%S';

-    else if ($format == 'dayhourldap')

-        $format = '%Y%m%d%H%M%SZ';

-    else if ($format == 'dayhourxcard')

-        $format = '%Y%m%dT%H%M%SZ';

-    else if ($format == 'dayxcard')

-        $format = '%Y%m%d';

-    else if ($format == 'dayrfc')

-        $format = '%Y-%m-%d';             // DATE_RFC3339

-    else if ($format == 'dayhourrfc')

-        $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-    else if ($format == 'standard')

-        $format = '%Y-%m-%d %H:%M:%S';

+    else if ($format == 'dayhourlog') {
+            $format = '%Y%m%d%H%M%S';
+    } else if ($format == 'dayhourldap') {
+            $format = '%Y%m%d%H%M%SZ';
+    } else if ($format == 'dayhourxcard') {
+            $format = '%Y%m%dT%H%M%SZ';
+    } else if ($format == 'dayxcard') {
+            $format = '%Y%m%d';
+    } else if ($format == 'dayrfc') {
+            $format = '%Y-%m-%d';
+    }
+    // DATE_RFC3339

+    else if ($format == 'dayhourrfc') {
+            $format = '%Y-%m-%dT%H:%M:%SZ';
+    }
+    // DATETIME RFC3339

+    else if ($format == 'standard') {
+            $format = '%Y-%m-%d %H:%M:%S';
+    }
 

     if ($reduceformat) {

         $format = str_replace('%Y', '%y', $format);

@@ -1819,8 +1914,10 @@ 
     }

 

     // If date undefined or "", we return ""

-    if (dol_strlen($time) == 0)

-        return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+    if (dol_strlen($time) == 0) {
+            return '';
+    }
+    // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1868,8 +1965,9 @@ 
             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

             $ret = adodb_strftime($format, $timetouse, $to_gmt);

-        } else

-            $ret = 'Bad value ' . $time . ' for date';

+        } else {
+                    $ret = 'Bad value ' . $time . ' for date';
+        }
     }

 

     if (preg_match('/__b__/i', $format)) {

@@ -1940,10 +2038,14 @@ 
     global $conf;

 

     $usealternatemethod = false;

-    if ($timestamp <= 0)

-        $usealternatemethod = true;    // <= 1970

-    if ($timestamp >= 2145913200)

-        $usealternatemethod = true;  // >= 2038

+    if ($timestamp <= 0) {
+            $usealternatemethod = true;
+    }
+    // <= 1970

+    if ($timestamp >= 2145913200) {
+            $usealternatemethod = true;
+    }
+    // >= 2038

 

     if ($usealternatemethod) {

         $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -1978,27 +2080,36 @@ 
     global $conf;

     //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

     // Clean parameters

-    if ($hour == -1 || empty($hour))

-        $hour = 0;

-    if ($minute == -1 || empty($minute))

-        $minute = 0;

-    if ($second == -1 || empty($second))

-        $second = 0;

+    if ($hour == -1 || empty($hour)) {
+            $hour = 0;
+    }
+    if ($minute == -1 || empty($minute)) {
+            $minute = 0;
+    }
+    if ($second == -1 || empty($second)) {
+            $second = 0;
+    }
 

     // Check parameters

     if ($check) {

-        if (!$month || !$day)

-            return '';

-        if ($day > 31)

-            return '';

-        if ($month > 12)

-            return '';

-        if ($hour < 0 || $hour > 24)

-            return '';

-        if ($minute < 0 || $minute > 60)

-            return '';

-        if ($second < 0 || $second > 60)

-            return '';

+        if (!$month || !$day) {
+                    return '';
+        }
+        if ($day > 31) {
+                    return '';
+        }
+        if ($month > 12) {
+                    return '';
+        }
+        if ($hour < 0 || $hour > 24) {
+                    return '';
+        }
+        if ($minute < 0 || $minute > 60) {
+                    return '';
+        }
+        if ($second < 0 || $second > 60) {
+                    return '';
+        }
     }

 

     if (method_exists('DateTime', 'getTimestamp')) {

@@ -2055,8 +2166,10 @@ 
 

     // Note that gmmktime and mktime return same value (GMT) when used without parameters

     //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead

-    if ($mode == 'gmt')

-        $ret = time(); // Time for now at greenwich.

+    if ($mode == 'gmt') {
+            $ret = time();
+    }
+    // Time for now at greenwich.

     else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

         require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

         $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2090,8 +2203,9 @@ 
     global $conf, $langs;

     $level = 1024;

 

-    if (!empty($conf->dol_optimize_smallscreen))

-        $shortunit = 1;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $shortunit = 1;
+    }
 

     // Set value text

     if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2126,19 +2240,23 @@ 
 {

     global $langs;

 

-    if (empty($url))

-        return '';

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

     $link = '<a href="';

-    if (!preg_match('/^http/i', $url))

-        $link .= 'http://';

+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= $url;

     $link .= '"';

-    if ($target)

-        $link .= ' target="' . $target . '"';

+    if ($target) {
+            $link .= ' target="' . $target . '"';
+    }
     $link .= '>';

-    if (!preg_match('/^http/i', $url))

-        $link .= 'http://';

+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= dol_trunc($url, $max);

     $link .= '</a>';

     return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2162,13 +2280,15 @@ 
 

     $newemail = $email;

 

-    if (empty($email))

-        return '&nbsp;';

+    if (empty($email)) {
+            return '&nbsp;';
+    }
 

     if (!empty($addlink)) {

         $newemail = '<a style="text-overflow: ellipsis;" href="';

-        if (!preg_match('/^mailto:/i', $email))

-            $newemail .= 'mailto:';

+        if (!preg_match('/^mailto:/i', $email)) {
+                    $newemail .= 'mailto:';
+        }
         $newemail .= $email;

         $newemail .= '">';

         $newemail .= dol_trunc($email, $max);

@@ -2181,13 +2301,14 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

             $type = 'AC_EMAIL';

             $link = '';

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

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            if ($link)

-                $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+            if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+            }
         }

-    }

-    else {

+    } else {

         if ($showinvalid && !isValidEmail($email)) {

             $langs->load("errors");

             $newemail .= img_warning($langs->trans("ErrorBadEMail", $email));

@@ -2219,8 +2340,9 @@ 
 

     $newskype = $value;

 

-    if (empty($value))

-        return '&nbsp;';

+    if (empty($value)) {
+            return '&nbsp;';
+    }
 

     if (!empty($type)) {

         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2241,13 +2363,13 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

             $addlink = 'AC_SKYPE';

             $link = '';

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

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+            if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
             $newskype .= ($link ? ' ' . $link : '');

         }

         $newskype .= '</div>';

-    }

-    else {

+    } else {

         $langs->load("errors");

         $newskype .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));

     }

@@ -2277,12 +2399,14 @@ 
     if (empty($phone)) {

         return '';

     }

-    if (empty($countrycode))

-        $countrycode = $mysoc->country_code;

+    if (empty($countrycode)) {
+            $countrycode = $mysoc->country_code;
+    }
 

     // Short format for small screens

-    if ($conf->dol_optimize_smallscreen)

-        $separ = '';

+    if ($conf->dol_optimize_smallscreen) {
+            $separ = '';
+    }
 

     $newphone = $phone;

     if (strtoupper($countrycode) == "FR") {

@@ -2448,15 +2572,18 @@ 
             $newphone = '<a href="tel:' . $phone . '"';

             $newphone .= '>' . $phone . '</a>';

         } else if (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-            if (empty($user->clicktodial_loaded))

-                $user->fetch_clicktodial();

+            if (empty($user->clicktodial_loaded)) {
+                            $user->fetch_clicktodial();
+            }
 

             // Define urlmask

             $urlmask = 'ErrorClickToDialModuleNotConfigured';

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

-                $urlmask = $conf->global->CLICKTODIAL_URL;

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

-                $urlmask = $user->clicktodial_url;

+            if (!empty($conf->global->CLICKTODIAL_URL)) {
+                            $urlmask = $conf->global->CLICKTODIAL_URL;
+            }
+            if (!empty($user->clicktodial_url)) {
+                            $urlmask = $user->clicktodial_url;
+            }
 

             $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

             $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2471,8 +2598,9 @@ 
             $url = make_substitutions($url, $substitarray);

             $newphonesav = $newphone;

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

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

-                $newphone .= ' target="_blank"';

+            if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                            $newphone .= ' target="_blank"';
+            }
             $newphone .= '>' . $newphonesav . '</a>';

         }

 

@@ -2480,12 +2608,15 @@ 
         if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

             $type = 'AC_TEL';

             $link = '';

-            if ($addlink == 'AC_FAX')

-                $type = 'AC_FAX';

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

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            if ($link)

-                $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+            if ($addlink == 'AC_FAX') {
+                            $type = 'AC_FAX';
+            }
+            if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+            }
         }

     }

 

@@ -2512,15 +2643,17 @@ 
                 $picto = '';

             }

         }

-        if ($adddivfloat)

-            $rep .= '<div class="nospan float" style="margin-right: 10px">';

-        else

-            $rep .= '<span style="margin-right: 10px;">';

+        if ($adddivfloat) {
+                    $rep .= '<div class="nospan float" style="margin-right: 10px">';
+        } else {
+                    $rep .= '<span style="margin-right: 10px;">';
+        }
         $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-        if ($adddivfloat)

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

-        else

-            $rep .= '</span>';

+        if ($adddivfloat) {
+                    $rep .= '</div>';
+        } else {
+                    $rep .= '</span>';
+        }
     }

 

     return $rep;

@@ -2539,16 +2672,18 @@ 
 

     $ret = '';

 

-    if (empty($mode))

-        $ret .= $ip;

+    if (empty($mode)) {
+            $ret .= $ip;
+    }
 

     if ($mode != 2) {

         $countrycode = dolGetCountryCodeFromIp($ip);

         if ($countrycode) { // If success, countrycode is us, fr, ...

             if (file_exists(DOL_BASE_PATH . 'theme/common/flags/' . $countrycode . '.png')) {

                 $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), /* DOL_URL_ROOT */ DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-            } else

-                $ret .= ' (' . $countrycode . ')';

+            } else {
+                            $ret .= ' (' . $countrycode . ')';
+            }
         }

     }

 

@@ -2646,26 +2781,33 @@ 
             $out .= $hookmanager->resPrint;

         }

         if (empty($reshook)) {

-            if (empty($charfornl))

-                $out .= nl2br($address);

-            else

-                $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+            if (empty($charfornl)) {
+                            $out .= nl2br($address);
+            } else {
+                            $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+            }
 

             $showgmap = $showomap = 0;

 

             // TODO Add a hook here

-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS))

-                $showgmap = 1;

-            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                $showgmap = 1;

-            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                $showgmap = 1;

-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                $showomap = 1;

-            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                $showomap = 1;

-            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                $showomap = 1;

+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                            $showgmap = 1;
+            }
+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                            $showomap = 1;
+            }
 

             if ($showgmap) {

                 $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2677,11 +2819,12 @@ 
             }

         }

     }

-    if ($noprint)

-        return $out;

-    else

-        print $out;

-}

+    if ($noprint) {
+            return $out;
+    } else {
+            print $out;
+    }
+    }

 

 /**

  * 	Return true if email syntax is ok

@@ -2692,10 +2835,12 @@ 
  */

 function isValidEmail($address, $acceptsupervisorkey = 0)

 {

-    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-        return true;

-    if (filter_var($address, FILTER_VALIDATE_EMAIL))

-        return true;

+    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+            return true;
+    }
+    if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+            return true;
+    }
 

     return false;

 }

@@ -2717,10 +2862,12 @@ 
             $mxhosts = array();

             $weight = array();

             getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-            if (count($mxhosts) > 1)

-                return 1;

-            if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                return 1;

+            if (count($mxhosts) > 1) {
+                            return 1;
+            }
+            if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                            return 1;
+            }
 

             return 0;

         }

@@ -2749,11 +2896,12 @@ 
  */

 function dol_strlen($string, $stringencoding = 'UTF-8')

 {

-    if (function_exists('mb_strlen'))

-        return mb_strlen($string, $stringencoding);

-    else

-        return strlen($string);

-}

+    if (function_exists('mb_strlen')) {
+            return mb_strlen($string, $stringencoding);
+    } else {
+            return strlen($string);
+    }
+    }

 

 /**

  * Make a substring. Works even if mbstring module is not enabled for better compatibility.

@@ -2769,8 +2917,9 @@ 
 {

     global $langs;

 

-    if (empty($stringencoding))

-        $stringencoding = $langs->charset_output;

+    if (empty($stringencoding)) {
+            $stringencoding = $langs->charset_output;
+    }
 

     $ret = '';

     if (empty($trunconbytes)) {

@@ -2806,49 +2955,56 @@ 
 {

     global $conf;

 

-    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC))

-        return $string;

+    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) {
+            return $string;
+    }
 

-    if (empty($stringencoding))

-        $stringencoding = 'UTF-8';

+    if (empty($stringencoding)) {
+            $stringencoding = 'UTF-8';
+    }
     // reduce for small screen

-    if ($conf->dol_optimize_smallscreen == 1 && $display == 1)

-        $size = round($size / 3);

+    if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {
+            $size = round($size / 3);
+    }
 

     // We go always here

     if ($trunc == 'right') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-        else

-        //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-            return $string;

-    }

-    elseif ($trunc == 'middle') {

+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+        } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

+            return $string;
+        }
+    } elseif ($trunc == 'middle') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

         if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

             $size1 = round($size / 2);

             $size2 = round($size / 2);

             return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-        } else

-            return $string;

-    }

-    elseif ($trunc == 'left') {

+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'left') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-        else

-            return $string;

-    }

-    elseif ($trunc == 'wrap') {

+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'wrap') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-        else

-            return $string;

-    } else

-        return 'BadParam3CallingDolTrunc';

-}

+        if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                    return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+        } else {
+                    return $string;
+        }
+    } else {
+            return 'BadParam3CallingDolTrunc';
+    }
+    }

 

 /**

  * 	Show picto whatever it's its name (generic function)

@@ -3057,8 +3213,9 @@ 
 {

     global $conf;

 

-    if (!preg_match('/(\.png|\.gif)$/i', $picto))

-        $picto .= '.png';

+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 

     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;

     $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;

@@ -3080,19 +3237,21 @@ 
 {

     global $conf;

 

-    if (!preg_match('/(\.png|\.gif)$/i', $picto))

-        $picto .= '.png';

+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 

-    if ($pictoisfullpath)

-        $path = $picto;

-    else {

+    if ($pictoisfullpath) {
+            $path = $picto;
+    } else {

         $path = DOL_URL_ROOT . '/theme/common/' . $picto;

 

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

             $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;

 

-            if (file_exists($themepath))

-                $path = $themepath;

+            if (file_exists($themepath)) {
+                            $path = $themepath;
+            }
         }

     }

 

@@ -3131,8 +3290,9 @@ 
             $numaction = 0;

         }

     }

-    if (!is_numeric($numaction))

-        $numaction = 0;

+    if (!is_numeric($numaction)) {
+            $numaction = 0;
+    }
 

     return img_picto($titlealt, 'stcomm' . $numaction . '.png');

 }

@@ -3148,8 +3308,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Show');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Show');
+    }
 

     return img_picto($titlealt, 'pdf' . $size . '.png');

 }

@@ -3165,8 +3326,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Add');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Add');
+    }
 

     return img_picto($titlealt, 'edit_add.png', $other);

 }

@@ -3182,8 +3344,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Remove');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Remove');
+    }
 

     return img_picto($titlealt, 'edit_remove.png', $other);

 }

@@ -3200,8 +3363,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Modify');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Modify');
+    }
 

     return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

 }

@@ -3218,8 +3382,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('View');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('View');
+    }
 

     $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3237,8 +3402,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Delete');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Delete');
+    }
 

     return img_picto($titlealt, 'delete.png', $other);

     //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3254,8 +3420,9 @@ 
 function img_printer($titlealt = "default", $other = '')

 {

     global $conf, $langs;

-    if ($titlealt == "default")

-        $titlealt = $langs->trans("Print");

+    if ($titlealt == "default") {
+            $titlealt = $langs->trans("Print");
+    }
     return img_picto($titlealt, 'printer.png', $other);

 }

 

@@ -3270,8 +3437,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Split');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Split');
+    }
 

     return img_picto($titlealt, 'split.png', $other);

 }

@@ -3288,10 +3456,11 @@ 
     global $conf, $langs;

 

     if ($usealttitle) {

-        if (is_string($usealttitle))

-            $usealttitle = dol_escape_htmltag($usealttitle);

-        else

-            $usealttitle = $langs->trans('Info');

+        if (is_string($usealttitle)) {
+                    $usealttitle = dol_escape_htmltag($usealttitle);
+        } else {
+                    $usealttitle = $langs->trans('Info');
+        }
     }

 

     return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3307,8 +3476,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Informations');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Informations');
+    }
 

     return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

 }

@@ -3324,8 +3494,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Warning');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Warning');
+    }
 

     //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

     return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3341,8 +3512,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Error');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Error');
+    }
 

     return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

 }

@@ -3358,8 +3530,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Next');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Next');
+    }
 

     //return img_picto($titlealt, 'next.png', $moreatt);

     return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3376,8 +3549,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Previous');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Previous');
+    }
 

     //return img_picto($titlealt, 'previous.png', $moreatt);

     return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3395,8 +3569,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Down');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Down');
+    }
 

     return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

 }

@@ -3413,8 +3588,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Up');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Up');
+    }
 

     return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

 }

@@ -3431,8 +3607,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Left');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Left');
+    }
 

     return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

 }

@@ -3449,8 +3626,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Right');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Right');
+    }
 

     return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

 }

@@ -3466,11 +3644,13 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Active');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Active');
+    }
 

-    if ($allow == 1)

-        return img_picto($titlealt, 'tick.png');

+    if ($allow == 1) {
+            return img_picto($titlealt, 'tick.png');
+    }
 

     return '-';

 }

@@ -3518,8 +3698,9 @@ 
     $mimeimg = dol_mimetype($file, '', 2);

     $mimefa = dol_mimetype($file, '', 4);

 

-    if (empty($titlealt))

-        $titlealt = 'Mime type: ' . $mimetype;

+    if (empty($titlealt)) {
+            $titlealt = 'Mime type: ' . $mimetype;
+    }
 

     //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

     return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3541,13 +3722,15 @@ 
 

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Call');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Call');
+    }
 

-    if ($option == 1)

-        $img = 'call';

-    else

-        $img = 'call_out';

+    if ($option == 1) {
+            $img = 'call';
+    } else {
+            $img = 'call_out';
+    }
 

     return img_picto($titlealt, $img);

 }

@@ -3563,8 +3746,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Search');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 

     $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3585,8 +3769,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Search');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 

     $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -3648,14 +3833,16 @@ 
 

     if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

         $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

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

-            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+        }
         $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

         $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

         $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

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

-            $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+        if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+        }
         if (function_exists("phpversion")) {

             $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

         }

@@ -3698,18 +3885,20 @@ 
         $langs->load("errors");

 

         // Merge all into $errors array

-        if (is_array($error) && is_array($errors))

-            $errors = array_merge($error, $errors);

-        elseif (is_array($error))

-            $errors = $error;

-        elseif (is_array($errors))

-            $errors = array_merge(array($error), $errors);

-        else

-            $errors = array_merge(array($error));

+        if (is_array($error) && is_array($errors)) {
+                    $errors = array_merge($error, $errors);
+        } elseif (is_array($error)) {
+                    $errors = $error;
+        } elseif (is_array($errors)) {
+                    $errors = array_merge(array($error), $errors);
+        } else {
+                    $errors = array_merge(array($error));
+        }
 

         foreach ($errors as $msg) {

-            if (empty($msg))

-                continue;

+            if (empty($msg)) {
+                            continue;
+            }
             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                 $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

             } else {                        // Mode CLI

@@ -3727,9 +3916,9 @@ 
         $out .= "<br>\n";

     }

 

-    if (empty($dolibarr_main_prod))

-        print $out;

-    else {

+    if (empty($dolibarr_main_prod)) {
+            print $out;
+    } else {

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

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

         define("MAIN_CORE_ERROR", 1);

@@ -3752,16 +3941,18 @@ 
 {

     global $langs, $conf;

 

-    if (empty($email))

-        $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;

+    if (empty($email)) {
+            $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    }
 

     $langs->load("errors");

     $now = dol_now();

 

     print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

     print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

-    if ($errormessage)

-        print '<br><br>' . $errormessage;

+    if ($errormessage) {
+            print '<br><br>' . $errormessage;
+    }
     if (is_array($errormessages) && count($errormessages)) {

         foreach ($errormessages as $mesgtoshow) {

             print '<br><br>' . $mesgtoshow;

@@ -4004,12 +4195,15 @@ 
     $savtotalnboflines = $totalnboflines;

     $totalnboflines = abs($totalnboflines);

 

-    if ($picto == 'setup')

-        $picto = 'title_setup.png';

-    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png')

-        $picto = 'title.gif';

-    if ($limit < 0)

-        $limit = $conf->liste_limit;

+    if ($picto == 'setup') {
+            $picto = 'title_setup.png';
+    }
+    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+            $picto = 'title.gif';
+    }
+    if ($limit < 0) {
+            $limit = $conf->liste_limit;
+    }
     if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

         $nextpage = 1;

     } else {

@@ -4023,11 +4217,13 @@ 
     // Left

     //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

     print '<td class="nobordernopadding valignmiddle">';

-    if ($picto && $titre)

-        print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+    if ($picto && $titre) {
+            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+    }
     print '<div class="titre inline-block">' . $titre;

-    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-        print ' (' . $totalnboflines . ')';

+    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+            print ' (' . $totalnboflines . ')';
+    }
     print '</div></td>';

 

     // Center

@@ -4037,10 +4233,12 @@ 
 

     // Right

     print '<td class="nobordernopadding valignmiddle" align="right">';

-    if ($sortfield)

-        $options .= "&sortfield=" . urlencode($sortfield);

-    if ($sortorder)

-        $options .= "&sortorder=" . urlencode($sortorder);

+    if ($sortfield) {
+            $options .= "&sortfield=" . urlencode($sortfield);
+    }
+    if ($sortorder) {
+            $options .= "&sortorder=" . urlencode($sortorder);
+    }
     // Show navigation bar

     $pagelist = '';

     if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4048,10 +4246,11 @@ 
             // Define nb of extra page links before and after selected page + ... + first or last

             $maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 1);

 

-            if ($limit > 0)

-                $nbpages = ceil($totalnboflines / $limit);

-            else

-                $nbpages = 1;

+            if ($limit > 0) {
+                            $nbpages = ceil($totalnboflines / $limit);
+            } else {
+                            $nbpages = 1;
+            }
             $cpt = ($page - $maxnbofpage);

             if ($cpt < 0) {

                 $cpt = 0;

@@ -4059,10 +4258,11 @@ 
 

             if ($cpt >= 1) {

                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                if ($cpt > 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                else if ($cpt == 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                if ($cpt > 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                }
             }

 

             do {

@@ -4075,14 +4275,14 @@ 
             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

             if ($cpt < $nbpages) {

-                if ($cpt < $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                else if ($cpt == $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                if ($cpt < $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                }
                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

             }

-        }

-        else {

+        } else {

             $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

         }

     }

@@ -4118,18 +4318,21 @@ 
         $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

         //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported

         //$pagesizechoices.=',2:2';

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

-            $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

+        if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+                    $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+        }
 

         print '<li class="pagination">';

         print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

         $tmpchoice = explode(',', $pagesizechoices);

         $tmpkey = $limit . ':' . $limit;

-        if (!in_array($tmpkey, $tmpchoice))

-            $tmpchoice[] = $tmpkey;

+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         $tmpkey = $conf->liste_limit . ':' . $conf->liste_limit;

-        if (!in_array($tmpkey, $tmpchoice))

-            $tmpchoice[] = $tmpkey;

+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         asort($tmpchoice, SORT_NUMERIC);

         $found = false;

         foreach ($tmpchoice as $val) {

@@ -4205,14 +4408,15 @@ 
     }

 

     // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-    if (!preg_match('/\//', $rate))

-        $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-    else {

+    if (!preg_match('/\//', $rate)) {
+            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+    } else {

         // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

         $ret = $rate . ($addpercent ? '%' : '');

     }

-    if (($info_bits & 1) && $usestarfornpr >= 0)

-        $ret .= ' *';

+    if (($info_bits & 1) && $usestarfornpr >= 0) {
+            $ret .= ' *';
+    }
     $ret .= $morelabel;

     return $ret;

 }

@@ -4237,11 +4441,14 @@ 
     global $langs, $conf;

 

     // Clean parameters

-    if (empty($amount))

-        $amount = 0; // To have a numeric value if amount not defined or = ''

+    if (empty($amount)) {
+            $amount = 0;
+    }
+    // To have a numeric value if amount not defined or = ''

     $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-    if ($rounding < 0)

-        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);

+    if ($rounding < 0) {
+            $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+    }
     $nbdecimal = $rounding;

 

     // Output separators by default (french)

@@ -4249,17 +4456,21 @@ 
     $thousand = ' ';

 

     // If $outlangs not forced, we use use language

-    if (!is_object($outlangs))

-        $outlangs = $langs;

-

-    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-        $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-        $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-    if ($thousand == 'None')

-        $thousand = '';

-    else if ($thousand == 'Space')

-        $thousand = ' ';

+    if (!is_object($outlangs)) {
+            $outlangs = $langs;
+    }
+

+    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } else if ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

     //print "amount=".$amount."-";

     $amount = str_replace(',', '.', $amount); // should be useless

@@ -4271,8 +4482,9 @@ 
     $end = '';

 

     // We increase nbdecimal if there is more decimal than asked (to not loose information)

-    if (dol_strlen($decpart) > $nbdecimal)

-        $nbdecimal = dol_strlen($decpart);

+    if (dol_strlen($decpart) > $nbdecimal) {
+            $nbdecimal = dol_strlen($decpart);
+    }
     // Si on depasse max

     if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {

         $nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;

@@ -4283,8 +4495,9 @@ 
     }

 

     // If force rounding

-    if ($forcerounding >= 0)

-        $nbdecimal = $forcerounding;

+    if ($forcerounding >= 0) {
+            $nbdecimal = $forcerounding;
+    }
 

     // Format number

     $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4295,13 +4508,14 @@ 
     // Add symbol of currency if requested

     $cursymbolbefore = $cursymbolafter = '';

     if ($currency_code) {

-        if ($currency_code == 'auto')

-            $currency_code = $conf->currency;

+        if ($currency_code == 'auto') {
+                    $currency_code = $conf->currency;
+        }
 

         $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-        if (in_array($currency_code, $listofcurrenciesbefore))

-            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-        else {

+        if (in_array($currency_code, $listofcurrenciesbefore)) {
+                    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+        } else {

             $tmpcur = $outlangs->getCurrencySymbol($currency_code);

             $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

         }

@@ -4335,14 +4549,17 @@ 
     // Decimal delimiter for PHP and database SQL requests must be '.'

     $dec = ',';

     $thousand = ' ';

-    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-        $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");

-    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-        $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");

-    if ($thousand == 'None')

-        $thousand = '';

-    elseif ($thousand == 'Space')

-        $thousand = ' ';

+    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } elseif ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

     // Convert value to universal number format (no thousand separator, '.' as decimal separator)

     if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

@@ -4358,8 +4575,10 @@ 
         }

         //print "QQ".$amount.'<br>';

         // Now make replace (the main goal of function)

-        if ($thousand != ',' && $thousand != '.')

-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users

         $amount = str_replace(' ', '', $amount);  // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

@@ -4368,19 +4587,23 @@ 
     // Now, make a rounding if required

     if ($rounding) {

         $nbofdectoround = '';

-        if ($rounding == 'MU')

-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;

-        elseif ($rounding == 'MT')

-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;

-        elseif ($rounding == 'MS')

-            $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;

-        elseif (is_numeric($rounding))

-            $nbofdectoround = $rounding;

+        if ($rounding == 'MU') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+        } elseif ($rounding == 'MT') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+        } elseif ($rounding == 'MS') {
+                    $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+        } elseif (is_numeric($rounding)) {
+                    $nbofdectoround = $rounding;
+        }
         //print "RR".$amount.' - '.$nbofdectoround.'<br>';

-        if (dol_strlen($nbofdectoround))

-            $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-        else

-            return 'ErrorBadParameterProvidedToFunction';

+        if (dol_strlen($nbofdectoround)) {
+                    $amount = round($amount, $nbofdectoround);
+        }
+        // $nbofdectoround can be 0.

+        else {
+                    return 'ErrorBadParameterProvidedToFunction';
+        }
         //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

         // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

         // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

@@ -4394,8 +4617,10 @@ 
         //print "TT".$amount.'<br>';

         // Always make replace because each math function (like round) replace

         // with local values and we want a number that has a SQL string format x.y

-        if ($thousand != ',' && $thousand != '.')

-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users

         $amount = str_replace(' ', '', $amount);  // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

@@ -4454,8 +4679,9 @@ 
 {

     global $db, $conf, $mysoc;

 

-    if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-        $thirdparty_seller = $mysoc;

+    if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+            $thirdparty_seller = $mysoc;
+    }
 

     dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4473,37 +4699,43 @@ 
     // Some test to guess with no need to make database access

     if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

         if ($local == 1) {

-            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                return 0;

+            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                            return 0;
+            }
             if ($thirdparty_seller->id == $mysoc->id) {

-                if (!$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

-                if (!$thirdparty_seller->localtax1_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
             }

         }

 

         if ($local == 2) {

             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-            if (!$mysoc->localtax2_assuj)

-                return 0;  // If main vat is 0, IRPF may be different than 0.

+            if (!$mysoc->localtax2_assuj) {
+                            return 0;
+            }
+            // If main vat is 0, IRPF may be different than 0.

             if ($thirdparty_seller->id == $mysoc->id) {

-                if (!$thirdparty_buyer->localtax2_assuj)

-                    return 0;

-            }

-            else {

-                if (!$thirdparty_seller->localtax2_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax2_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax2_assuj) {
+                                    return 0;
+                }
             }

         }

-    }

-    else {

-        if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-            return 0;

-        if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-            return 0;

+    } else {

+        if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                    return 0;
+        }
+        if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                    return 0;
+        }
     }

 

     // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4545,19 +4777,23 @@ 
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

     $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

     $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-    if ($vatratecode)

-        $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-    else

-        $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+    if ($vatratecode) {
+            $sql .= " AND t.code ='" . $vatratecode . "'";
+    }
+    // If we have the code, we use it in priority

+    else {
+            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+    }
     dol_syslog("get_localtax", LOG_DEBUG);

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

 

     if ($resql) {

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

-        if ($local == 1)

-            return $obj->localtax1;

-        elseif ($local == 2)

-            return $obj->localtax2;

+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }

 

     return 0;

@@ -4603,10 +4839,11 @@ 
     $resql = $db->query($sql);

     if ($resql) {

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

-        if ($local == 1)

-            return $obj->localtax1;

-        elseif ($local == 2)

-            return $obj->localtax2;

+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }

 

     return 0;

@@ -4632,9 +4869,9 @@ 
     // Search local taxes

     $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-    if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

-    else {

+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4647,19 +4884,22 @@ 
           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }

 

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

     if ($resql) {

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

-        if ($obj)

-            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-        else

-            return array();

-    } else

-        dol_print_error($db);

+        if ($obj) {
+                    return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+        } else {
+                    return array();
+        }
+    } else {
+            dol_print_error($db);
+    }
 

     return array();

 }

@@ -4689,9 +4929,9 @@ 
     // Search local taxes

     $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-    if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

-    else {

+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4700,13 +4940,17 @@ 
         }

 

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

-        if ($mysoc->country_code == 'ES')

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-        else

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+        if ($mysoc->country_code == 'ES') {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+        }
+        // local tax in spain use the buyer country ??

+        else {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+        }
         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }

 

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

@@ -4752,17 +4996,17 @@ 
             if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                 $product->get_buyprice($idprodfournprice, 0, 0, 0);

                 $ret = $product->vatrate_supplier;

-                if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

-            }

-            else {

+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
+            } else {

                 $ret = $product->tva_tx;    // Default vat of product we defined

-                if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
             }

             $found = 1;

-        }

-        else {

+        } else {

             // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

             // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

         }

@@ -4782,14 +5026,18 @@ 
                 $obj = $db->fetch_object($resql);

                 if ($obj) {

                     $ret = $obj->vat_rate;

-                    if ($obj->default_vat_code)

-                        $ret .= ' (' . $obj->default_vat_code . ')';

+                    if ($obj->default_vat_code) {
+                                            $ret .= ' (' . $obj->default_vat_code . ')';
+                    }
                 }

                 $db->free($sql);

-            } else

-                dol_print_error($db);

-        } else

-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            } else {
+                            dol_print_error($db);
+            }
+        } else {
+                    $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+        }
+        // Forced value if autodetect fails

     }

 

     dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4844,13 +5092,15 @@ 
         if ($resql) {

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

             if ($obj) {

-                if ($local == 1)

-                    $ret = $obj->localtax1;

-                elseif ($local == 2)

-                    $ret = $obj->localtax2;

+                if ($local == 1) {
+                                    $ret = $obj->localtax1;
+                } elseif ($local == 2) {
+                                    $ret = $obj->localtax2;
+                }
             }

-        } else

-            dol_print_error($db);

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

 

     dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -4953,15 +5203,16 @@ 
     global $db;

 

     if ($idprodfournprice > 0) {

-        if (!class_exists('ProductFournisseur'))

-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+        if (!class_exists('ProductFournisseur')) {
+                    require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+        }
         $prodprice = new ProductFournisseur($db);

         $prodprice->fetch_product_fournisseur_price($idprodfournprice);

         return $prodprice->fourn_tva_npr;

-    }

-    elseif ($idprod > 0) {

-        if (!class_exists('Product'))

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+    } elseif ($idprod > 0) {

+        if (!class_exists('Product')) {
+                    require_once DOL_BASE_PATH . 'product/class/product.class.php';
+        }
         $prod = new Product($db);

         $prod->fetch($idprod);

         return $prod->tva_npr;

@@ -4987,30 +5238,35 @@ 
 {

     global $mysoc;

 

-    if (!is_object($thirdparty_seller))

-        return -1;

-    if (!is_object($thirdparty_buyer))

-        return -1;

+    if (!is_object($thirdparty_seller)) {
+            return -1;
+    }
+    if (!is_object($thirdparty_buyer)) {
+            return -1;
+    }
 

     if ($local == 1) { // Localtax 1

         if ($mysoc->country_code == 'ES') {

-            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                return 0;

-        }

-        else {

+            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                            return 0;
+            }
+        } else {

             // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                return 0;

-        }

-    }

-    elseif ($local == 2) { //I Localtax 2

+            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                            return 0;
+            }
+        }

+    } elseif ($local == 2) { //I Localtax 2

         // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-            return 0;

-        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-            return 0;

+        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                    return 0;
+        }
+        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                    return 0;
+        }
     }

 

     if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5035,31 +5291,38 @@ 
     $classname = '';

     if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

         $result = $langs->trans('yes');

-        if ($case == 1 || $case == 3)

-            $result = $langs->trans("Yes");

-        if ($case == 2)

-            $result = '<input type="checkbox" value="1" checked disabled>';

-        if ($case == 3)

-            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("Yes");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="1" checked disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+        }
 

         $classname = 'ok';

-    }

-    elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+    } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

         $result = $langs->trans("no");

-        if ($case == 1 || $case == 3)

-            $result = $langs->trans("No");

-        if ($case == 2)

-            $result = '<input type="checkbox" value="0" disabled>';

-        if ($case == 3)

-            $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-        if ($color == 2)

-            $classname = 'ok';

-        else

-            $classname = 'error';

-    }

-    if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("No");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="0" disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="0" disabled> ' . $result;
+        }
+

+        if ($color == 2) {
+                    $classname = 'ok';
+        } else {
+                    $classname = 'error';
+        }
+    }

+    if ($color) {
+            return '<font class="' . $classname . '">' . $result . '</font>';
+    }
     return $result;

 }

 

@@ -5085,23 +5348,27 @@ 
     $path = '';

 

     $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

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

-        $arrayforoldpath[] = 'product';

+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+            $arrayforoldpath[] = 'product';
+    }
     if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

         // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-        if (empty($alpha))

-            $num = preg_replace('/([^0-9])/i', '', $num);

-        else

-            $num = preg_replace('/^.*\-/i', '', $num);

+        if (empty($alpha)) {
+                    $num = preg_replace('/([^0-9])/i', '', $num);
+        } else {
+                    $num = preg_replace('/^.*\-/i', '', $num);
+        }
         $num = substr("000" . $num, -$level);

-        if ($level == 1)

-            $path = substr($num, 0, 1);

-        if ($level == 2)

-            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        if ($level == 3)

-            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-    }

-    else {

+        if ($level == 1) {
+                    $path = substr($num, 0, 1);
+        }
+        if ($level == 2) {
+                    $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+        if ($level == 3) {
+                    $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+    } else {

         // TODO

         // We will enhance here a common way of forging path for document storage

         // Here, object->id, object->ref and modulepart are required.

@@ -5112,8 +5379,9 @@ 
         }

     }

 

-    if (empty($withoutslash) && !empty($path))

-        $path .= '/';

+    if (empty($withoutslash) && !empty($path)) {
+            $path .= '/';
+    }
 

     return $path;

 }

@@ -5133,8 +5401,9 @@ 
     dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

     $dir_osencoded = dol_osencode($dir);

-    if (@is_dir($dir_osencoded))

-        return 0;

+    if (@is_dir($dir_osencoded)) {
+            return 0;
+    }
 

     $nberr = 0;

     $nbcreated = 0;

@@ -5149,12 +5418,15 @@ 
     $cdir = explode("/", $dir);

     $num = count($cdir);

     for ($i = 0; $i < $num; $i++) {

-        if ($i > 0)

-            $ccdir .= '/' . $cdir[$i];

-        else

-            $ccdir .= $cdir[$i];

-        if (preg_match("/^.:$/", $ccdir, $regs))

-            continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+        if ($i > 0) {
+                    $ccdir .= '/' . $cdir[$i];
+        } else {
+                    $ccdir .= $cdir[$i];
+        }
+        if (preg_match("/^.:$/", $ccdir, $regs)) {
+                    continue;
+        }
+        // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5226,8 +5498,9 @@ 
  */

 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

 {

-    if ($removelinefeed == 2)

-        $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+    if ($removelinefeed == 2) {
+            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+    }
     $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

     if ($strip_tags) {

@@ -5244,8 +5517,9 @@ 
     $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

     // Supprime aussi les retours

-    if ($removelinefeed == 1)

-        $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+    if ($removelinefeed == 1) {
+            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+    }
 

     // et les espaces doubles

     while (strpos($temp, "  ")) {

@@ -5331,18 +5605,21 @@ 
         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $firstline = '';

         $i = 0;

         $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

         while (($i < $nba) && ($i < ($nboflines * 2))) {

-            if ($i % 2 == 0)

-                $firstline .= $a[$i];

-            elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                $firstline .= ($ishtml ? "<br>\n" : "\n");

+            if ($i % 2 == 0) {
+                            $firstline .= $a[$i];
+            } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                            $firstline .= ($ishtml ? "<br>\n" : "\n");
+            }
             $i++;

         }

         unset($a);

@@ -5391,15 +5668,18 @@ 
     $newstring = $stringtoencode;

     if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

         $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-        if ($removelasteolbr)

-            $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/<br>$/i', '', $newstring);
+        }
+        // Remove last <br> (remove only last one)

         $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

         $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

         $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-    }

-    else {

-        if ($removelasteolbr)

-            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+    } else {

+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+        }
+        // Remove last \n (may remove several)

         $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

     }

     // Other substitutions that htmlentities does not do

@@ -5501,8 +5781,9 @@ 
  */

 function dol_nboflines($s, $maxchar = 0)

 {

-    if ($s == '')

-        return 0;

+    if ($s == '') {
+            return 0;
+    }
     $arraystring = explode("\n", $s);

     $nb = count($arraystring);

 

@@ -5521,15 +5802,18 @@ 
 function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

 {

     $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-    if (dol_textishtml($text))

-        $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+    if (dol_textishtml($text)) {
+            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+    }
 

     $text = strtr($text, $repTable);

     if ($charset == 'UTF-8') {

         $pattern = '/(<br[^>]*>)/Uu';

     } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-    else

-        $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+    else {
+            $pattern = '/(<br[^>]*>)/U';
+    }
+    // /U is to have UNGREEDY regex to limit to one html tag.

     $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

     $nblines = (int) floor((count($a) + 1) / 2);

@@ -5576,39 +5860,47 @@ 
 function dol_textishtml($msg, $option = 0)

 {

     if ($option == 1) {

-        if (preg_match('/<html/i', $msg))

-            return true;

-        elseif (preg_match('/<body/i', $msg))

-            return true;

-        elseif (preg_match('/<br/i', $msg))

-            return true;

+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br/i', $msg)) {
+                    return true;
+        }
         return false;

-    }

-    else {

-        if (preg_match('/<html/i', $msg))

-            return true;

-        elseif (preg_match('/<body/i', $msg))

-            return true;

-        elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-            return true;

-        elseif (preg_match('/<br\/>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-            return true;

-        elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-            return true; // must accept <img src="http://example.com/aaa.png" />

-        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-            return true; // must accept <a href="http://example.com/aaa.png" />

-        elseif (preg_match('/<h[0-9]>/i', $msg))

-            return true;

-        elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-            return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-        elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-            return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+    } else {

+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <img src="http://example.com/aaa.png" />

+        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <a href="http://example.com/aaa.png" />

+        elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                    return true;
+        }
+        // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+        elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                    return true;
+        }
+        // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

         return false;

     }

@@ -5760,12 +6052,14 @@ 
             $birthday = dol_print_date($object->birth, 'day');

 

             $substitutionarray['__MEMBER_ID__'] = $object->id;

-            if (method_exists($object, 'getCivilityLabel'))

-                $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+            if (method_exists($object, 'getCivilityLabel')) {
+                            $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+            }
             $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;

             $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;

-            if (method_exists($object, 'getFullName'))

-                $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+            if (method_exists($object, 'getFullName')) {
+                            $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+            }
             $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;

             $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;

             $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5813,10 +6107,12 @@ 
                 $dateplannedstart = '';

                 $datenextexpiration = '';

                 foreach ($object->lines as $line) {

-                    if ($line->date_ouverture_prevue > $dateplannedstart)

-                        $dateplannedstart = $line->date_ouverture_prevue;

-                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                        $datenextexpiration = $line->date_fin_prevue;

+                    if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                            $dateplannedstart = $line->date_ouverture_prevue;
+                    }
+                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                            $datenextexpiration = $line->date_fin_prevue;
+                    }
                 }

                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

@@ -5826,8 +6122,9 @@ 
 

             // Create dynamic tags for __EXTRAFIELD_FIELD__

             if ($object->table_element && $object->id > 0) {

-                if (!is_object($extrafields))

-                    $extrafields = new ExtraFields($db);

+                if (!is_object($extrafields)) {
+                                    $extrafields = new ExtraFields($db);
+                }
                 $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                 if ($object->fetch_optionals() > 0) {

@@ -5848,12 +6145,15 @@ 
                 require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                 $outputlangs->loadLangs(array('paypal', 'other'));

                 $typeforonlinepayment = 'free';

-                if (is_object($object) && $object->element == 'commande')

-                    $typeforonlinepayment = 'order';

-                if (is_object($object) && $object->element == 'facture')

-                    $typeforonlinepayment = 'invoice';

-                if (is_object($object) && $object->element == 'member')

-                    $typeforonlinepayment = 'member';

+                if (is_object($object) && $object->element == 'commande') {
+                                    $typeforonlinepayment = 'order';
+                }
+                if (is_object($object) && $object->element == 'facture') {
+                                    $typeforonlinepayment = 'invoice';
+                }
+                if (is_object($object) && $object->element == 'member') {
+                                    $typeforonlinepayment = 'member';
+                }
                 $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                 $paymenturl = $url;

             }

@@ -5863,16 +6163,19 @@ 
 

             if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+            }
             if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+            }
             if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+            }
         }

     }

     if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5882,18 +6185,22 @@ 
         $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

         $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

         $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+        }
 

         $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency)) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
 

         // TODO Add keys for foreign multicurrency

         // For backward compatibility

@@ -5963,23 +6270,27 @@ 
 {

     global $conf, $langs;

 

-    if (!is_array($substitutionarray))

-        return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+    if (!is_array($substitutionarray)) {
+            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+    }
 

-    if (empty($outputlangs))

-        $outputlangs = $langs;

+    if (empty($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     // Make substitution for language keys

     if (is_object($outputlangs)) {

         while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

             $msgishtml = 0;

-            if (dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

             $tmp = explode('|', $reg[1]);

-            if (!empty($tmp[1]))

-                $outputlangs->load($tmp[1]);

+            if (!empty($tmp[1])) {
+                            $outputlangs->load($tmp[1]);
+            }
 

             $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

         }

@@ -5989,23 +6300,29 @@ 
     // it is also converted.

     while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

         $msgishtml = 0;

-        if (dol_textishtml($text, 1))

-            $msgishtml = 1;

+        if (dol_textishtml($text, 1)) {
+                    $msgishtml = 1;
+        }
 

         $keyfound = $reg[1];

-        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-            $newval = '*****forbidden*****';

-        else

-            $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

+        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                    $newval = '*****forbidden*****';
+        } else {
+                    $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+        }
         $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

     }

 

     // Make substitition for array $substitutionarray

     foreach ($substitutionarray as $key => $value) {

-        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = '';  // Protection

-        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = ''; // Protection

+        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection

+        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection

 

         $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

     }

@@ -6051,8 +6368,9 @@ 
         $dir = dol_buildpath($reldir, 0);

 

         // Check if directory exists

-        if (!dol_is_dir($dir))

-            continue;

+        if (!dol_is_dir($dir)) {
+                    continue;
+        }
 

         $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

         foreach ($substitfiles as $substitfile) {

@@ -6064,8 +6382,9 @@ 
                 require_once $dir . $substitfile['name'];

                 // Call the user's function, and only if it is defined

                 $function_name = $module . "_" . $callfunc;

-                if (function_exists($function_name))

-                    $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                if (function_exists($function_name)) {
+                                    $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                }
             }

         }

     }

@@ -6101,8 +6420,9 @@ 
 

     $out = '';

 

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     if ($date_start && $date_end) {

         $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6131,20 +6451,22 @@ 
 

     $ret = '';

     // If order not defined, we use the setup

-    if ($nameorder < 0)

-        $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+    if ($nameorder < 0) {
+            $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+    }
     if ($nameorder && ((string) $nameorder != '2')) {

         $ret .= $firstname;

-        if ($firstname && $lastname)

-            $ret .= ' ';

+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $lastname;

-    }

-    else if ($nameorder == 2) {

+    } else if ($nameorder == 2) {

         $ret .= $firstname;

     } else {

         $ret .= $lastname;

-        if ($firstname && $lastname)

-            $ret .= ' ';

+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $firstname;

     }

     return $ret;

@@ -6164,13 +6486,14 @@ 
 {

     //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

     if (!is_array($mesgs)) {  // If mesgs is a string

-        if ($mesgs)

-            $_SESSION['dol_events'][$style][] = $mesgs;

-    }

-    else {      // If mesgs is an array

+        if ($mesgs) {
+                    $_SESSION['dol_events'][$style][] = $mesgs;
+        }
+    } else {      // If mesgs is an array

         foreach ($mesgs as $mesg) {

-            if ($mesg)

-                $_SESSION['dol_events'][$style][] = $mesg;

+            if ($mesg) {
+                            $_SESSION['dol_events'][$style][] = $mesg;
+            }
         }

     }

 }

@@ -6190,13 +6513,16 @@ 
     if (empty($mesg) && empty($mesgs)) {

         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

     } else {

-        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-        if (empty($mesgs))

-            setEventMessage($mesg, $style);

-        else {

-            if (!empty($mesg) && !in_array($mesg, $mesgs))

-                setEventMessage($mesg, $style); // Add message string if not already into array

+        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                    dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+        }
+        if (empty($mesgs)) {
+                    setEventMessage($mesg, $style);
+        } else {

+            if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                            setEventMessage($mesg, $style);
+            }
+            // Add message string if not already into array

             setEventMessage($mesgs, $style);

         }

     }

@@ -6215,22 +6541,25 @@ 
 {

     // Show mesgs

     if (isset($_SESSION['dol_events']['mesgs'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+        }
         unset($_SESSION['dol_events']['mesgs']);

     }

 

     // Show errors

     if (isset($_SESSION['dol_events']['errors'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+        }
         unset($_SESSION['dol_events']['errors']);

     }

 

     // Show warnings

     if (isset($_SESSION['dol_events']['warnings'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+        }
         unset($_SESSION['dol_events']['warnings']);

     }

 }

@@ -6271,8 +6600,9 @@ 
             foreach ($mesgarray as $message) {

                 $ret++;

                 $out .= $langs->trans($message);

-                if ($ret < count($mesgarray))

-                    $out .= "<br>\n";

+                if ($ret < count($mesgarray)) {
+                                    $out .= "<br>\n";
+                }
             }

         }

         if ($mesgstring) {

@@ -6338,8 +6668,9 @@ 
  */

 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

 {

-    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-        return;

+    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+            return;
+    }
 

     $iserror = 0;

     $iswarning = 0;

@@ -6354,14 +6685,17 @@ 
                 break;

             }

         }

-    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-        $iserror++;

-    else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-        $iswarning++;

-    if ($style == 'error')

-        $iserror++;

-    if ($style == 'warning')

-        $iswarning++;

+    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+            $iserror++;
+    } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+            $iswarning++;
+    }
+    if ($style == 'error') {
+            $iserror++;
+    }
+    if ($style == 'warning') {
+            $iswarning++;
+    }
 

     if ($iserror || $iswarning) {

         // Remove div from texts

@@ -6380,9 +6714,10 @@ 
             $mesgarray = $newmesgarray;

         }

         print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-    } else

-        print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

-}

+    } else {
+            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+    }
+    }

 

 /**

  *  Print formated error messages to output (Used to show messages on html output).

@@ -6422,15 +6757,17 @@ 
         $sizearray = count($array);

         if ($sizearray > 0) {

             $temp = array();

-            foreach (array_keys($array) as $key)

-                $temp[$key] = $array[$key][$index];

+            foreach (array_keys($array) as $key) {
+                            $temp[$key] = $array[$key][$index];
+            }
 

-            if (!$natsort)

-                ($order == 'asc') ? asort($temp) : arsort($temp);

-            else {

+            if (!$natsort) {
+                            ($order == 'asc') ? asort($temp) : arsort($temp);
+            } else {

                 ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                if ($order != 'asc')

-                    $temp = array_reverse($temp, true);

+                if ($order != 'asc') {
+                                    $temp = array_reverse($temp, true);
+                }
             }

 

             $sorted = array();

@@ -6456,23 +6793,38 @@ 
     // We must use here a binary strlen function (so not dol_strlen)

     $strLength = dol_strlen($str);

     for ($i = 0; $i < $strLength; $i++) {

-        if (ord($str[$i]) < 0x80)

-            continue; // 0bbbbbbb

-        elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-            $n = 1; // 110bbbbb

-        elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-            $n = 2; // 1110bbbb

-        elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-            $n = 3; // 11110bbb

-        elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-            $n = 4; // 111110bb

-        elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-            $n = 5; // 1111110b

-        else

-            return false; // Does not match any model

+        if (ord($str[$i]) < 0x80) {
+                    continue;
+        }
+        // 0bbbbbbb

+        elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                    $n = 1;
+        }
+        // 110bbbbb

+        elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                    $n = 2;
+        }
+        // 1110bbbb

+        elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                    $n = 3;
+        }
+        // 11110bbb

+        elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                    $n = 4;
+        }
+        // 111110bb

+        elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                    $n = 5;
+        }
+        // 1111110b

+        else {
+                    return false;
+        }
+        // Does not match any model

         for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                return false;

+            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                            return false;
+            }
         }

     }

     return true;

@@ -6490,15 +6842,21 @@ 
     global $conf;

 

     $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-    if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-        $tmp = 'iso-8859-1'; // By default for windows

-    if (empty($tmp))

-        $tmp = 'utf-8';          // By default for other

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

-        $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

-

-    if ($tmp == 'iso-8859-1')

-        return utf8_decode($str);

+    if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+            $tmp = 'iso-8859-1';
+    }
+    // By default for windows

+    if (empty($tmp)) {
+            $tmp = 'utf-8';
+    }
+    // By default for other

+    if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+            $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+    }
+

+    if ($tmp == 'iso-8859-1') {
+            return utf8_decode($str);
+    }
     return $str;

 }

 

@@ -6520,8 +6878,9 @@ 
     global $cache_codes;

 

     // If key empty

-    if ($key == '')

-        return '';

+    if ($key == '') {
+            return '';
+    }
 

     // Check in cache

     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6533,20 +6892,21 @@ 
     $sql = "SELECT " . $fieldid . " as valuetoget";

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

     $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-    if (!empty($entityfilter))

-        $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+    if (!empty($entityfilter)) {
+            $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+    }
 

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

     if ($resql) {

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

-        if ($obj)

-            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-        else

-            $cache_codes[$tablename][$key][$fieldid] = '';

+        if ($obj) {
+                    $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+        } else {
+                    $cache_codes[$tablename][$key][$fieldid] = '';
+        }
         $db->free($resql);

         return $cache_codes[$tablename][$key][$fieldid];

-    }

-    else {

+    } else {

         return -1;

     }

 }

@@ -6593,16 +6953,17 @@ 
     global $soc;       // For backward compatibility

     //print $s."<br>\n";

     if ($returnvalue) {

-        if ($hideerrors)

-            return @eval('return ' . $s . ';');

-        else

-            return eval('return ' . $s . ';');

-    }

-    else {

-        if ($hideerrors)

-            @eval($s);

-        else

-            eval($s);

+        if ($hideerrors) {
+                    return @eval('return ' . $s . ';');
+        } else {
+                    return eval('return ' . $s . ';');
+        }
+    } else {

+        if ($hideerrors) {
+                    @eval($s);
+        } else {
+                    eval($s);
+        }
     }

 }

 

@@ -6628,8 +6989,9 @@ 
 {

     global $langs;

 

-    if (empty($codelang))

-        return '';

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

     if ($codelang == 'auto') {

         return '<span class="fa fa-globe"></span>';

@@ -6643,9 +7005,9 @@ 
         'sv_SV' => 'se'

     );

 

-    if (isset($langtocountryflag[$codelang]))

-        $flagImage = $langtocountryflag[$codelang];

-    else {

+    if (isset($langtocountryflag[$codelang])) {
+            $flagImage = $langtocountryflag[$codelang];
+    } else {

         $tmparray = explode('_', $codelang);

         $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

     }

@@ -6663,15 +7025,20 @@ 
 {

     global $mysoc;

 

-    if (strtoupper($countrycode) == 'MQ')

-        return 'fr_CA';

-    if (strtoupper($countrycode) == 'SE')

-        return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+    if (strtoupper($countrycode) == 'MQ') {
+            return 'fr_CA';
+    }
+    if (strtoupper($countrycode) == 'SE') {
+            return 'sv_SE';
+    }
+    // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

     if (strtoupper($countrycode) == 'CH') {

-        if ($mysoc->country_code == 'FR')

-            return 'fr_CH';

-        if ($mysoc->country_code == 'DE')

-            return 'de_CH';

+        if ($mysoc->country_code == 'FR') {
+                    return 'fr_CH';
+        }
+        if ($mysoc->country_code == 'DE') {
+                    return 'de_CH';
+        }
     }

 

     // Locale list taken from:

@@ -6849,8 +7216,9 @@ 
     );

 

     $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-    if (in_array($buildprimarykeytotest, $locales))

-        return strtolower($countrycode) . '_' . strtoupper($countrycode);

+    if (in_array($buildprimarykeytotest, $locales)) {
+            return strtolower($countrycode) . '_' . strtoupper($countrycode);
+    }
 

     foreach ($locales as $locale) {

         $locale_language = locale_get_primary_language($locale);

@@ -6904,18 +7272,21 @@ 
 

             if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                 if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                    if ($values[0] != $type)

-                        continue;

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
 

                     if (verifCond($values[4])) {

-                        if ($values[3])

-                            $langs->load($values[3]);

+                        if ($values[3]) {
+                                                    $langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = $langs->trans($values[2]);

+                        } else {
+                                                    $label = $langs->trans($values[2]);
+                        }
 

                         //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                         $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6923,30 +7294,32 @@ 
                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if (count($values) == 5) {       // deprecated

+                } else if (count($values) == 5) {       // deprecated

                     dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                    if ($values[0] != $type)

-                        continue;

-                    if ($values[3])

-                        $langs->load($values[3]);

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
+                    if ($values[3]) {
+                                            $langs->load($values[3]);
+                    }
                     if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                         $substitutionarray = array();

                         complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                         $label = make_substitutions($reg[1], $substitutionarray);

-                    } else

-                        $label = $langs->trans($values[2]);

+                    } else {
+                                            $label = $langs->trans($values[2]);
+                    }
 

                     $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                     $head[$h][1] = $label;

                     $head[$h][2] = str_replace('+', '', $values[1]);

                     $h++;

                 }

-            }

-            else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                if ($values[0] != $type)

-                    continue;

+            } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                if ($values[0] != $type) {
+                                    continue;
+                }
                 $tabname = str_replace('-', '', $values[1]);

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

                     $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -6988,10 +7361,11 @@ 
     global $action;

     global $micro_start_time;

 

-    if ($zone == 'private')

-        print "\n" . '<!-- Common footer for private page -->' . "\n";

-    else

-        print "\n" . '<!-- Common footer for public page -->' . "\n";

+    if ($zone == 'private') {
+            print "\n" . '<!-- Common footer for private page -->' . "\n";
+    } else {
+            print "\n" . '<!-- Common footer for public page -->' . "\n";
+    }
 

     // A div to store page_y POST parameter so we can read it using javascript

     print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7000,8 +7374,9 @@ 
     $parameters = array();

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

     if (empty($reshook)) {

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

-            print $conf->global->MAIN_HTML_FOOTER . "\n";

+        if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+                    print $conf->global->MAIN_HTML_FOOTER . "\n";
+        }
 

         print "\n";

         if (!empty($conf->use_javascript_ajax)) {

@@ -7024,8 +7399,9 @@ 
                 print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                 $relativepathstring = $_SERVER["PHP_SELF"];

                 // Clean $relativepathstring

-                if (constant('DOL_URL_ROOT'))

-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+                if (constant('DOL_URL_ROOT')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7036,14 +7412,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $foundintru = 0;

                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                    $foundintru = 1;

+                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                    $foundintru = 1;
+                                }
                             }

-                            if (!$foundintru)

-                                $qualified = 1;

+                            if (!$foundintru) {
+                                                            $qualified = 1;
+                            }
                             //var_dump($defkey.'-'.$qualified);

-                        } else

-                            $qualified = 1;

+                        } else {
+                                                    $qualified = 1;
+                        }
 

                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7062,14 +7441,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $foundintru = 0;

                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                    $foundintru = 1;

+                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                    $foundintru = 1;
+                                }
                             }

-                            if (!$foundintru)

-                                $qualified = 1;

+                            if (!$foundintru) {
+                                                            $qualified = 1;
+                            }
                             //var_dump($defkey.'-'.$qualified);

-                        } else

-                            $qualified = 1;

+                        } else {
+                                                    $qualified = 1;
+                        }
 

                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7108,8 +7490,9 @@ 
                 print "\n";

                 print "/* JS CODE TO ENABLE to add memory info */\n";

                 print 'window.console && console.log("';

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

-                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';

+                if (!empty($conf->global->MEMCACHED_SERVER)) {
+                                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';
+                }
                 print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                 if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.

                     $micro_end_time = microtime(true);

@@ -7239,8 +7622,9 @@ 
 

     $crits = explode(' ', $value);

     $res = '';

-    if (!is_array($fields))

-        $fields = array($fields);

+    if (!is_array($fields)) {
+            $fields = array($fields);
+    }
 

     $nboffields = count($fields);

     $end2 = count($crits);

@@ -7303,8 +7687,9 @@ 
                 $tmpcrits = explode('|', $crit);

                 $i3 = 0;

                 foreach ($tmpcrits as $tmpcrit) {

-                    if (empty($tmpcrit))

-                        continue;

+                    if (empty($tmpcrit)) {
+                                            continue;
+                    }
 

                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7340,8 +7725,9 @@ 
             }

             $i++;

         }

-        if ($newres)

-            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+        if ($newres) {
+                    $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+        }
         $j++;

     }

     $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7381,29 +7767,37 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')

 {

     $dirName = dirname($file);

-    if ($dirName == '.')

-        $dirName = '';

+    if ($dirName == '.') {
+            $dirName = '';
+    }
 

     $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

     $fileName = basename($fileName);

 

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-    if (!$extImgTarget)

-        return $file;

+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+    }
+

+    if (!$extImgTarget) {
+            return $file;
+    }
 

     $subdir = '';

-    if ($extName)

-        $subdir = 'thumbs/';

+    if ($extName) {
+            $subdir = 'thumbs/';
+    }
 

     return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

 }

@@ -7421,8 +7815,9 @@ 
 {

     global $conf, $langs;

 

-    if (empty($conf->use_javascript_ajax))

-        return '';

+    if (empty($conf->use_javascript_ajax)) {
+            return '';
+    }
 

     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

     //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7430,18 +7825,20 @@ 
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

     if ($alldata == 1) {

-        if ($num_mime !== false)

-            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-        else

-            return array();

+        if ($num_mime !== false) {
+                    return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+        } else {
+                    return array();
+        }
     }

 

     // old behavior

-    if ($num_mime !== false)

-        return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

-    else

-        return '';

-}

+    if ($num_mime !== false) {
+            return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
+    } else {
+            return '';
+    }
+    }

 

 /**

  * Make content of an input box selected when we click into input field.

@@ -7458,8 +7855,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-    if ($addlink)

-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+    if ($addlink) {
+            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+    }
     return $out;

 }

 

@@ -7841,8 +8239,9 @@ 
     if (!isset($dictvalues[$tablename])) {

         $dictvalues[$tablename] = array();

         $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-        if ($checkentity)

-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+        if ($checkentity) {
+                    $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+        }
 

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

         if ($resql) {

@@ -7854,11 +8253,14 @@ 
         }

     }

 

-    if (!empty($dictvalues[$tablename][$id]))

-        return $dictvalues[$tablename][$id]->{$field}; // Found

+    if (!empty($dictvalues[$tablename][$id])) {
+            return $dictvalues[$tablename][$id]->{$field};
+    }
+    // Found

     else { // Not found

-        if ($id > 0)

-            return $id;

+        if ($id > 0) {
+                    return $id;
+        }
         return '';

     }

 }

@@ -7888,8 +8290,9 @@ 
             $b = hexdec($hexb);

         }

         $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-        if ($bright > 0.6)

-            $res = 1;

+        if ($bright > 0.6) {
+                    $res = 1;
+        }
     }

     return $res;

 }

@@ -7908,8 +8311,10 @@ 
 

     //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

     //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-    if (empty($menuentry['enabled']))

-        return 0; // Entry disabled by condition

+    if (empty($menuentry['enabled'])) {
+            return 0;
+    }
+    // Entry disabled by condition

     if ($type_user && $menuentry['module']) {

         $tmploops = explode('|', $menuentry['module']);

         $found = 0;

@@ -7919,15 +8324,23 @@ 
                 break;

             }

         }

-        if (!$found)

-            return 0; // Entry is for menus all excluded to external users

-    }

-    if (!$menuentry['perms'] && $type_user)

-        return 0;            // No permissions and user is external

-    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-        return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-    if (!$menuentry['perms'])

-        return 2;               // No permissions and user is external

+        if (!$found) {
+                    return 0;
+        }
+        // Entry is for menus all excluded to external users

+    }

+    if (!$menuentry['perms'] && $type_user) {
+            return 0;
+    }
+    // No permissions and user is external

+    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+            return 0;
+    }
+    // No permissions and option to hide when not allowed, even for internal user, is on

+    if (!$menuentry['perms']) {
+            return 2;
+    }
+    // No permissions and user is external

     return 1;

 }

 

dolibarr/htdocs/core/menus/standard/eldy.lib.php

Braces +197 added lines, -139 removed lines

@@ -51,8 +51,9 @@ 
     $id = 'mainmenu';

     $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

 

-    if (empty($noout))

-        print_start_menu_array();

+    if (empty($noout)) {
+            print_start_menu_array();
+    }
 

     $usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));

 

@@ -71,14 +72,16 @@ 
     if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") {

         $classname = 'class="tmenusel"';

         $_SESSION['idmenu'] = '';

-    } else

-        $classname = 'class="tmenu"';

+    } else {
+            $classname = 'class="tmenu"';
+    }
     $idsel = 'home';

 

     $titlehome = $langs->trans("Home");

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

-        $titlehome = '&nbsp; <span class="fa fa-home"></span> &nbsp;';

-//$menu->add('/index.php?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

+    if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+            $titlehome = '&nbsp; <span class="fa fa-home"></span> &nbsp;';
+    }
+    //$menu->add('/index.php?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

     $menu->add('?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

 

 // Members

@@ -93,8 +96,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'members';

 

 //$menu->add('/adherents/index.php?mainmenu=members&leftmenu=', $langs->trans("MenuMembers"), 0, $showmode, $atarget, "members", '', 18, $id, $idsel, $classname);

@@ -116,8 +120,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'companies';

 

 //$menu->add('/societe/index.php?mainmenu=companies&leftmenu=', $langs->trans("ThirdParties"), 0, $showmode, $atarget, "companies", '', 20, $id, $idsel, $classname);

@@ -138,8 +143,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'products';

 

         $chaine = "";

@@ -169,8 +175,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'project';

 

         $title = $langs->trans("LeadsOrProjects"); // Leads and opportunities by default

@@ -192,18 +199,24 @@ 
 

 // Commercial

     $menuqualified = 0;

-    if (!empty($conf->propal->enabled))

-        $menuqualified++;

-    if (!empty($conf->commande->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_order->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_proposal->enabled))

-        $menuqualified++;

-    if (!empty($conf->contrat->enabled))

-        $menuqualified++;

-    if (!empty($conf->ficheinter->enabled))

-        $menuqualified++;

+    if (!empty($conf->propal->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->commande->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_order->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_proposal->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->contrat->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->ficheinter->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->societe->lire) || !empty($user->rights->societe->contact->lire)),

@@ -217,8 +230,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'commercial';

 

 //$menu->add('/comm/index.php?mainmenu=commercial&leftmenu=', $langs->trans("Commercial"), 0, $showmode, $atarget, "commercial", "", 40, $id, $idsel, $classname);

@@ -227,18 +241,24 @@ 
 

 // Billing - Financial

     $menuqualified = 0;

-    if (!empty($conf->facture->enabled))

-        $menuqualified++;

-    if (!empty($conf->don->enabled))

-        $menuqualified++;

-    if (!empty($conf->tax->enabled))

-        $menuqualified++;

-    if (!empty($conf->salaries->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_invoice->enabled))

-        $menuqualified++;

-    if (!empty($conf->loan->enabled))

-        $menuqualified++;

+    if (!empty($conf->facture->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->don->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->tax->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->salaries->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_invoice->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->loan->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->facture->lire) || !empty($user->rights->don->lire) || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read) || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read)),

@@ -252,8 +272,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'billing';

 

 //$menu->add('/compta/index.php?mainmenu=billing&leftmenu=', $langs->trans("MenuFinancial"), 0, $showmode, $atarget, "billing", '', 50, $id, $idsel, $classname);

@@ -275,8 +296,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'bank';

 

 //$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);

@@ -285,12 +307,15 @@ 
 

 // Accounting

     $menuqualified = 0;

-    if (!empty($conf->comptabilite->enabled))

-        $menuqualified++;

-    if (!empty($conf->accounting->enabled))

-        $menuqualified++;

-    if (!empty($conf->asset->enabled))

-        $menuqualified++;

+    if (!empty($conf->comptabilite->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->accounting->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->asset->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),

@@ -304,8 +329,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'accountancy';

 

 //$menu->add('/accountancy/index.php?mainmenu=accountancy&leftmenu=', $langs->trans("MenuAccountancy"), 0, $showmode, $atarget, "accountancy", '', 54, $id, $idsel, $classname);

@@ -326,8 +352,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'hrm';

 

 //$menu->add('/hrm/index.php?mainmenu=hrm&leftmenu=', $langs->trans("HRM"), 0, $showmode, $atarget, "hrm", '', 80, $id, $idsel, $classname);

@@ -348,8 +375,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'tools';

 

 //$menu->add('/core/tools.php?mainmenu=tools&leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '', 90, $id, $idsel, $classname);

@@ -377,26 +405,29 @@ 
                 $url = $shorturl = $tmp[0];

                 $param = (isset($tmp[1]) ? $tmp[1] : '');

 

-                if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param))

-                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';

-//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

+                if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
+                                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';
+                }
+                //$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

                 $url = dol_buildpath($url, 1) . ($param ? '?' . $param : '');

 //$shorturl = $shorturl.($param?'?'.$param:'');

                 $shorturl = $url;

-                if (DOL_URL_ROOT)

-                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);

+                if (DOL_URL_ROOT) {
+                                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);
+                }
             }

 

 // Define the class (top menu selected or not)

-            if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu'])

-                $classname = 'class="tmenusel"';

-            else if (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"])

-                $classname = 'class="tmenusel"';

-            else

-                $classname = 'class="tmenu"';

-        }

-        else if ($showmode == 2)

-            $classname = 'class="tmenu"';

+            if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+                            $classname = 'class="tmenusel"';
+            } else if (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+                            $classname = 'class="tmenusel"';
+            } else {
+                            $classname = 'class="tmenu"';
+            }
+        } else if ($showmode == 2) {
+                    $classname = 'class="tmenu"';
+        }
 

         $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);

     }

@@ -693,9 +724,10 @@ 
                 $newmenu->add(BASE_URI . '?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);

 //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);

                 $newmenu->add(BASE_URI . '?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

-                if (function_exists('eaccelerator_info'))

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);

-//$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);

+                if (function_exists('eaccelerator_info')) {
+                                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);
+                }
+                //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

@@ -808,11 +840,13 @@ 
                 if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

 // Categories prospects/customers

                     $menutoshow = $langs->trans("CustomersProspectsCategoriesShort");

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

-                        $menutoshow = $langs->trans("CustomersCategoriesShort");

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

-                        $menutoshow = $langs->trans("ProspectsCategoriesShort");

-//$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+                                            $menutoshow = $langs->trans("CustomersCategoriesShort");
+                    }
+                    if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                                            $menutoshow = $langs->trans("ProspectsCategoriesShort");
+                    }
+                    //$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                     $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                 }

 // Categories suppliers

@@ -1344,25 +1378,33 @@ 
                                 $nature = '';

 

 // Must match array $sourceList defined into journals_list.php

-                                if ($objp->nature == 2 && !empty($conf->facture->enabled))

-                                    $nature = "sells";

-                                if ($objp->nature == 3 && !empty($conf->fournisseur->enabled))

-                                    $nature = "purchases";

-                                if ($objp->nature == 4 && !empty($conf->banque->enabled))

-                                    $nature = "bank";

-                                if ($objp->nature == 5 && !empty($conf->expensereport->enabled))

-                                    $nature = "expensereports";

-                                if ($objp->nature == 1)

-                                    $nature = "various";

-                                if ($objp->nature == 8)

-                                    $nature = "inventory";

-                                if ($objp->nature == 9)

-                                    $nature = "hasnew";

+                                if ($objp->nature == 2 && !empty($conf->facture->enabled)) {
+                                                                    $nature = "sells";
+                                }
+                                if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) {
+                                                                    $nature = "purchases";
+                                }
+                                if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+                                                                    $nature = "bank";
+                                }
+                                if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) {
+                                                                    $nature = "expensereports";
+                                }
+                                if ($objp->nature == 1) {
+                                                                    $nature = "various";
+                                }
+                                if ($objp->nature == 8) {
+                                                                    $nature = "inventory";
+                                }
+                                if ($objp->nature == 9) {
+                                                                    $nature = "hasnew";
+                                }
 

 // To enable when page exists

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

-                                    if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory')

-                                        $nature = '';

+                                    if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+                                                                            $nature = '';
+                                    }
                                 }

 

                                 if ($nature) {

@@ -1377,8 +1419,9 @@ 
 // Should not happend. Entries are added

                             $newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);

                         }

-                    } else

-                        dol_print_error($db);

+                    } else {
+                                            dol_print_error($db);
+                    }
                     $db->free($resql);

                 }

 

@@ -1412,8 +1455,10 @@ 
                 }

 

                 $modecompta = 'CREANCES-DETTES';

-                if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')

-                    $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+                if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+                                    $modecompta = 'BOOKKEEPING';
+                }
+                // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

                 if ($modecompta) {

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

                         /*

@@ -2079,8 +2124,9 @@ 
                     }

                     $i++;

                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
             $db->free($resql);

         }

 

@@ -2107,13 +2153,16 @@ 
     //var_dump($menu_array_before);exit;

     //var_dump($menu_array_after);exit;

     $menu_array = $newmenu->liste;

-    if (is_array($menu_array_before))

-        $menu_array = array_merge($menu_array_before, $menu_array);

-    if (is_array($menu_array_after))

-        $menu_array = array_merge($menu_array, $menu_array_after);

+    if (is_array($menu_array_before)) {
+            $menu_array = array_merge($menu_array_before, $menu_array);
+    }
+    if (is_array($menu_array_after)) {
+            $menu_array = array_merge($menu_array, $menu_array_after);
+    }
     //var_dump($menu_array);exit;

-    if (!is_array($menu_array))

-        return 0;

+    if (!is_array($menu_array)) {
+            return 0;
+    }
 

     // TODO Use the position property in menu_array to reorder the $menu_array

     //var_dump($menu_array);

@@ -2135,8 +2184,9 @@ 
         $num = count($menu_array);

         for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry

             $showmenu = true;

-            if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled']))

-                $showmenu = false;

+            if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+                            $showmenu = false;
+            }
 

             // Begin of new left menu block

             if (empty($menu_array[$i]['level']) && $showmenu) {

@@ -2144,8 +2194,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;
+                    }
                 }

                 if ($altok % 2 == 0) {

                     print '<div class="blockvmenu blockvmenuimpair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

@@ -2193,19 +2244,20 @@ 
             if ($menu_array[$i]['level'] == 0) {

                 if ($menu_array[$i]['enabled']) {     // Enabled so visible

                     print '<div class="menu_titre">' . $tabstring;

-                    if ($shorturlwithoutparam)

-                        print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

-                    else

-                        print '<span class="vmenu">';

+                    if ($shorturlwithoutparam) {
+                                            print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';
+                    } else {
+                                            print '<span class="vmenu">';
+                    }
                     print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '') . $menu_array[$i]['titre'];

-                    if ($shorturlwithoutparam)

-                        print '</a>';

-                    else

-                        print '</span>';

+                    if ($shorturlwithoutparam) {
+                                            print '</a>';
+                    } else {
+                                            print '</span>';
+                    }
                     print '</div>' . "\n";

                     $lastlevel0 = 'enabled';

-                }

-                else if ($showmenu) {                 // Not enabled but visible (so greyed)

+                } else if ($showmenu) {                 // Not enabled but visible (so greyed)

                     print '<div class="menu_titre">' . $tabstring . '<font class="vmenudisabled">' . $menu_array[$i]['titre'] . '</font></div>' . "\n";

                     $lastlevel0 = 'greyed';

                 } else {

@@ -2219,34 +2271,38 @@ 
             // Menu level > 0

             if ($menu_array[$i]['level'] > 0) {

                 $cssmenu = '';

-                if ($menu_array[$i]['url'])

-                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+                if ($menu_array[$i]['url']) {
+                                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+                }
 

                 if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.

                     print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring;

-                    if ($shorturlwithoutparam)

-                        print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

-                    else

-                        print '<span class="vsmenu">';

+                    if ($shorturlwithoutparam) {
+                                            print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';
+                    } else {
+                                            print '<span class="vsmenu">';
+                    }
                     print $menu_array[$i]['titre'];

-                    if ($shorturlwithoutparam)

-                        print '</a>';

-                    else

-                        print '</span>';

+                    if ($shorturlwithoutparam) {
+                                            print '</a>';
+                    } else {
+                                            print '</span>';
+                    }
                     // If title is not pure text and contains a table, no carriage return added

-                    if (!strstr($menu_array[$i]['titre'], '<table'))

-                        print '<br>';

+                    if (!strstr($menu_array[$i]['titre'], '<table')) {
+                                            print '<br>';
+                    }
                     print '</div>' . "\n";

-                }

-                else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

+                } else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

                     print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $menu_array[$i]['titre'] . '</font><br></div>' . "\n";

                 }

             }

 

             // If next is a new block or if there is nothing after

             if (empty($menu_array[$i + 1]['level'])) {               // End menu block

-                if ($showmenu)

-                    print '<div class="menu_end"></div>' . "\n";

+                if ($showmenu) {
+                                    print '<div class="menu_end"></div>' . "\n";
+                }
                 if ($blockvmenuopened) {

                     print '</div>' . "\n";

                     $blockvmenuopened = false;

@@ -2254,8 +2310,10 @@ 
             }

         }

 

-        if ($altok)

-            print '<div class="blockvmenuend"></div>';    // End menu block

+        if ($altok) {
+                    print '<div class="blockvmenuend"></div>';
+        }
+        // End menu block

     }

 

     return count($menu_array);

dolibarr/htdocs/core/class/html.form.class.php

Braces +1351 added lines, -1001 removed lines

@@ -111,45 +111,58 @@ 
             if (!empty($perm)) {

                 $tmp = explode(':', $typeofdata);

                 $ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
                 $ret .= '</div>' . "\n";

-            }

-            else {

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+            } else {

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
             }

-        }

-        else {

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';

-            if ($fieldrequired)

-                $ret .= '<span class="fieldrequired">';

+        } else {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+            }
+            if ($fieldrequired) {
+                            $ret .= '<span class="fieldrequired">';
+            }
             $ret .= $langs->trans($text);

-            if ($fieldrequired)

-                $ret .= '</span>';

-            if (!empty($notabletag))

-                $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<td align="right">';

-            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';

-            if (!empty($notabletag) && $notabletag == 1)

-                $ret .= ' : ';

-            if (!empty($notabletag) && $notabletag == 3)

-                $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</tr></table>';

+            if ($fieldrequired) {
+                            $ret .= '</span>';
+            }
+            if (!empty($notabletag)) {
+                            $ret .= ' ';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</td>';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<td align="right">';
+            }
+            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';
+            }
+            if (!empty($notabletag) && $notabletag == 1) {
+                            $ret .= ' : ';
+            }
+            if (!empty($notabletag) && $notabletag == 3) {
+                            $ret .= ' ';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</td>';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</tr></table>';
+            }
         }

 

         return $ret;

@@ -180,8 +193,9 @@ 
         $ret = '';

 

         // Check parameters

-        if (empty($typeofdata))

-            return 'ErrorBadParameter';

+        if (empty($typeofdata)) {
+                    return 'ErrorBadParameter';
+        }
 

         // When option to edit inline is activated

         if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker

@@ -193,10 +207,12 @@ 
                 $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

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

                 $ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

-                if (empty($notabletag))

-                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

-                if (empty($notabletag))

-                    $ret .= '<tr><td>';

+                if (empty($notabletag)) {
+                                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+                }
+                if (empty($notabletag)) {
+                                    $ret .= '<tr><td>';
+                }
                 if (preg_match('/^(string|email)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

@@ -235,35 +251,39 @@ 
                     $doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), true, true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

                     $ret .= $doleditor->Create(1);

                 }

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '<td align="left">';

+                if (empty($notabletag)) {
+                                    $ret .= '<td align="left">';
+                }
                 //else $ret.='<div class="clearboth"></div>';

                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

-                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag))

-                    $ret .= '<br>' . "\n";

+                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
+                                    $ret .= '<br>' . "\n";
+                }
                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '</tr></table>' . "\n";

+                if (empty($notabletag)) {
+                                    $ret .= '</tr></table>' . "\n";
+                }
                 $ret .= '</form>' . "\n";

-            }

-            else {

-                if (preg_match('/^(email)/', $typeofdata))

-                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);

-                elseif (preg_match('/^(amount|numeric)/', $typeofdata))

-                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');

-                elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))

-                    $ret .= dol_htmlentitiesbr($value);

-                elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')

-                    $ret .= dol_print_date($value, 'day');

-                elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')

-                    $ret .= dol_print_date($value, 'dayhour');

-                else if (preg_match('/^select;/', $typeofdata)) {

+            } else {

+                if (preg_match('/^(email)/', $typeofdata)) {
+                                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+                } elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
+                                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+                } elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+                                    $ret .= dol_htmlentitiesbr($value);
+                } elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+                                    $ret .= dol_print_date($value, 'day');
+                } elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+                                    $ret .= dol_print_date($value, 'dayhour');
+                } else if (preg_match('/^select;/', $typeofdata)) {

                     $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));

                     foreach ($arraydata as $val) {

                         $tmp = explode(':', $val);

@@ -278,8 +298,9 @@ 
                         $tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

                     }

                     $ret .= $tmpcontent;

-                } else

-                    $ret .= $value;

+                } else {
+                                    $ret .= $value;
+                }
 

                 if ($formatfunc && method_exists($object, $formatfunc)) {

                     $ret = $object->$formatfunc($ret);

@@ -309,12 +330,13 @@ 
         $out = '';

 

         // Check parameters

-        if (preg_match('/^text/', $inputType))

-            $value = dol_nl2br($value);

-        else if (preg_match('/^numeric/', $inputType))

-            $value = price($value);

-        else if ($inputType == 'day' || $inputType == 'datepicker')

-            $value = dol_print_date($value, 'day');

+        if (preg_match('/^text/', $inputType)) {
+                    $value = dol_nl2br($value);
+        } else if (preg_match('/^numeric/', $inputType)) {
+                    $value = price($value);
+        } else if ($inputType == 'day' || $inputType == 'datepicker') {
+                    $value = dol_print_date($value, 'day');
+        }
 

         if ($condition) {

             $element = false;

@@ -339,32 +361,35 @@ 
             if (preg_match('/^(string|email|numeric)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
                 $out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

-            }

-            else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

+            } else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
 

                 $out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

-            }

-            else if (preg_match('/^(select|autocomplete)/', $inputType)) {

+            } else if (preg_match('/^(select|autocomplete)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $loadmethod = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

-                if (!empty($tmp[3]))

-                    $button_only = true;

-            }

-            else if (preg_match('/^textarea/', $inputType)) {

+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $button_only = true;
+                }
+            } else if (preg_match('/^textarea/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $rows = (empty($tmp[1]) ? '8' : $tmp[1]);

@@ -373,12 +398,15 @@ 
                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $toolbar = $tmp[1];

-                if (!empty($tmp[2]))

-                    $width = $tmp[2];

-                if (!empty($tmp[3]))

-                    $heigth = $tmp[3];

-                if (!empty($tmp[4]))

-                    $savemethod = $tmp[4];

+                if (!empty($tmp[2])) {
+                                    $width = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $heigth = $tmp[3];
+                }
+                if (!empty($tmp[4])) {
+                                    $savemethod = $tmp[4];
+                }
 

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

                     $out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

@@ -391,18 +419,23 @@ 
             $out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

-            if (!empty($savemethod))

-                $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

-            if (!empty($ext_element))

-                $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

+            if (!empty($savemethod)) {
+                            $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";
+            }
+            if (!empty($ext_element)) {
+                            $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";
+            }
             if (!empty($custommsg)) {

                 if (is_array($custommsg)) {

-                    if (!empty($custommsg['success']))

-                        $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

-                    if (!empty($custommsg['error']))

-                        $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

-                } else

-                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

+                    if (!empty($custommsg['success'])) {
+                                            $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";
+                    }
+                    if (!empty($custommsg['error'])) {
+                                            $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";
+                    }
+                } else {
+                                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";
+                }
             }

             if ($inputType == 'textarea') {

                 $out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

@@ -440,16 +473,20 @@ 
     {

         global $conf;

 

-        if ($incbefore)

-            $text = $incbefore . $text;

-        if (!$htmltext)

-            return $text;

+        if ($incbefore) {
+                    $text = $incbefore . $text;
+        }
+        if (!$htmltext) {
+                    return $text;
+        }
 

         $tag = 'td';

-        if ($notabs == 2)

-            $tag = 'div';

-        if ($notabs == 3)

-            $tag = 'span';

+        if ($notabs == 2) {
+                    $tag = 'div';
+        }
+        if ($notabs == 3) {
+                    $tag = 'span';
+        }
         // Sanitize tooltip

         $htmltext = str_replace("\\", "\\\\", $htmltext);

         $htmltext = str_replace("\r", "", $htmltext);

@@ -478,24 +515,35 @@ 
         }

         if ($tooltipon == 2 || $tooltipon == 3) {

             $paramfortooltipimg = ' class="' . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';

-            if ($tooltiptrigger == '')

-                $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip

-            else

-                $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';

-        } else

-            $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            if ($tooltiptrigger == '') {
+                            $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"';
+            }
+            // Attribut to put on img tag to store tooltip

+            else {
+                            $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';
+            }
+        } else {
+                    $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : '');
+        }
+        // Attribut to put on td text tag

         if ($tooltipon == 1 || $tooltipon == 3) {

             $paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';

-            if ($tooltiptrigger == '')

-                $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip

-            else

-                $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';

-        } else

-            $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

-        if (empty($notabs))

-            $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';

-        elseif ($notabs == 2)

-            $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';

+            if ($tooltiptrigger == '') {
+                            $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"';
+            }
+            // Attribut to put on td tag to store tooltip

+            else {
+                            $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';
+            }
+        } else {
+                    $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : '');
+        }
+        // Attribut to put on td text tag

+        if (empty($notabs)) {
+                    $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';
+        } elseif ($notabs == 2) {
+                    $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';
+        }
         // Define value if value is before

         if ($direction < 0) {

             $s .= '<' . $tag . $paramfortooltipimg;

@@ -506,19 +554,22 @@ 
         }

         // Use another method to help avoid having a space in value in order to use this value with jquery

         // Define label

-        if ((string) $text != '')

-            $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';

+        if ((string) $text != '') {
+                    $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';
+        }
         // Define value if value is after

         if ($direction > 0) {

             $s .= '<' . $tag . $paramfortooltipimg;

-            if ($tag == 'td')

-                $s .= ' valign="middle" width="14"';

+            if ($tag == 'td') {
+                            $s .= ' valign="middle" width="14"';
+            }
             $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

         }

-        if (empty($notabs))

-            $s .= '</tr></table>';

-        elseif ($notabs == 2)

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

+        if (empty($notabs)) {
+                    $s .= '</tr></table>';
+        } elseif ($notabs == 2) {
+                    $s .= '</div>';
+        }
 

         return $s;

     }

@@ -542,20 +593,22 @@ 
         global $conf, $langs;

 

         $alt = '';

-        if ($tooltiptrigger)

-            $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");

+        if ($tooltiptrigger) {
+                    $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+        }
 

         //For backwards compatibility

-        if ($type == '0')

-            $type = 'info';

-        elseif ($type == '1')

-            $type = 'help';

+        if ($type == '0') {
+                    $type = 'info';
+        } elseif ($type == '1') {
+                    $type = 'help';
+        }
 

         // If info or help with no javascript, show only text

         if (empty($conf->use_javascript_ajax)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-            else {

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            } else {

                 $alt = $htmltext;

                 $htmltext = '';

             }

@@ -563,27 +616,30 @@ 
 

         // If info or help with smartphone, show only text (tooltip hover can't works)

         if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
         }

         // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone)

         if (!empty($conf->dol_no_mouse_hover) && !empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-        }

-

-        if ($type == 'info')

-            $img = img_help(0, $alt);

-        elseif ($type == 'help')

-            $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

-        elseif ($type == 'superadmin')

-            $img = img_picto($alt, 'redstar');

-        elseif ($type == 'admin')

-            $img = img_picto($alt, 'star');

-        elseif ($type == 'warning')

-            $img = img_warning($alt);

-        else

-            $img = img_picto($alt, $type);

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
+        }

+

+        if ($type == 'info') {
+                    $img = img_help(0, $alt);
+        } elseif ($type == 'help') {
+                    $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+        } elseif ($type == 'superadmin') {
+                    $img = img_picto($alt, 'redstar');
+        } elseif ($type == 'admin') {
+                    $img = img_picto($alt, 'star');
+        } elseif ($type == 'warning') {
+                    $img = img_warning($alt);
+        } else {
+                    $img = img_picto($alt, $type);
+        }
 

         return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && !$img) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);

     }

@@ -600,8 +656,9 @@ 
     {

         global $conf, $langs, $hookmanager;

 

-        if (count($arrayofaction) == 0)

-            return;

+        if (count($arrayofaction) == 0) {
+                    return;
+        }
 

         $disabled = 0;

         $ret = '<div class="centpercent center">';

@@ -733,10 +790,11 @@ 
                     $i++;

                 }

 

-                if (empty($disablefavorites))

-                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);

-                else

-                    $countryArray = dol_sort_array($countryArray, 'label');

+                if (empty($disablefavorites)) {
+                                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+                } else {
+                                    $countryArray = dol_sort_array($countryArray, 'label');
+                }
 

                 if ($showempty) {

                     $out .= '<option value="">&nbsp;</option>' . "\n";

@@ -746,19 +804,22 @@ 
                     //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                     $out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

                     $out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

-                    if ($mysoc->isInEEC())

-                        $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

+                    if ($mysoc->isInEEC()) {
+                                            $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';
+                    }
                     $out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

                     $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                 }

 

                 foreach ($countryArray as $row) {

                     //if (empty($showempty) && empty($row['rowid'])) continue;

-                    if (empty($row['rowid']))

-                        continue;

+                    if (empty($row['rowid'])) {
+                                            continue;
+                    }
 

-                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso'])

-                        $atleastonefavorite++;

+                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+                                            $atleastonefavorite++;
+                    }
                     if (empty($row['favorite']) && $atleastonefavorite) {

                         $atleastonefavorite = 0;

                         $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

@@ -769,18 +830,19 @@ 
                     } else {

                         $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '">';

                     }

-                    if ($row['label'])

-                        $out .= dol_trunc($row['label'], $maxlength, 'middle');

-                    else

-                        $out .= '&nbsp;';

-                    if ($row['code_iso'])

-                        $out .= ' (' . $row['code_iso'] . ')';

+                    if ($row['label']) {
+                                            $out .= dol_trunc($row['label'], $maxlength, 'middle');
+                    } else {
+                                            $out .= '&nbsp;';
+                    }
+                    if ($row['code_iso']) {
+                                            $out .= ' (' . $row['code_iso'] . ')';
+                    }
                     $out .= '</option>';

                 }

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -854,8 +916,9 @@ 
                         $out .= '<option value="' . $row['rowid'] . '">';

                     }

 

-                    if ($row['code'])

-                        $out .= $row['code'];

+                    if ($row['code']) {
+                                            $out .= $row['code'];
+                    }
 

                     $out .= '</option>';

                 }

@@ -893,24 +956,28 @@ 
 

         // If product & services are enabled or both disabled.

         if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled)) || (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled))) {

-            if (empty($hidetext))

-                print $langs->trans("Type") . ': ';

+            if (empty($hidetext)) {
+                            print $langs->trans("Type") . ': ';
+            }
             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

             if ($showempty) {

                 print '<option value="-1"';

-                if ($selected == -1)

-                    print ' selected';

+                if ($selected == -1) {
+                                    print ' selected';
+                }
                 print '>&nbsp;</option>';

             }

 

             print '<option value="0"';

-            if (0 == $selected)

-                print ' selected';

+            if (0 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Product");

 

             print '<option value="1"';

-            if (1 == $selected)

-                print ' selected';

+            if (1 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Service");

 

             print '</select>';

@@ -941,8 +1008,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_fees);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -996,23 +1065,26 @@ 
         print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

         if ($showempty) {

             print '<option value="-1"';

-            if ($selected == -1)

-                print ' selected';

+            if ($selected == -1) {
+                            print ' selected';
+            }
             print '>&nbsp;</option>';

         }

 

         foreach ($this->cache_types_fees as $key => $value) {

             print '<option value="' . $key . '"';

-            if ($key == $selected)

-                print ' selected';

+            if ($key == $selected) {
+                            print ' selected';
+            }
             print '>';

             print $value;

             print '</option>';

         }

 

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1075,9 +1147,9 @@ 
             $urloption = 'htmlname=' . $htmlname . '&outjson=1&filter=' . $filter . ($showtype ? '&showtype=' . $showtype : '');

             $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if (empty($hidelabel))

-                print $langs->trans("RefOrLabel") . ' : ';

-            else if ($hidelabel > 1) {

+            if (empty($hidelabel)) {
+                            print $langs->trans("RefOrLabel") . ' : ';
+            } else if ($hidelabel > 1) {

                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                 if ($hidelabel == 2) {

                     $out .= img_picto($langs->trans("Search"), 'search');

@@ -1124,10 +1196,11 @@ 
         $num = 0;

         $outarray = array();

 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         // Clean $filter that may contains sql conditions so sql code

         if (function_exists('testSqlAndScriptInject')) {

@@ -1145,21 +1218,26 @@ 
         }

 

         $sql .= " FROM (" . MAIN_DB_PREFIX . "societe as s";

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

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " )";

         if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

             $sql .= " LEFT OUTER JOIN " . MAIN_DB_PREFIX . "c_country as dictp ON dictp.rowid=s.fk_pays";

         }

         $sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

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

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

-        if ($filter)

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

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

-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

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

-            $sql .= " AND s.status <> 0";

+        if (!empty($user->socid)) {
+                    $sql .= " AND s.rowid = " . $user->socid;
+        }
+        if ($filter) {
+                    $sql .= " AND (" . $filter . ")";
+        }
+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
+        if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND s.status <> 0";
+        }
         // Add criteria

         if ($filterkey && $filterkey != '') {

             $sql .= " AND (";

@@ -1167,16 +1245,19 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
             if (!empty($conf->barcode->enabled)) {

                 $sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

             }

@@ -1202,13 +1283,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

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

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

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

             $i = 0;

@@ -1233,16 +1316,21 @@ 
                     }

 

                     if ($showtype) {

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ' (';

-                        if ($obj->client == 1 || $obj->client == 3)

-                            $label .= $langs->trans("Customer");

-                        if ($obj->client == 2 || $obj->client == 3)

-                            $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

-                        if ($obj->fournisseur)

-                            $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ')';

+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ' (';
+                        }
+                        if ($obj->client == 1 || $obj->client == 3) {
+                                                    $label .= $langs->trans("Customer");
+                        }
+                        if ($obj->client == 2 || $obj->client == 3) {
+                                                    $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");
+                        }
+                        if ($obj->fournisseur) {
+                                                    $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");
+                        }
+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ')';
+                        }
                     }

 

                     if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

@@ -1263,20 +1351,21 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

         $this->result = array('nbofthirdparties' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1302,8 +1391,9 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";

         $sql .= " WHERE re.fk_soc = " . (int) $socid;

         $sql .= " AND re.entity = " . $conf->entity;

-        if ($filter)

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

+        if ($filter) {
+                    $sql .= " AND " . $filter;
+        }
         $sql .= " ORDER BY re.description ASC";

 

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

@@ -1320,18 +1410,23 @@ 
                 while ($i < $num) {

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

                     $desc = dol_trunc($obj->description, 40);

-                    if (preg_match('/\(CREDIT_NOTE\)/', $desc))

-                        $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);

-                    if (preg_match('/\(DEPOSIT\)/', $desc))

-                        $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);

-                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);

-                    if (preg_match('/\(EXCESS PAID\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);

+                    if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {
+                                            $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+                    }
+                    if (preg_match('/\(DEPOSIT\)/', $desc)) {
+                                            $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS PAID\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+                    }
 

                     $selectstring = '';

-                    if ($selected > 0 && $selected == $obj->rowid)

-                        $selectstring = ' selected';

+                    if ($selected > 0 && $selected == $obj->rowid) {
+                                            $selectstring = ' selected';
+                    }
 

                     $disabled = '';

                     if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) {

@@ -1341,8 +1436,9 @@ 
 

                     if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {

                         $tmpfac = new Facture($this->db);

-                        if ($tmpfac->fetch($obj->fk_facture_source) > 0)

-                            $desc = $desc . ' - ' . $tmpfac->ref;

+                        if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
+                                                    $desc = $desc . ' - ' . $tmpfac->ref;
+                        }
                     }

 

                     print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

@@ -1351,8 +1447,7 @@ 
             }

             print '</select>';

             return $qualifiedlines;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

             return -1;

         }

@@ -1415,13 +1510,15 @@ 
 

         $langs->load('companies');

 

-        if (empty($htmlid))

-            $htmlid = $htmlname;

+        if (empty($htmlid)) {
+                    $htmlid = $htmlname;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
         $out = '';

 

         if (!is_object($hookmanager)) {

@@ -1431,16 +1528,20 @@ 
 

         // We search third parties

         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

-        if ($showsoc > 0)

-            $sql .= " , s.nom as company";

+        if ($showsoc > 0) {
+                    $sql .= " , s.nom as company";
+        }
         $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp";

-        if ($showsoc > 0)

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

+        if ($showsoc > 0) {
+                    $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";
+        }
         $sql .= " WHERE sp.entity IN (" . getEntity('socpeople') . ")";

-        if ($socid > 0 || $socid == -1)

-            $sql .= " AND sp.fk_soc=" . $socid;

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

-            $sql .= " AND sp.statut <> 0";

+        if ($socid > 0 || $socid == -1) {
+                    $sql .= " AND sp.fk_soc=" . $socid;
+        }
+        if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND sp.statut <> 0";
+        }
         $sql .= " ORDER BY sp.lastname ASC";

 

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

@@ -1453,12 +1554,15 @@ 
                 $out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);

             }

 

-            if ($htmlname != 'none' || $options_only)

-                $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

-            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

-            if ($showempty == 2)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';

+            if ($htmlname != 'none' || $options_only) {
+                            $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';
+            }
+            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';
+            }
+            if ($showempty == 2) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -1474,49 +1578,56 @@ 
                     if ($obj->statut == 1) {

                         if ($htmlname != 'none') {

                             $disabled = 0;

-                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude))

-                                $disabled = 1;

-                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto))

-                                $disabled = 1;

+                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {
+                                                            $disabled = 1;
+                            }
+                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+                                                            $disabled = 1;
+                            }
                             if (!empty($selected) && in_array($obj->rowid, $selected)) {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= ' selected>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

-                            }

-                            else {

+                            } else {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= '>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

                             }

-                        }

-                        else {

+                        } else {

                             if (in_array($obj->rowid, $selected)) {

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                             }

                         }

                     }

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $out .= '<option value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled>';

                 $out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

                 $out .= '</option>';

@@ -1597,24 +1708,27 @@ 
         global $conf, $user, $langs;

 

         // If no preselected user defined, we take current user

-        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE))

-            $selected = $user->id;

+        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+                    $selected = $user->id;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $excludeUsers = null;

         $includeUsers = null;

 

         // Permettre l'exclusion d'utilisateurs

-        if (is_array($exclude))

-            $excludeUsers = implode(",", $exclude);

+        if (is_array($exclude)) {
+                    $excludeUsers = implode(",", $exclude);
+        }
         // Permettre l'inclusion d'utilisateurs

-        if (is_array($include))

-            $includeUsers = implode(",", $include);

-        else if ($include == 'hierarchy') {

+        if (is_array($include)) {
+                    $includeUsers = implode(",", $include);
+        } else if ($include == 'hierarchy') {

             // Build list includeUsers to have only hierarchy

             $includeUsers = implode(",", $user->getAllChildIds(0));

         } else if ($include == 'hierarchyme') {

@@ -1633,12 +1747,12 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=u.entity";

-            if ($force_entity)

-                $sql .= " WHERE u.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE u.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE u.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE u.entity IS NOT NULL";
+            }
+        } else {

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

                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ug";

                 $sql .= " ON ug.fk_user = u.rowid";

@@ -1647,16 +1761,21 @@ 
                 $sql .= " WHERE u.entity IN (0," . $conf->entity . ")";

             }

         }

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

-            $sql .= " AND u.fk_soc = " . $user->societe_id;

-        if (is_array($exclude) && $excludeUsers)

-            $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";

-        if ($includeUsers)

-            $sql .= " AND u.rowid IN (" . $includeUsers . ")";

-        if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive)

-            $sql .= " AND u.statut <> 0";

-        if (!empty($morefilter))

-            $sql .= " " . $morefilter;

+        if (!empty($user->societe_id)) {
+                    $sql .= " AND u.fk_soc = " . $user->societe_id;
+        }
+        if (is_array($exclude) && $excludeUsers) {
+                    $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";
+        }
+        if ($includeUsers) {
+                    $sql .= " AND u.rowid IN (" . $includeUsers . ")";
+        }
+        if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) {
+                    $sql .= " AND u.statut <> 0";
+        }
+        if (!empty($morefilter)) {
+                    $sql .= " " . $morefilter;
+        }
 

         if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

             $sql .= " ORDER BY u.firstname ASC";

@@ -1676,10 +1795,12 @@ 
 

                 // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined

                 $out .= '<select class="flat' . ($morecss ? ' minwidth100 ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

-                if ($show_every)

-                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
+                if ($show_every) {
+                                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";
+                }
 

                 $userstatic = new User($this->db);

 

@@ -1691,19 +1812,21 @@ 
                     $userstatic->firstname = $obj->firstname;

 

                     $disableline = '';

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = ($enableonlytext ? $enableonlytext : '1');

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = ($enableonlytext ? $enableonlytext : '1');
+                    }
 

                     if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected) )) {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= ' selected>';

-                    }

-                    else {

+                    } else {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= '>';

                     }

 

@@ -1757,8 +1880,9 @@ 
             dol_print_error($this->db);

         }

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1810,15 +1934,18 @@ 
         }

         $nbassignetouser = count($assignedtouser);

 

-        if ($nbassignetouser && $action != 'view')

-            $out .= '<br>';

-        if ($nbassignetouser)

-            $out .= '<ul class="attendees">';

+        if ($nbassignetouser && $action != 'view') {
+                    $out .= '<br>';
+        }
+        if ($nbassignetouser) {
+                    $out .= '<ul class="attendees">';
+        }
         $i = 0;

         $ownerid = 0;

         foreach ($assignedtouser as $key => $value) {

-            if ($value['id'] == $ownerid)

-                continue;

+            if ($value['id'] == $ownerid) {
+                            continue;
+            }
 

             $out .= '<li>';

             $userstatic->fetch($value['id']);

@@ -1844,8 +1971,9 @@ 
             $out .= '</li>';

             $i++;

         }

-        if ($nbassignetouser)

-            $out .= '</ul>';

+        if ($nbassignetouser) {
+                    $out .= '</ul>';
+        }
 

         //$out.='</form>';

         return $out;

@@ -1976,9 +2104,9 @@ 
                                 </script>

                                 <?php

                             }

-                            if (empty($hidelabel))

-                                print $langs->trans("RefOrLabel") . ' : ';

-                            else if ($hidelabel > 1) {

+                            if (empty($hidelabel)) {
+                                                            print $langs->trans("RefOrLabel") . ' : ';
+                            } else if ($hidelabel > 1) {

                                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                                 if ($hidelabel == 2) {

                                     print img_picto($langs->trans("Search"), 'search');

@@ -2069,13 +2197,15 @@ 
         // Price by quantity

         if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {

             $sql .= ", (SELECT pp.rowid FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid";

-            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

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

+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_rowid";

             $sql .= ", (SELECT pp.price_by_qty FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

-            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

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

+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_by_qty";

             $selectFields .= ", price_rowid, price_by_qty";

@@ -2117,14 +2247,15 @@ 
             $sql .= " AND p.finished = " . $finished;

         } elseif ($finished == 1) {

             $sql .= " AND p.finished = " . $finished;

-            if ($status >= 0)

-                $sql .= " AND p.tosell = " . $status;

-        }

-        elseif ($status >= 0) {

+            if ($status >= 0) {
+                            $sql .= " AND p.tosell = " . $status;
+            }
+        } elseif ($status >= 0) {

             $sql .= " AND p.tosell = " . $status;

         }

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $filtertype;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $filtertype;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2132,28 +2263,35 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(p.ref LIKE '" . $db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $db->escape($prefix . $crit) . "%'";

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

-                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty($conf->global->MAIN_MULTILANGS)) {
+                                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {

                     $sql .= " OR p.description LIKE '" . $db->escape($prefix . $crit) . "%'";

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

-                        $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    if (!empty($conf->global->MAIN_MULTILANGS)) {
+                                            $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";
+                    }
                 }

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

-                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+                                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 $sql .= ")";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty($conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         if (count($warehouseStatusArray)) {

@@ -2192,13 +2330,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

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

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="0" selected>' . $textifempty . '</option>';

+            if ($showempty) {
+                            $out .= '<option value="0" selected>' . $textifempty . '</option>';
+            }
 

             $i = 0;

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

@@ -2272,11 +2412,11 @@ 
 

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

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             dol_print_error($db);

         }

     }

@@ -2313,10 +2453,12 @@ 
         $maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

 

         $label = $objp->label;

-        if (!empty($objp->label_translated))

-            $label = $objp->label_translated;

-        if (!empty($filterkey) && $filterkey != '')

-            $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+        if (!empty($objp->label_translated)) {
+                    $label = $objp->label_translated;
+        }
+        if (!empty($filterkey) && $filterkey != '') {
+                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+        }
 

         $outkey = $objp->rowid;

         $outref = $objp->ref;

@@ -2334,23 +2476,27 @@ 
             $opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

         }

         if (!empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) {

-            if ($objp->stock > 0)

-                $opt .= ' class="product_line_stock_ok"';

-            else if ($objp->stock <= 0)

-                $opt .= ' class="product_line_stock_too_low"';

+            if ($objp->stock > 0) {
+                            $opt .= ' class="product_line_stock_ok"';
+            } else if ($objp->stock <= 0) {
+                            $opt .= ' class="product_line_stock_too_low"';
+            }
         }

         $opt .= '>';

         $opt .= $objp->ref;

-        if ($outbarcode)

-            $opt .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $opt .= ' (' . $outbarcode . ')';
+        }
         $opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $objRef = $objp->ref;

-        if (!empty($filterkey) && $filterkey != '')

-            $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+        if (!empty($filterkey) && $filterkey != '') {
+                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+        }
         $outval .= $objRef;

-        if ($outbarcode)

-            $outval .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $outval .= ' (' . $outbarcode . ')';
+        }
         $outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $found = 0;

@@ -2549,15 +2695,18 @@ 
         $sql .= " pfp.supplier_reputation";

         $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-        if ($socid)

-            $sql .= " AND pfp.fk_soc = " . $socid;

+        if ($socid) {
+                    $sql .= " AND pfp.fk_soc = " . $socid;
+        }
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

         $sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

         $sql .= " AND p.tobuy = 1";

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);

-        if (!empty($filtre))

-            $sql .= " " . $filtre;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);
+        }
+        if (!empty($filtre)) {
+                    $sql .= " " . $filtre;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2565,18 +2714,22 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty($conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

@@ -2593,18 +2746,21 @@ 
 

             //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax

             $out .= '<select class="flat maxwidthonsmartphone" id="' . $htmlname . '" name="' . $htmlname . '">';

-            if (!$selected)

-                $out .= '<option value="0" selected>&nbsp;</option>';

-            else

-                $out .= '<option value="0">&nbsp;</option>';

+            if (!$selected) {
+                            $out .= '<option value="0" selected>&nbsp;</option>';
+            } else {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             $i = 0;

             while ($i < $num) {

                 $objp = $this->db->fetch_object($result);

 

                 $outkey = $objp->idprodfournprice;                                                    // id in table of price

-                if (!$outkey && $alsoproductwithnosupplierprice)

-                    $outkey = 'idprod_' . $objp->rowid;   // id of product

+                if (!$outkey && $alsoproductwithnosupplierprice) {
+                                    $outkey = 'idprod_' . $objp->rowid;
+                }
+                // id of product

 

                 $outref = $objp->ref;

                 $outval = '';

@@ -2615,32 +2771,39 @@ 
                 $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

                 $opt = '<option value="' . $outkey . '"';

-                if ($selected && $selected == $objp->idprodfournprice)

-                    $opt .= ' selected';

-                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice))

-                    $opt .= ' disabled';

+                if ($selected && $selected == $objp->idprodfournprice) {
+                                    $opt .= ' selected';
+                }
+                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+                                    $opt .= ' disabled';
+                }
                 if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

                     $opt .= ' pbq="' . $objp->idprodfournprice . '" data-pbq="' . $objp->idprodfournprice . '" data-pbqqty="' . $objp->quantity . '" data-pbqpercent="' . $objp->remise_percent . '"';

                 }

                 $opt .= '>';

 

                 $objRef = $objp->ref;

-                if ($filterkey && $filterkey != '')

-                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+                }
                 $objRefFourn = $objp->ref_fourn;

-                if ($filterkey && $filterkey != '')

-                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);
+                }
                 $label = $objp->label;

-                if ($filterkey && $filterkey != '')

-                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+                }
 

                 $opt .= $objp->ref;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $opt .= ' (' . $objp->ref_fourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $opt .= ' (' . $objp->ref_fourn . ')';
+                }
                 $opt .= ' - ';

                 $outval .= $objRef;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $outval .= ' (' . $objRefFourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $outval .= ' (' . $objRefFourn . ')';
+                }
                 $outval .= ' - ';

                 $opt .= dol_trunc($label, 72) . ' - ';

                 $outval .= dol_trunc($label, 72) . ' - ';

@@ -2734,11 +2897,11 @@ 
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -2827,8 +2990,9 @@ 
                         $opt .= " - ";

                         $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");

                     }

-                    if ($objp->duration)

-                        $opt .= " - " . $objp->duration;

+                    if ($objp->duration) {
+                                            $opt .= " - " . $objp->duration;
+                    }
                     $opt .= "</option>\n";

 

                     $form .= $opt;

@@ -2839,8 +3003,7 @@ 
             $form .= '</select>';

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

             return $form;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -2868,8 +3031,9 @@ 
         $resql = $this->db->query($sql);

         if ($resql) {

             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-            if ($showempty)

-                print '<option value="0">&nbsp;</option>';

+            if ($showempty) {
+                            print '<option value="0">&nbsp;</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -2903,8 +3067,10 @@ 
         global $langs;

 

         $num = count($this->cache_conditions_paiements);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -2949,8 +3115,10 @@ 
         global $langs;

 

         $num = count($this->cache_availability);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3001,8 +3169,9 @@ 
         dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

 

         print '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_availability as $id => $arrayavailability) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3013,8 +3182,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3027,8 +3197,10 @@ 
         global $langs;

 

         $num = count($this->cache_demand_reason);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         $sql = "SELECT rowid, code, label";

         $sql .= " FROM " . MAIN_DB_PREFIX . 'c_input_reason';

@@ -3044,10 +3216,14 @@ 
 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

                 $label = ($obj->label != '-' ? $obj->label : '');

-                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code))

-                    $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

-                if ($langs->trans($obj->code) != $obj->code)

-                    $label = $langs->trans($obj->code);                // So translation key SRC_XXX will work

+                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code)) {
+                                    $label = $langs->trans("DemandReasonType" . $obj->code);
+                }
+                // So translation key DemandReasonTypeSRC_XXX will work

+                if ($langs->trans($obj->code) != $obj->code) {
+                                    $label = $langs->trans($obj->code);
+                }
+                // So translation key SRC_XXX will work

 

                 $tmparray[$obj->rowid]['id'] = $obj->rowid;

                 $tmparray[$obj->rowid]['code'] = $obj->code;

@@ -3059,8 +3235,7 @@ 
 

             unset($tmparray);

             return $num;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

             return -1;

         }

@@ -3083,11 +3258,13 @@ 
         $this->loadCacheInputReason();

 

         print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';
+        }
         foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

-            if ($arraydemandreason['code'] == $exclude)

-                continue;

+            if ($arraydemandreason['code'] == $exclude) {
+                            continue;
+            }
 

             if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

                 print '<option value="' . $arraydemandreason['id'] . '" selected>';

@@ -3099,8 +3276,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3115,8 +3293,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_paiements);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3177,12 +3357,14 @@ 
         $this->load_cache_conditions_paiements();

 

         // Set default value if not already set by caller

-        if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID))

-            $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

+        if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+                    $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+        }
 

         print '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3193,8 +3375,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin && empty($noinfoadmin))

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && empty($noinfoadmin)) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3220,59 +3403,68 @@ 
         dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

 

         $filterarray = array();

-        if ($filtertype == 'CRDT')

-            $filterarray = array(0, 2, 3);

-        elseif ($filtertype == 'DBIT')

-            $filterarray = array(1, 2, 3);

-        elseif ($filtertype != '' && $filtertype != '-1')

-            $filterarray = explode(',', $filtertype);

+        if ($filtertype == 'CRDT') {
+                    $filterarray = array(0, 2, 3);
+        } elseif ($filtertype == 'DBIT') {
+                    $filterarray = array(1, 2, 3);
+        } elseif ($filtertype != '' && $filtertype != '-1') {
+                    $filterarray = explode(',', $filtertype);
+        }
 

         $this->load_cache_types_paiements();

 

         print '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($empty)

-            print '<option value="">&nbsp;</option>';

+        if ($empty) {
+                    print '<option value="">&nbsp;</option>';
+        }
         foreach ($this->cache_types_paiements as $id => $arraytypes) {

             // If not good status

-            if ($active >= 0 && $arraytypes['active'] != $active)

-                continue;

+            if ($active >= 0 && $arraytypes['active'] != $active) {
+                            continue;
+            }
 

             // On passe si on a demande de filtrer sur des modes de paiments particuliers

-            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray))

-                continue;

+            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
+                            continue;
+            }
 

             // We discard empty line if showempty is on because an empty line has already been output.

-            if ($empty && empty($arraytypes['code']))

-                continue;

-

-            if ($format == 0)

-                print '<option value="' . $id . '"';

-            elseif ($format == 1)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 2)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 3)

-                print '<option value="' . $id . '"';

+            if ($empty && empty($arraytypes['code'])) {
+                            continue;
+            }
+

+            if ($format == 0) {
+                            print '<option value="' . $id . '"';
+            } elseif ($format == 1) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 2) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 3) {
+                            print '<option value="' . $id . '"';
+            }
             // Si selected est text, on compare avec code, sinon avec id

-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code'])

-                print ' selected';

-            elseif ($selected == $id)

-                print ' selected';

+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {
+                            print ' selected';
+            } elseif ($selected == $id) {
+                            print ' selected';
+            }
             print '>';

-            if ($format == 0)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 1)

-                $value = $arraytypes['code'];

-            elseif ($format == 2)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 3)

-                $value = $arraytypes['code'];

+            if ($format == 0) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 1) {
+                            $value = $arraytypes['code'];
+            } elseif ($format == 2) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 3) {
+                            $value = $arraytypes['code'];
+            }
             print $value ? $value : '&nbsp;';

             print '</option>';

         }

         print '</select>';

-        if ($user->admin && !$noadmininfo)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && !$noadmininfo) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3326,8 +3518,9 @@ 
         $sql = "SELECT rowid, code, libelle as label";

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

         $sql .= " WHERE active > 0";

-        if ($filtre)

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

+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY libelle ASC";

 

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

@@ -3352,8 +3545,9 @@ 
                     $i++;

                 }

                 print "</select>";

-                if ($user->admin)

-                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if ($user->admin) {
+                                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                }
             } else {

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

             }

@@ -3466,8 +3660,9 @@ 
 

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

         if ($resql && $this->db->num_rows($resql) > 0) {

-            if ($showempty)

-                $return .= '<option value="none"></option>';

+            if ($showempty) {
+                            $return .= '<option value="none"></option>';
+            }
 

             while ($res = $this->db->fetch_object($resql)) {

                 $unitLabel = $res->label;

@@ -3510,10 +3705,12 @@ 
         $sql = "SELECT rowid, label, bank, clos as status, currency_code";

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

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

-        if ($statut != 2)

-            $sql .= " AND clos = '" . $statut . "'";

-        if ($filtre)

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

+        if ($statut != 2) {
+                    $sql .= " AND clos = '" . $statut . "'";
+        }
+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY label";

 

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

@@ -3535,23 +3732,24 @@ 
                         print '<option value="' . $obj->rowid . '">';

                     }

                     print trim($obj->label);

-                    if ($showcurrency)

-                        print ' (' . $obj->currency_code . ')';

-                    if ($statut == 2 && $obj->status == 1)

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

+                    if ($showcurrency) {
+                                            print ' (' . $obj->currency_code . ')';
+                    }
+                    if ($statut == 2 && $obj->status == 1) {
+                                            print ' (' . $langs->trans("Closed") . ')';
+                    }
                     print '</option>';

                     $i++;

                 }

                 print "</select>";

+            } else {

+                if ($statut == 0) {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';
+                } else {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';
+                }
             }

-            else {

-                if ($statut == 0)

-                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';

-                else

-                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';

-            }

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -3575,8 +3773,9 @@ 
             print '<input type="hidden" name="action" value="setbankaccount">';

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

             $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);

-            if ($nbaccountfound > 0)

-                print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            if ($nbaccountfound > 0) {
+                            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+            }
             print '</form>';

         } else {

 

@@ -3586,8 +3785,9 @@ 
                 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

                 $bankstatic = new Account($this->db);

                 $result = $bankstatic->fetch($selected);

-                if ($result)

-                    print $bankstatic->getNomUrl(1);

+                if ($result) {
+                                    print $bankstatic->getNomUrl(1);
+                }
             } else {

                 print "&nbsp;";

             }

@@ -3633,15 +3833,16 @@ 
                 $i = 0;

                 while ($i < $num) {

                     $objp = $this->db->fetch_object($result);

-                    if ($objp)

-                        $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);

+                    if ($objp) {
+                                            $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);
+                    }
                     $i++;

                 }

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

-            } else

-                dol_print_error($this->db);

-        }

-        else {

+            } else {
+                            dol_print_error($this->db);
+            }
+        } else {

             $cat = new Categorie($this->db);

             $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);

         }

@@ -3649,9 +3850,9 @@ 
         $output = '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

         $outarray = array();

         if (is_array($cate_arbo)) {

-            if (!count($cate_arbo))

-                $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

-            else {

+            if (!count($cate_arbo)) {
+                            $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';
+            } else {

                 $output .= '<option value="-1">&nbsp;</option>';

                 foreach ($cate_arbo as $key => $value) {

                     if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1)) {

@@ -3668,8 +3869,9 @@ 
         $output .= '</select>';

         $output .= "\n";

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $output;

     }

 

@@ -3733,8 +3935,9 @@ 
 

         // Clean parameters

         $newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;

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

-            $width = '95%';

+        if ($conf->browser->layout == 'phone') {
+                    $width = '95%';
+        }
 

         if (is_array($formquestion) && !empty($formquestion)) {

             // First add hidden fields and value

@@ -3748,8 +3951,9 @@ 
 

             // Now add questions

             $more .= '<table class="paddingtopbottomonly" width="100%">' . "\n";

-            if (!empty($formquestion['text']))

-                $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+            if (!empty($formquestion['text'])) {
+                            $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";
+            }
             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

                     $size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');

@@ -3762,42 +3966,45 @@ 
                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="password" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

                     } elseif ($input['type'] == 'select') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td class="tdtop" align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td class="tdtop" align="left">';
+                        }
                         $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

                         $more .= '</td></tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'checkbox') {

+                    } elseif ($input['type'] == 'checkbox') {

                         $more .= '<tr>';

                         $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . ' </td><td align="left">';

                         $more .= '<input type="checkbox" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $moreattr;

-                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0')

-                            $more .= ' checked';

-                        if (is_bool($input['value']) && $input['value'])

-                            $more .= ' checked';

-                        if (isset($input['disabled']))

-                            $more .= ' disabled';

+                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+                                                    $more .= ' checked';
+                        }
+                        if (is_bool($input['value']) && $input['value']) {
+                                                    $more .= ' checked';
+                        }
+                        if (isset($input['disabled'])) {
+                                                    $more .= ' disabled';
+                        }
                         $more .= ' /></td>';

                         $more .= '</tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'radio') {

+                    } elseif ($input['type'] == 'radio') {

                         $i = 0;

                         foreach ($input['values'] as $selkey => $selval) {

                             $more .= '<tr>';

-                            if ($i == 0)

-                                $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

-                            else

-                                $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';

+                            if ($i == 0) {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';
+                            } else {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';
+                            }
                             $more .= '<td><input type="radio" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . $selkey . '"' . $moreattr;

-                            if ($input['disabled'])

-                                $more .= ' disabled';

+                            if ($input['disabled']) {
+                                                            $more .= ' disabled';
+                            }
                             $more .= ' /> ';

                             $more .= $selval;

                             $more .= '</td></tr>' . "\n";

                             $i++;

                         }

-                    }

-                    elseif ($input['type'] == 'date') {

+                    } elseif ($input['type'] == 'date') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

                         $more .= '<td align="left">';

                         $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

@@ -3809,13 +4016,12 @@ 
                         $formquestion[] = array('name' => $input['name'] . 'min');

                     } elseif ($input['type'] == 'other') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td align="left">';
+                        }
                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

-                    }

-

-                    elseif ($input['type'] == 'onecolumn') {

+                    } elseif ($input['type'] == 'onecolumn') {

                         $more .= '<tr><td colspan="2" align="left">';

                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

@@ -3828,10 +4034,12 @@ 
         // JQUI method dialog is broken with jmobile, we use standard HTML.

         // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx

         // See page product/card.php for example

-        if (!empty($conf->dol_use_jmobile))

-            $useajax = 0;

-        if (empty($conf->use_javascript_ajax))

-            $useajax = 0;

+        if (!empty($conf->dol_use_jmobile)) {
+                    $useajax = 0;
+        }
+        if (empty($conf->use_javascript_ajax)) {
+                    $useajax = 0;
+        }
 

         if ($useajax) {

             $autoOpen = true;

@@ -3849,10 +4057,12 @@ 
             if (is_array($formquestion)) {

                 foreach ($formquestion as $key => $input) {

                     //print "xx ".$key." rr ".is_array($input)."<br>\n";

-                    if (is_array($input) && isset($input['name']))

-                        array_push($inputok, $input['name']);

-                    if (isset($input['inputko']) && $input['inputko'] == 1)

-                        array_push($inputko, $input['name']);

+                    if (is_array($input) && isset($input['name'])) {
+                                            array_push($inputok, $input['name']);
+                    }
+                    if (isset($input['inputko']) && $input['inputko'] == 1) {
+                                            array_push($inputko, $input['name']);
+                    }
                 }

             }

             // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template

@@ -3937,12 +4147,14 @@ 
         } else {

             $formconfirm .= "\n<!-- begin formconfirm page=" . $page . " -->\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";
+            }
 

             $formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

-            if (empty($disableformtag))

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

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
+            }
 

             $formconfirm .= '<table width="100%" class="valid">' . "\n";

 

@@ -3967,8 +4179,9 @@ 
 

             $formconfirm .= '</table>' . "\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= "</form>\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= "</form>\n";
+            }
             $formconfirm .= '<br>';

 

             $formconfirm .= "<!-- end formconfirm -->\n";

@@ -4158,14 +4371,16 @@ 
             $ret .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

             $ret .= '</tr></table></form>';

         } else {

-            if ($displayhour)

-                $ret .= dol_print_date($selected, 'dayhour');

-            else

-                $ret .= dol_print_date($selected, 'day');

+            if ($displayhour) {
+                            $ret .= dol_print_date($selected, 'dayhour');
+            } else {
+                            $ret .= dol_print_date($selected, 'day');
+            }
         }

 

-        if (empty($nooutput))

-            print $ret;

+        if (empty($nooutput)) {
+                    print $ret;
+        }
         return $ret;

     }

 

@@ -4291,10 +4506,10 @@ 
         } else {

             if (!empty($rate)) {

                 print price($rate, 1, $langs, 1, 0);

-                if ($currency && $rate != 1)

-                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';

-            }

-            else {

+                if ($currency && $rate != 1) {
+                                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';
+                }
+            } else {

                 print 1;

             }

         }

@@ -4327,34 +4542,41 @@ 
             print '<div class="inline-block">';

             if (!empty($discount_type)) {

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

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

-                }

-                else {

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    } else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
                 }

             } else {

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

-                    if (!$filter || $filter == "fk_facture_source IS NULL")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

-                }

-                else {

-                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

+                    if (!$filter || $filter == "fk_facture_source IS NULL") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    } else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
                 }

             }

             print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency));

-            if (empty($hidelist))

-                print ': ';

+            if (empty($hidelist)) {
+                            print ': ';
+            }
             print '</div>';

             if (empty($hidelist)) {

                 print '<div class="inline-block" style="padding-right: 10px">';

@@ -4364,15 +4586,18 @@ 
                 } else {

                     $newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available

                 }

-                if ($filter)

-                    $newfilter .= ' AND (' . $filter . ')';

+                if ($filter) {
+                                    $newfilter .= ' AND (' . $filter . ')';
+                }
                 $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);

                 if ($nbqualifiedlines > 0) {

                     print ' &nbsp; <input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans("UseLine")) . '"';

-                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

-                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
+                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
 

                     print '>';

                 }

@@ -4473,10 +4698,11 @@ 
             }

         }

 

-        if ($nooutput)

-            return $out;

-        else

-            print $out;

+        if ($nooutput) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -4509,8 +4735,10 @@ 
 

         $out = '';

 

-        if ($selected == 'euro' || $selected == 'euros')

-            $selected = 'EUR';   // Pour compatibilite

+        if ($selected == 'euro' || $selected == 'euros') {
+                    $selected = 'EUR';
+        }
+        // Pour compatibilite

 

         $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

         foreach ($langs->cache_currencies as $code_iso => $currency) {

@@ -4524,8 +4752,9 @@ 
             $out .= '</option>';

         }

         $out .= '</select>';

-        if ($user->admin)

-            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
 

         // Make select dynamic

         include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

@@ -4554,14 +4783,16 @@ 
         $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

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

         if ($resql) {

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

-                $TCurrency[$obj->code] = $obj->code;

+            while ($obj = $db->fetch_object($resql)) {
+                            $TCurrency[$obj->code] = $obj->code;
+            }
         }

 

         $out = '';

         $out .= '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

-        if ($useempty)

-            $out .= '<option value=""></option>';

+        if ($useempty) {
+                    $out .= '<option value=""></option>';
+        }
         // If company current currency not in table, we add it into list. Should always be available.

         if (!in_array($conf->currency, $TCurrency)) {

             $TCurrency[$conf->currency] = $conf->currency;

@@ -4569,10 +4800,11 @@ 
         if (count($TCurrency) > 0) {

             foreach ($langs->cache_currencies as $code_iso => $currency) {

                 if (isset($TCurrency[$code_iso])) {

-                    if (!empty($selected) && $selected == $code_iso)

-                        $out .= '<option value="' . $code_iso . '" selected="selected">';

-                    else

-                        $out .= '<option value="' . $code_iso . '">';

+                    if (!empty($selected) && $selected == $code_iso) {
+                                            $out .= '<option value="' . $code_iso . '" selected="selected">';
+                    } else {
+                                            $out .= '<option value="' . $code_iso . '">';
+                    }
 

                     $out .= $currency['label'];

                     $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

@@ -4602,8 +4834,10 @@ 
         global $langs;

 

         $num = count($this->cache_vatrates);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -4632,20 +4866,23 @@ 
                     $this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : '');   // Label must contains only 0-9 , . % or *

                     $this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                     $positiverates = '';

-                    if ($obj->taux)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->taux;

-                    if ($obj->localtax1)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

-                    if ($obj->localtax2)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

-                    if (empty($positiverates))

-                        $positiverates = '0';

+                    if ($obj->taux) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->taux;
+                    }
+                    if ($obj->localtax1) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;
+                    }
+                    if ($obj->localtax2) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;
+                    }
+                    if (empty($positiverates)) {
+                                            $positiverates = '0';
+                    }
                     $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                 }

 

                 return $num;

-            }

-            else {

+            } else {

                 $this->error = '<font class="error">' . $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code) . '</font>';

                 return -1;

             }

@@ -4749,17 +4986,19 @@ 
                     $defaultcode = $reg[1];

                     $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);

                 }

-                if (empty($defaulttx))

-                    $defaultnpr = 0;

+                if (empty($defaulttx)) {
+                                    $defaultnpr = 0;
+                }
             }

 

             // Si taux par defaut n'a pu etre determine, on prend dernier de la liste.

             // Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant

             if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {

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

-                    $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];

-                else

-                    $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);

+                if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+                                    $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
+                } else {
+                                    $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+                }
             }

 

             // Disabled if seller is not subject to VAT

@@ -4773,22 +5012,26 @@ 
                 }

             }

 

-            if (!$options_only)

-                $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';

+            if (!$options_only) {
+                            $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';
+            }
 

             $selectedfound = false;

             foreach ($this->cache_vatrates as $rate) {

                 // Keep only 0 if seller is not subject to VAT

-                if ($disabled && $rate['txtva'] != 0)

-                    continue;

+                if ($disabled && $rate['txtva'] != 0) {
+                                    continue;
+                }
 

                 // Define key to use into select list

                 $key = $rate['txtva'];

                 $key .= $rate['nprtva'] ? '*' : '';

-                if ($mode > 0 && $rate['code'])

-                    $key .= ' (' . $rate['code'] . ')';

-                if ($mode < 0)

-                    $key = $rate['rowid'];

+                if ($mode > 0 && $rate['code']) {
+                                    $key .= ' (' . $rate['code'] . ')';
+                }
+                if ($mode < 0) {
+                                    $key = $rate['rowid'];
+                }
 

                 $return .= '<option value="' . $key . '"';

                 if (!$selectedfound) {

@@ -4815,10 +5058,10 @@ 
                 $return .= '</option>';

             }

 

-            if (!$options_only)

-                $return .= '</select>';

-        }

-        else {

+            if (!$options_only) {
+                            $return .= '</select>';
+            }
+        } else {

             $return .= $this->error;

         }

 

@@ -4890,12 +5133,15 @@ 
 

         $retstring = '';

 

-        if ($prefix == '')

-            $prefix = 're';

-        if ($h == '')

-            $h = 0;

-        if ($m == '')

-            $m = 0;

+        if ($prefix == '') {
+                    $prefix = 're';
+        }
+        if ($h == '') {
+                    $h = 0;
+        }
+        if ($m == '') {
+                    $m = 0;
+        }
         $emptydate = 0;

         $emptyhours = 0;

         if ($empty == 1) {

@@ -4944,10 +5190,12 @@ 
             $smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;

             $ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;

         }

-        if ($h == 3)

-            $shour = '';

-        if ($m == 3)

-            $smin = '';

+        if ($h == 3) {
+                    $shour = '';
+        }
+        if ($m == 3) {
+                    $smin = '';
+        }
 

         // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'

         $usecalendar = 'combo';

@@ -4979,14 +5227,14 @@ 
                         $base = DOL_URL_ROOT . '/core/';

                         $retstring .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

                         $retstring .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

-                    } else

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                    } else {
+                                            $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
+                    }
 

                     $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

-                }

-                elseif ($usecalendar == 'jquery') {

+                } elseif ($usecalendar == 'jquery') {

                     if (!$disabled) {

                         // Output javascript for datepicker

                         $retstring .= "<script type='text/javascript'>";

@@ -5096,32 +5344,38 @@ 
             }

         }

 

-        if ($d && $h)

-            $retstring .= ($h == 2 ? '<br>' : ' ');

+        if ($d && $h) {
+                    $retstring .= ($h == 2 ? '<br>' : ' ');
+        }
 

         if ($h) {

             // Show hour

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($hour = 0; $hour < 24; $hour++) {

-                if (strlen($hour) < 2)

-                    $hour = "0" . $hour;

+                if (strlen($hour) < 2) {
+                                    $hour = "0" . $hour;
+                }
                 $retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour . (empty($conf->dol_optimize_smallscreen) ? '' : 'H') . '</option>';

             }

             $retstring .= '</select>';

-            if ($m && empty($conf->dol_optimize_smallscreen))

-                $retstring .= ":";

+            if ($m && empty($conf->dol_optimize_smallscreen)) {
+                            $retstring .= ":";
+            }
         }

 

         if ($m) {

             // Show minutes

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($min = 0; $min < 60; $min++) {

-                if (strlen($min) < 2)

-                    $min = "0" . $min;

+                if (strlen($min) < 2) {
+                                    $min = "0" . $min;
+                }
                 $retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty($conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

             }

             $retstring .= '</select>';

@@ -5152,21 +5406,25 @@ 
               } */

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

@@ -5188,19 +5446,23 @@ 
             $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date(dol_now(), '%Y') . '\');';

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

@@ -5263,41 +5525,46 @@ 
             $retstring .= "</select>";

         } elseif ($typehour == 'text' || $typehour == 'textselect') {

             $retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" size="1" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

-        } else

-            return 'BadValueForParameterTypeHour';

+        } else {
+                    return 'BadValueForParameterTypeHour';
+        }
 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('HourShort');

-        else

-            $retstring .= '<span class="hideonsmartphone">:</span>';

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('HourShort');
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">:</span>';
+        }
 

         // Minutes

-        if ($minunderhours)

-            $retstring .= '<br>';

-        else

-            $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

+        if ($minunderhours) {
+                    $retstring .= '<br>';
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+        }
 

         if ($typehour == 'select' || $typehour == 'textselect') {

             $retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

             for ($min = 0; $min <= 55; $min = $min + 5) {

                 $retstring .= '<option value="' . $min . '"';

-                if ($minSelected == $min)

-                    $retstring .= ' selected';

+                if ($minSelected == $min) {
+                                    $retstring .= ' selected';
+                }
                 $retstring .= '>' . $min . '</option>';

             }

             $retstring .= "</select>";

-        }

-        elseif ($typehour == 'text') {

+        } elseif ($typehour == 'text') {

             $retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" size="1" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

         }

 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('MinuteShort');

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('MinuteShort');
+        }
 

         //$retstring.="&nbsp;";

 

-        if (!empty($nooutput))

-            return $retstring;

+        if (!empty($nooutput)) {
+                    return $retstring;
+        }
 

         print $retstring;

         return;

@@ -5340,8 +5607,9 @@ 
         }

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

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

@@ -5356,11 +5624,11 @@ 
             // Activate the auto complete using ajax call.

             $out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if ($placeholder)

-                $placeholder = ' placeholder="' . $placeholder . '"';

+            if ($placeholder) {
+                            $placeholder = ' placeholder="' . $placeholder . '"';
+            }
             $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $preselectedvalue . '"' . $placeholder . ' />';

-        }

-        else {

+        } else {

             // Immediate load of all database

             $out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo);

         }

@@ -5390,19 +5658,22 @@ 
         global $conf, $langs, $user;

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         $fieldstoshow = 't.ref';

         if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields ( like societe, contact, ...)

             $tmpfieldstoshow = '';

             foreach ($objecttmp->fields as $key => $val) {

-                if ($val['showoncombobox'])

-                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

+                if ($val['showoncombobox']) {
+                                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;
+                }
             }

-            if ($tmpfieldstoshow)

-                $fieldstoshow = $tmpfieldstoshow;

+            if ($tmpfieldstoshow) {
+                            $fieldstoshow = $tmpfieldstoshow;
+            }
         }

 

         $out = '';

@@ -5412,23 +5683,28 @@ 
 

         // Search data

         $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . MAIN_DB_PREFIX . $objecttmp->table_element . " as t";

-        if ($objecttmp->ismultientitymanaged == 2)

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

-                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " WHERE 1=1";

-        if (!empty($objecttmp->ismultientitymanaged))

-            $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

+        if (!empty($objecttmp->ismultientitymanaged)) {
+                    $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";
+        }
         if ($objecttmp->ismultientitymanaged == 1 && !empty($user->societe_id)) {

-            if ($objecttmp->element == 'societe')

-                $sql .= " AND t.rowid = " . $user->societe_id;

-            else

-                $sql .= " AND t.fk_soc = " . $user->societe_id;

-        }

-        if ($searchkey != '')

-            $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

-        if ($objecttmp->ismultientitymanaged == 2)

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

-                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+            if ($objecttmp->element == 'societe') {
+                            $sql .= " AND t.rowid = " . $user->societe_id;
+            } else {
+                            $sql .= " AND t.fk_soc = " . $user->societe_id;
+            }
+        }

+        if ($searchkey != '') {
+                    $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
+        }
+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
         $sql .= $this->db->order($fieldstoshow, "ASC");

         //$sql.=$this->db->plimit($limit, 0);

         // Build output string

@@ -5447,13 +5723,15 @@ 
 

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

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

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

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

             $i = 0;

@@ -5477,21 +5755,22 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

 

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

         $this->result = array('nbofelement' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -5527,8 +5806,9 @@ 
         //if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;

         $jsbeautify = 1;

 

-        if ($value_as_key)

-            $array = array_combine($array, $array);

+        if ($value_as_key) {
+                    $array = array_combine($array, $array);
+        }
 

         $out = '';

 

@@ -5548,10 +5828,13 @@ 
 

         if ($show_empty) {

             $textforempty = ' ';

-            if (!empty($conf->use_javascript_ajax))

-                $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-            if (!is_numeric($show_empty))

-                $textforempty = $show_empty;

+            if (!empty($conf->use_javascript_ajax)) {
+                            $textforempty = '&nbsp;';
+            }
+            // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

+            if (!is_numeric($show_empty)) {
+                            $textforempty = $show_empty;
+            }
             $out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

         }

 

@@ -5564,10 +5847,11 @@ 
             }

 

             // Sort

-            if ($sort == 'ASC')

-                asort($array);

-            elseif ($sort == 'DESC')

-                arsort($array);

+            if ($sort == 'ASC') {
+                            asort($array);
+            } elseif ($sort == 'DESC') {
+                            arsort($array);
+            }
 

             foreach ($array as $key => $value) {

                 $disabled = '';

@@ -5581,26 +5865,31 @@ 
                 }

 

                 if ($key_in_label) {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

-                    else

-                        $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

-                }

-                else {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);

-                    else

-                        $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;

-                    if ($value == '' || $value == '-')

-                        $selectOptionValue = '&nbsp;';

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));
+                    } else {
+                                            $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    }
+                } else {

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    } else {
+                                            $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;
+                    }
+                    if ($value == '' || $value == '-') {
+                                            $selectOptionValue = '&nbsp;';
+                    }
                 }

 

                 $out .= '<option value="' . $key . '"';

                 $out .= $style . $disabled;

-                if ($id != '' && $id == $key && !$disabled)

-                    $out .= ' selected';  // To preselect a value

-                if ($nohtmlescape)

-                    $out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';

+                if ($id != '' && $id == $key && !$disabled) {
+                                    $out .= ' selected';
+                }
+                // To preselect a value

+                if ($nohtmlescape) {
+                                    $out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';
+                }
                 $out .= '>';

                 //var_dump($selectOptionValue);

                 $out .= $selectOptionValue;

@@ -5636,8 +5925,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

 

@@ -5736,8 +6026,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"><option></option></select>';

 

@@ -5907,8 +6198,9 @@ 
 

         $out .= '<select id="' . $htmlname . '" class="multiselect' . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

         if (is_array($array) && !empty($array)) {

-            if ($value_as_key)

-                $array = array_combine($array, $array);

+            if ($value_as_key) {
+                            $array = array_combine($array, $array);
+            }
 

             if (!empty($array)) {

                 foreach ($array as $key => $value) {

@@ -5943,8 +6235,9 @@ 
     {

         global $conf, $langs, $user;

 

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

-            return '';

+        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                    return '';
+        }
 

         $tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage;

         if (!empty($user->conf->$tmpvar)) {

@@ -5952,10 +6245,11 @@ 
             foreach ($array as $key => $val) {

                 //var_dump($key);

                 //var_dump($tmparray);

-                if (in_array($key, $tmparray))

-                    $array[$key]['checked'] = 1;

-                else

-                    $array[$key]['checked'] = 0;

+                if (in_array($key, $tmparray)) {
+                                    $array[$key]['checked'] = 1;
+                } else {
+                                    $array[$key]['checked'] = 0;
+                }
             }

         }

         //var_dump($array);

@@ -6121,40 +6415,47 @@ 
                 // To work with non standard path

                 if ($objecttype == 'facture') {

                     $tplpath = 'compta/' . $element;

-                    if (empty($conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'facturerec') {

+                    if (empty($conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'facturerec') {

                     $tplpath = 'compta/facture';

                     $tplname = 'linkedobjectblockForRec';

-                    if (empty($conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'propal') {

+                    if (empty($conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'propal') {

                     $tplpath = 'comm/' . $element;

-                    if (empty($conf->propal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'supplier_proposal') {

-                    if (empty($conf->supplier_proposal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

+                    if (empty($conf->propal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'supplier_proposal') {

+                    if (empty($conf->supplier_proposal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

                     $tplpath = 'expedition';

-                    if (empty($conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'reception') {

+                    if (empty($conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'reception') {

                     $tplpath = 'reception';

-                    if (empty($conf->reception->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'delivery') {

+                    if (empty($conf->reception->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'delivery') {

                     $tplpath = 'livraison';

-                    if (empty($conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'invoice_supplier') {

+                    if (empty($conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'invoice_supplier') {

                     $tplpath = 'fourn/facture';

                 } else if ($objecttype == 'order_supplier') {

                     $tplpath = 'fourn/commande';

@@ -6218,20 +6519,23 @@ 
         $linktoelemlist = '';

         $listofidcompanytoscan = '';

 

-        if (!is_object($object->thirdparty))

-            $object->fetch_thirdparty();

+        if (!is_object($object->thirdparty)) {
+                    $object->fetch_thirdparty();
+        }
 

         $possiblelinks = array();

         if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

             $listofidcompanytoscan = $object->thirdparty->id;

-            if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO))

-                $listofidcompanytoscan .= ',' . $object->thirdparty->parent;

+            if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+                            $listofidcompanytoscan .= ',' . $object->thirdparty->parent;
+            }
             if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {

                 include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

                 $tmpproject = new Project($this->db);

                 $tmpproject->fetch($object->fk_project);

-                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id))

-                    $listofidcompanytoscan .= ',' . $tmpproject->socid;

+                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {
+                                    $listofidcompanytoscan .= ',' . $tmpproject->socid;
+                }
                 unset($tmpproject);

             }

 

@@ -6267,8 +6571,9 @@ 
         foreach ($possiblelinks as $key => $possiblelink) {

             $num = 0;

 

-            if (empty($possiblelink['enabled']))

-                continue;

+            if (empty($possiblelink['enabled'])) {
+                            continue;
+            }
 

             if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

                 print '<div id="' . $key . 'list"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '') . '>';

@@ -6319,11 +6624,13 @@ 
                 }

 

                 //$linktoelem.=($linktoelem?' &nbsp; ':'');

-                if ($num > 0)

-                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

+                if ($num > 0) {
+                                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';
+                }
                 //else $linktoelem.=$langs->trans($possiblelink['label']);

-                else

-                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

+                else {
+                                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
+                }
             }

         }

 

@@ -6381,8 +6688,9 @@ 
         $disabled = ($disabled ? ' disabled' : '');

 

         $resultyesno = '<select class="flat width75" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

-        if ($useempty)

-            $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+        if ($useempty) {
+                    $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+        }
         if (("$value" == 'yes') || ($value == 1)) {

             $resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans("Yes") . '</option>' . "\n";

             $resultyesno .= '<option value="' . $no . '">' . $langs->trans("No") . '</option>' . "\n";

@@ -6461,10 +6769,12 @@ 
         global $langs, $conf, $hookmanager;

 

         $ret = '';

-        if (empty($fieldid))

-            $fieldid = 'rowid';

-        if (empty($fieldref))

-            $fieldref = 'ref';

+        if (empty($fieldid)) {
+                    $fieldid = 'rowid';
+        }
+        if (empty($fieldref)) {
+                    $fieldref = 'ref';
+        }
 

         // Add where from hooks

         if (is_object($hookmanager)) {

@@ -6503,8 +6813,9 @@ 
         $ret .= '<!-- Start banner content --><div style="vertical-align: middle">';

 

         // Right part of banner

-        if ($morehtmlright)

-            $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

+        if ($morehtmlright) {
+                    $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';
+        }
 

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '<div class="pagination paginationref"><ul class="right">';

@@ -6522,26 +6833,32 @@ 
 

         $parameters = array();

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

-        if (empty($reshook))

-            $morehtmlstatus .= $hookmanager->resPrint;

-        else

-            $morehtmlstatus = $hookmanager->resPrint;

-        if ($morehtmlstatus)

-            $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

+        if (empty($reshook)) {
+                    $morehtmlstatus .= $hookmanager->resPrint;
+        } else {
+                    $morehtmlstatus = $hookmanager->resPrint;
+        }
+        if ($morehtmlstatus) {
+                    $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';
+        }
 

         $parameters = array();

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

-        if (empty($reshook))

-            $morehtmlref .= $hookmanager->resPrint;

-        elseif ($reshook > 0)

-            $morehtmlref = $hookmanager->resPrint;

+        if (empty($reshook)) {
+                    $morehtmlref .= $hookmanager->resPrint;
+        } elseif ($reshook > 0) {
+                    $morehtmlref = $hookmanager->resPrint;
+        }
 

         // Left part of banner

         if ($morehtmlleft) {

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

-                $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';    // class="center" to have photo in middle

-            else

-                $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';

+            if ($conf->browser->layout == 'phone') {
+                            $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';
+            }
+            // class="center" to have photo in middle

+            else {
+                            $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';
+            }
         }

 

         //if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

@@ -6566,8 +6883,9 @@ 
             $ret .= $object->label;

         } else if ($object->element == 'ecm_directories') {

             $ret .= '';

-        } else if ($fieldref != 'none')

-            $ret .= dol_htmlentities($object->$fieldref);

+        } else if ($fieldref != 'none') {
+                    $ret .= dol_htmlentities($object->$fieldref);
+        }
 

 

         if ($morehtmlref) {

@@ -6592,15 +6910,17 @@ 
         global $conf;

 

         //Check if barcode is filled in the card

-        if (empty($object->barcode))

-            return '';

+        if (empty($object->barcode)) {
+                    return '';
+        }
 

         // Complete object if not complete

         if (empty($object->barcode_type_code) || empty($object->barcode_type_coder)) {

             $result = $object->fetch_barcode();

             //Check if fetch_barcode() failed

-            if ($result < 1)

-                return '<!-- ErrorFetchBarcode -->';

+            if ($result < 1) {
+                            return '<!-- ErrorFetchBarcode -->';
+            }
         }

 

         // Barcode image

@@ -6642,108 +6962,120 @@ 
         if ($modulepart == 'societe') {

             $dir = $conf->societe->multidir_output[$entity];

             if (!empty($object->logo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');
+                }
+                // getImageFileNameForSize include the thumbs

+                else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

             }

             $email = $object->email;

-        }

-        else if ($modulepart == 'contact') {

+        } else if ($modulepart == 'contact') {

             $dir = $conf->societe->multidir_output[$entity] . '/contact';

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

             }

             $email = $object->email;

             $capture = 'user';

-        }

-        else if ($modulepart == 'userphoto') {

+        } else if ($modulepart == 'userphoto') {

             $dir = $conf->user->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

             }

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

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

             $capture = 'user';

-        }

-        else if ($modulepart == 'memberphoto') {

+        } else if ($modulepart == 'memberphoto') {

             $dir = $conf->adherent->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

             }

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

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

             $capture = 'user';

-        }

-        else {

+        } else {

             // Generic case to show photos

             $dir = $conf->$modulepart->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;
+                }
                 $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

             }

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

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

         }

 

-        if ($forcecapture)

-            $capture = $forcecapture;

+        if ($forcecapture) {
+                    $capture = $forcecapture;
+        }
 

         if ($dir) {

             if ($file && file_exists($dir . "/" . $file)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else if ($altfile && file_exists($dir . "/" . $altfile)) {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else if ($altfile && file_exists($dir . "/" . $altfile)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else {

                 $nophoto = '/public/theme/common/nophoto.png';

                 if (in_array($modulepart, array('userphoto', 'contact'))) { // For module that are "physical" users

                     $nophoto = '/public/theme/common/user_anonymous.png';

@@ -6781,8 +7113,9 @@ 
                 $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"' . ($capture ? ' capture="' . $capture . '"' : '') . '></td></tr>';

                 $ret .= '</table>';

             }

-        } else

-            dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);

+        } else {
+                    dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);
+        }
 

         return $ret;

     }

@@ -6809,14 +7142,17 @@ 
         global $conf, $user, $langs;

 

         // Permettre l'exclusion de groupes

-        if (is_array($exclude))

-            $excludeGroups = implode("','", $exclude);

+        if (is_array($exclude)) {
+                    $excludeGroups = implode("','", $exclude);
+        }
         // Permettre l'inclusion de groupes

-        if (is_array($include))

-            $includeGroups = implode("','", $include);

+        if (is_array($include)) {
+                    $includeGroups = implode("','", $include);
+        }
 

-        if (!is_array($selected))

-            $selected = array($selected);

+        if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $out = '';

 

@@ -6828,18 +7164,20 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup as ug ";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=ug.entity";

-            if ($force_entity)

-                $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE ug.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE ug.entity IS NOT NULL";
+            }
+        } else {

             $sql .= " WHERE ug.entity IN (0," . $conf->entity . ")";

         }

-        if (is_array($exclude) && $excludeGroups)

-            $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";

-        if (is_array($include) && $includeGroups)

-            $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";

+        if (is_array($exclude) && $excludeGroups) {
+                    $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";
+        }
+        if (is_array($include) && $includeGroups) {
+                    $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";
+        }
         $sql .= " ORDER BY ug.nom ASC";

 

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

@@ -6854,18 +7192,21 @@ 
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
 

                 while ($i < $num) {

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

                     $disableline = 0;

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = 1;

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = 1;
+                    }
 

                     $out .= '<option value="' . $obj->rowid . '"';

-                    if ($disableline)

-                        $out .= ' disabled';

+                    if ($disableline) {
+                                            $out .= ' disabled';
+                    }
                     if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected) )) {

                         $out .= ' selected';

                     }

@@ -6880,13 +7221,13 @@ 
                     $i++;

                 }

             } else {

-                if ($show_empty)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

+                if ($show_empty) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";
+                }
                 $out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -6922,8 +7263,9 @@ 
         global $conf, $langs;

 

         $out = '';

-        if (!empty($conf->use_javascript_ajax))

-            $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';

+        if (!empty($conf->use_javascript_ajax)) {
+                    $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
+        }
         $out .= '<script type="text/javascript">

             $(document).ready(function() {

             	$("#checkallactions").click(function() {

@@ -6936,8 +7278,9 @@ 
                         console.log("We uncheck all");

                 		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

                     }' . "\n";

-        if ($calljsfunction)

-            $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

+        if ($calljsfunction) {
+                    $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+        }
         $out .= '         });

 

         	$(".checkforselect").change(function() {

@@ -6985,22 +7328,25 @@ 
 

         $sql = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_cat WHERE active = 1';

         $sql .= ' AND entity IN (0,' . getEntity('exp_tax_cat') . ')';

-        if (!empty($excludeid))

-            $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';

+        if (!empty($excludeid)) {
+                    $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';
+        }
         $sql .= ' ORDER BY label';

 

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

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0">&nbsp;</option>';

+            if ($useempty) {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

             }

             $out .= '</select>';

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

-                $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+            if (!empty($htmlname) && $user->admin) {
+                            $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+            }
 

             if (!empty($target)) {

                 $sql = "SELECT c.id FROM " . MAIN_DB_PREFIX . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

@@ -7013,8 +7359,9 @@ 
 								$("select[name=' . $target . ']").on("change", function() {

 									var current_val = $(this).val();

 									if (current_val == ' . $obj->id . ') {';

-                        if (!empty($default_selected) || !empty($selected))

-                            $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

+                        if (!empty($default_selected) || !empty($selected)) {
+                                                    $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';
+                        }
 

                         $out .= '

 										$("select[name=' . $htmlname . ']").change();

@@ -7050,8 +7397,7 @@ 
                     }

                 }

             }

-        }

-        else {

+        } else {

             dol_print_error($db);

         }

 

@@ -7076,8 +7422,9 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

@@ -7110,14 +7457,17 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

-            if ($allchoice)

-                $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
+            if ($allchoice) {
+                            $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';
+            }
 

             $field = 'code';

-            if ($useid)

-                $field = 'id';

+            if ($useid) {
+                            $field = 'id';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $key = $langs->trans($obj->code);

dolibarr/htdocs/adherents/type.php

Braces +37 added lines, -28 removed lines

@@ -115,8 +115,9 @@ 
 

     // Fill array 'array_options' with data from add form

     $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-    if ($ret < 0)

-        $error++;

+    if ($ret < 0) {
+            $error++;
+    }
 

     if (empty($object->label)) {

         $error++;

@@ -161,8 +162,9 @@ 
 

     // Fill array 'array_options' with data from add form

     $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-    if ($ret < 0)

-        $error++;

+    if ($ret < 0) {
+            $error++;
+    }
 

     $ret = $object->update($user);

 

@@ -271,8 +273,9 @@ 
             print '<td align="center">' . yn($objp->vote) . '</td>';

             if ($user->rights->adherent->configurer) {

                 print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=edit&rowid=' . $objp->rowid . '">' . img_edit() . '</a></td>';

-            } else

-                print '<td align="right">&nbsp;</td>';

+            } else {
+                            print '<td align="right">&nbsp;</td>';
+            }
             print "</tr>";

             $i++;

         }

@@ -280,8 +283,7 @@ 
         print '</div>';

 

         print '</form>';

-    }

-    else {

+    } else {

         dol_print_error($db);

     }

 }

@@ -470,10 +472,11 @@ 
         $nbtotalofrecords = '';

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

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

-            if ($resql)

-                $nbtotalofrecords = $db->num_rows($result);

-            else

-                dol_print_error($db);

+            if ($resql) {
+                            $nbtotalofrecords = $db->num_rows($result);
+            } else {
+                            dol_print_error($db);
+            }
             if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0

                 $page = 0;

                 $offset = 0;

@@ -513,18 +516,24 @@ 
             }

 

             $param = "&rowid=" . $object->id;

-            if (!empty($status))

-                $param .= "&status=" . $status;

-            if (!empty($search_lastname))

-                $param .= "&search_lastname=" . $search_lastname;

-            if (!empty($search_firstname))

-                $param .= "&search_firstname=" . $search_firstname;

-            if (!empty($search_login))

-                $param .= "&search_login=" . $search_login;

-            if (!empty($search_email))

-                $param .= "&search_email=" . $search_email;

-            if (!empty($filter))

-                $param .= "&filter=" . $filter;

+            if (!empty($status)) {
+                            $param .= "&status=" . $status;
+            }
+            if (!empty($search_lastname)) {
+                            $param .= "&search_lastname=" . $search_lastname;
+            }
+            if (!empty($search_firstname)) {
+                            $param .= "&search_firstname=" . $search_firstname;
+            }
+            if (!empty($search_login)) {
+                            $param .= "&search_login=" . $search_login;
+            }
+            if (!empty($search_email)) {
+                            $param .= "&search_email=" . $search_email;
+            }
+            if (!empty($filter)) {
+                            $param .= "&filter=" . $filter;
+            }
 

             if ($sall) {

                 print $langs->trans("Filter") . " (" . $langs->trans("Lastname") . ", " . $langs->trans("Firstname") . ", " . $langs->trans("EMail") . ", " . $langs->trans("Address") . " " . $langs->trans("or") . " " . $langs->trans("Town") . "): " . $sall;

@@ -630,10 +639,10 @@ 
                     print '<td align="left" class="nowrap">';

                     if ($objp->subscription == 'yes') {

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

-                        if ($objp->statut > 0)

-                            print " " . img_warning();

-                    }

-                    else {

+                        if ($objp->statut > 0) {
+                                                    print " " . img_warning();
+                        }
+                    } else {

                         print '&nbsp;';

                     }

                     print '</td>';

dolibarr/htdocs/viewimage.php

Braces +102 added lines, -44 removed lines

@@ -28,40 +28,80 @@ 
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

-if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');

-if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');

-if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');

-if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');

-if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');

+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 

 // Some value of modulepart can be used to get resources that are public so no login are required.

 // Note that only directory logo is free to access without login.

 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file']))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // For direct external download link, we don't need to load/check we are into a login session

 if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // Some value of modulepart can be used to get resources that are public so no login are required.

 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 

 // For multicompany

 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));

-if (is_numeric($entity)) define("DOLENTITY", $entity);

+if (is_numeric($entity)) {
+    define("DOLENTITY", $entity);
+}
 

 /**

  * Header empty

@@ -91,9 +131,16 @@ 
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;

 

 // Security check

-if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);

-if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);

-if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility

+if (empty($modulepart) && empty($hashp)) {
+    accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
+}
+if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') {
+    accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);
+}
+if ($modulepart == 'fckeditor') {
+    $modulepart='medias';
+}
+// For backward compatibility

 

 

 

@@ -117,8 +164,9 @@ 
     {

         header('Cache-Control: max-age=3600, public, must-revalidate');

         header('Pragma: cache');       // This is to avoid having Pragma: no-cache

-    }

-    else header('Cache-Control: no-cache');

+    } else {
+        header('Cache-Control: no-cache');
+    }
     //print $dolibarr_nocache; exit;

 }

 

@@ -132,32 +180,34 @@ 
 	{

 		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory

 		// filepath can be 'users/X' or 'X/propale/PR11111'

-		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

+		if (is_numeric($tmp[0])) {
+		    // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

 		{

-			$tmp = explode('/', $tmp[1], 2);

+			$tmp = explode('/', $tmp[1], 2);
+		}
 		}

 		$moduleparttocheck = $tmp[0];	// moduleparttocheck is first part of path

 

-		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.

+		if ($modulepart) {
+		    // Not required, so often not defined, for link using public hashp parameter.

 		{

 			if ($moduleparttocheck == $modulepart)

 			{

 				// We remove first level of directory

-				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);
+		}
+		// this is relative to module dir

 				//var_dump($original_file); exit;

-			}

-			else

+			} else

 			{

 				accessforbidden('Bad link. File is from another module part.',0,0,1);

 			}

-		}

-		else

+		} else

 		{

 			$modulepart = $moduleparttocheck;

 			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

 		}

-	}

-	else

+	} else

 	{

 		$langs->load("errors");

 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);

@@ -166,8 +216,11 @@ 
 

 // Define mime type

 $type = 'application/octet-stream';

-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');

-else $type=dol_mimetype($original_file);

+if (GETPOST('type','alpha')) {
+    $type=GETPOST('type','alpha');
+} else {
+    $type=dol_mimetype($original_file);
+}
 

 // Security: Delete string ../ into $original_file

 $original_file = str_replace("../","/", $original_file);

@@ -176,7 +229,9 @@ 
 $refname=basename(dirname($original_file)."/");

 

 // Security check

-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');

+if (empty($modulepart)) {
+    accessforbidden('Bad value for parameter modulepart');
+}
 

 $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);

 $accessallowed              = $check_access['accessallowed'];

@@ -187,8 +242,7 @@ 
 {

 	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed

 	$sqlprotectagainstexternals = '';

-}

-else

+} else

 {

 	// Basic protection (against external users only)

 	if ($user->societe_id > 0)

@@ -256,10 +310,14 @@ 
         $newdir=dol_osencode($dir);

 

         // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)

-        if (! is_dir($newdir)) continue;

+        if (! is_dir($newdir)) {
+            continue;
+        }
 

         $result=@include_once $newdir.$generator.'.modules.php';

-        if ($result) break;

+        if ($result) {
+            break;
+        }
     }

 

     // Load barcode class

@@ -269,8 +327,7 @@ 
     {

         $result=$module->buildBarCode($code,$encoding,$readable);

     }

-}

-else					// Open and return file

+} else					// Open and return file

 {

     clearstatcache();

 

@@ -294,8 +351,7 @@ 
     {

         top_httphead($type);

         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

-    }

-    else

+    } else

     {

         top_httphead('image/png');

         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

@@ -307,4 +363,6 @@ 
 }

 

 

-if (is_object($db)) $db->close();

+if (is_object($db)) {
+    $db->close();
+}