alxarafe / alixar

dolibarr/htdocs/admin/dict.php

Braces +333 added lines, -231 removed lines

@@ -568,8 +568,9 @@ 
         'fichinter' => $langs->trans('InterventionCard'),
         'contrat' => $langs->trans('Contract')
     );
-    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
-        $elementList["societe"] = $langs->trans('ThirdParty');
+    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
+            $elementList["societe"] = $langs->trans('ThirdParty');
+    }
 
     complete_elementList_with_modules($elementList);
 
@@ -615,20 +616,30 @@ 
     // Check that all fields are filled
     $ok = 1;
     foreach ($listfield as $f => $value) {
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'localtax1' && empty($_POST['localtax1_type']))
-            continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type']))
-            continue;
-        if ($value == 'color' && empty($_POST['color']))
-            continue;
-        if ($value == 'formula' && empty($_POST['formula']))
-            continue;
-        if ($value == 'sortorder')
-            continue;  // For a column name 'sortorder', we use the field name 'position'
+        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) {
+                    continue;
+        }
+        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) {
+                    continue;
+        }
+        if ($value == 'color' && empty($_POST['color'])) {
+                    continue;
+        }
+        if ($value == 'formula' && empty($_POST['formula'])) {
+                    continue;
+        }
+        if ($value == 'sortorder') {
+                    continue;
+        }
+        // For a column name 'sortorder', we use the field name 'position'
         if ((!isset($_POST[$value]) || $_POST[$value] == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
             && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
             )
@@ -636,36 +647,51 @@ 
             $ok = 0;
             $fieldnamekey = $listfield[$f];
             // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))
-                $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture')
-                $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')
-                $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage')
-                $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')
-                $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code')
-                $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note')
-                $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux')
-                $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type')
-                $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position')
-                $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode')
-                $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible')
-                $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder')
-                $fieldnamekey = 'SortOrder';
-            if ($fieldnamekey == 'category_type')
-                $fieldnamekey = 'Calculated';
-            if ($fieldnamekey == 'revenuestamp_type')
-                $fieldnamekey = 'TypeOfRevenueStamp';
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+                            $fieldnamekey = 'Label';
+            }
+            if ($fieldnamekey == 'libelle_facture') {
+                            $fieldnamekey = 'LabelOnDocuments';
+            }
+            if ($fieldnamekey == 'nbjour') {
+                            $fieldnamekey = 'NbOfDays';
+            }
+            if ($fieldnamekey == 'decalage') {
+                            $fieldnamekey = 'Offset';
+            }
+            if ($fieldnamekey == 'module') {
+                            $fieldnamekey = 'Module';
+            }
+            if ($fieldnamekey == 'code') {
+                            $fieldnamekey = 'Code';
+            }
+            if ($fieldnamekey == 'note') {
+                            $fieldnamekey = 'Note';
+            }
+            if ($fieldnamekey == 'taux') {
+                            $fieldnamekey = 'Rate';
+            }
+            if ($fieldnamekey == 'type') {
+                            $fieldnamekey = 'Type';
+            }
+            if ($fieldnamekey == 'position') {
+                            $fieldnamekey = 'Position';
+            }
+            if ($fieldnamekey == 'unicode') {
+                            $fieldnamekey = 'Unicode';
+            }
+            if ($fieldnamekey == 'deductible') {
+                            $fieldnamekey = 'Deductible';
+            }
+            if ($fieldnamekey == 'sortorder') {
+                            $fieldnamekey = 'SortOrder';
+            }
+            if ($fieldnamekey == 'category_type') {
+                            $fieldnamekey = 'Calculated';
+            }
+            if ($fieldnamekey == 'revenuestamp_type') {
+                            $fieldnamekey = 'TypeOfRevenueStamp';
+            }
 
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
         }
@@ -700,16 +726,26 @@ 
     }
 
     // Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"]))
-        $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"]))
-        $_POST["localtax2"] = '0'; // If empty, we force to 0
-    if ($_POST["accountancy_code"] <= 0)
-        $_POST["accountancy_code"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_sell"] <= 0)
-        $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_buy"] <= 0)
-        $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) {
+            $_POST["localtax1"] = '0';
+    }
+    // If empty, we force to 0
+    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) {
+            $_POST["localtax2"] = '0';
+    }
+    // If empty, we force to 0
+    if ($_POST["accountancy_code"] <= 0) {
+            $_POST["accountancy_code"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_sell"] <= 0) {
+            $_POST["accountancy_code_sell"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_buy"] <= 0) {
+            $_POST["accountancy_code_buy"] = '';
+    }
+    // If empty, we force to null
     if ($id == 10 && isset($_POST["code"])) {  // Spaces are not allowed into code
         $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
     }
@@ -732,15 +768,17 @@ 
         // Add new entry
         $sql = "INSERT INTO " . $tabname[$id] . " (";
         // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $tabrowid[$id] . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $tabrowid[$id] . ",";
+        }
         $sql .= $tabfieldinsert[$id];
         $sql .= ",active)";
         $sql .= " VALUES(";
 
         // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $newid . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $newid . ",";
+        }
         $i = 0;
         foreach ($listfieldinsert as $f => $value) {
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -748,14 +786,18 @@ 
             } else if ($value == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= ",1)";
@@ -796,20 +838,25 @@ 
             } else if ($field == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             $sql .= $field . "=";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= " WHERE " . $rowidcol . " = '" . $rowid . "'";
-        if (in_array('entity', $listfieldmodify))
-            $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        if (in_array('entity', $listfieldmodify)) {
+                    $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        }
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -961,19 +1008,25 @@ 
 
 
 $param = '&id=' . urlencode($id);
-if ($search_country_id > 0)
+if ($search_country_id > 0) {
     $param .= '&search_country_id=' . urlencode($search_country_id);
-if ($search_code != '')
+}
+if ($search_code != '') {
     $param .= '&search_code=' . urlencode($search_country_id);
-if ($entity != '')
+}
+if ($entity != '') {
     $param .= '&entity=' . (int) $entity;
+}
 $paramwithsearch = $param;
-if ($sortorder)
+if ($sortorder) {
     $paramwithsearch .= '&sortorder=' . urlencode($sortorder);
-if ($sortfield)
+}
+if ($sortfield) {
     $paramwithsearch .= '&sortfield=' . urlencode($sortfield);
-if (GETPOST('from'))
+}
+if (GETPOST('from')) {
     $paramwithsearch .= '&from=' . urlencode(GETPOST('from', 'alpha'));
+}
 
 
 // Confirmation de la suppression de la ligne
@@ -989,19 +1042,24 @@ 
     // Complete requete recherche valeurs avec critere de tri
     $sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql))
-        $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0)
-        $sql .= " AND c.rowid = " . $search_country_id;
-    if ($search_code != '' && $id != 9)
-        $sql .= natural_search("code", $search_code);
-    if ($search_code != '' && $id == 9)
-        $sql .= natural_search("code_iso", $search_code);
+    if (!preg_match('/ WHERE /', $sql)) {
+            $sql .= " WHERE 1 = 1";
+    }
+    if ($search_country_id > 0) {
+            $sql .= " AND c.rowid = " . $search_country_id;
+    }
+    if ($search_code != '' && $id != 9) {
+            $sql .= natural_search("code", $search_code);
+    }
+    if ($search_code != '' && $id == 9) {
+            $sql .= natural_search("code_iso", $search_code);
+    }
 
     if ($sortfield) {
         // If sort order is "country", we use country_code instead
-        if ($sortfield == 'country')
-            $sortfield = 'country_code';
+        if ($sortfield == 'country') {
+                    $sortfield = 'country_code';
+        }
         $sql .= " ORDER BY " . $db->escape($sortfield);
         if ($sortorder) {
             $sql .= " " . strtoupper($db->escape($sortorder));
@@ -1064,10 +1122,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $class = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1095,10 +1154,11 @@ 
                 $valuetoshow = $langs->trans("Language");
             }
             if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement")
-                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
-                else
-                    $valuetoshow = $langs->trans("Type");
+                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement") {
+                                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+                } else {
+                                    $valuetoshow = $langs->trans("Type");
+                }
             }
             if ($fieldlist[$field] == 'code') {
                 $valuetoshow = $langs->trans("Code");
@@ -1247,24 +1307,28 @@ 
 
             if ($valuetoshow != '') {
                 print '<td' . ($class ? ' class="' . $class . '"' : '') . '>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value]))
-                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
-                else if (!empty($tabhelp[$id][$value]))
-                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else
-                    print $valuetoshow;
+                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+                                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
+                } else if (!empty($tabhelp[$id][$value])) {
+                                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+                } else {
+                                    print $valuetoshow;
+                }
                 print '</td>';
             }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $alabelisused = 1;
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $alabelisused = 1;
+            }
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td>';
         print '<input type="hidden" name="id" value="' . $id . '">';
-        if (!is_null($withentity))
-            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        if (!is_null($withentity)) {
+                    print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        }
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1277,8 +1341,9 @@ 
         // If data was already input, we define them in obj to populate input fields.
         if (GETPOST('actionadd')) {
             foreach ($fieldlist as $key => $val) {
-                if (GETPOST($val) != '')
-                    $obj->$val = GETPOST($val);
+                if (GETPOST($val) != '') {
+                                    $obj->$val = GETPOST($val);
+                }
             }
         }
 
@@ -1288,15 +1353,18 @@ 
         $error = $hookmanager->error;
         $errors = $hookmanager->errors;
 
-        if ($id == 3)
-            unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+        if ($id == 3) {
+                    unset($fieldlist[2]);
+        }
+        // Remove field ??? if dictionary Regions
 
         if (empty($reshook)) {
             fieldList($fieldlist, $obj, $tabname[$id], 'add');
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td colspan="3" align="center">';
         if ($action != 'edit') {
             print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
@@ -1305,8 +1373,9 @@ 
         print "</tr>";
 
         $colspan = count($fieldlist) + 3;
-        if ($id == 4)
-            $colspan++;
+        if ($id == 4) {
+                    $colspan++;
+        }
 
         print '</table>';
         print '</div>';
@@ -1341,8 +1410,9 @@ 
         print '<tr class="liste_titre_filter">';
         $filterfound = 0;
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             $showfield = 1; // By default
 
@@ -1367,8 +1437,9 @@ 
                 }
             }
         }
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre" colspan="2" align="right">';
         if ($filterfound) {
@@ -1381,8 +1452,9 @@ 
         // Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
@@ -1406,10 +1478,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $align = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1582,8 +1655,9 @@ 
             }
         }
         // Favorite - Only activated on country dictionary
-        if ($id == 4)
-            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        if ($id == 4) {
+                    print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        }
 
         print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
         print getTitleFieldOfList('');
@@ -1612,13 +1686,13 @@ 
                     print '<div name="' . (!empty($obj->rowid) ? $obj->rowid : $obj->code) . '"></div>';
                     print '<input type="hidden" name="page" value="' . $page . '">';
                     print '<input type="hidden" name="rowid" value="' . $rowid . '">';
-                    if (!is_null($withentity))
-                        print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    if (!is_null($withentity)) {
+                                            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    }
                     print '<input type="submit" class="button" name="actionmodify" value="' . $langs->trans("Modify") . '">';
                     print '<input type="submit" class="button" name="actioncancel" value="' . $langs->trans("Cancel") . '">';
                     print '</td>';
-                }
-                else {
+                } else {
                     $tmpaction = 'view';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -1657,15 +1731,15 @@ 
                                 $valuetoshow = yn($valuetoshow);
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'type_cdr') {
-                                if (empty($valuetoshow))
-                                    $valuetoshow = $langs->trans('None');
-                                elseif ($valuetoshow == 1)
-                                    $valuetoshow = $langs->trans('AtEndOfMonth');
-                                elseif ($valuetoshow == 2)
-                                    $valuetoshow = $langs->trans('CurrentNext');
+                                if (empty($valuetoshow)) {
+                                                                    $valuetoshow = $langs->trans('None');
+                                } elseif ($valuetoshow == 1) {
+                                                                    $valuetoshow = $langs->trans('AtEndOfMonth');
+                                } elseif ($valuetoshow == 2) {
+                                                                    $valuetoshow = $langs->trans('CurrentNext');
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+                            } else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
                                 $valuetoshow = price($valuetoshow);
                             }
                             if ($value == 'private') {
@@ -1743,20 +1817,20 @@ 
                             } else if ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                                if ($obj->localtax1 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'localtax2_type') {
-                                if ($obj->localtax2 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                            } else if ($fieldlist[$field] == 'localtax2_type') {
+                                if ($obj->localtax2 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'taux') {
+                            } else if ($fieldlist[$field] == 'taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
                                 $align = "center";
                             } else if (in_array($fieldlist[$field], array('recuperableonly'))) {
@@ -1778,21 +1852,28 @@ 
                             }
 
                             $class = 'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10)
-                                $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking')
-                                $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'code')
-                                $class .= ' width100';
-                            if ($fieldlist[$field] == 'position')
-                                $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type')
-                                $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type')
-                                $class .= ' nowrap';
+                            if ($fieldlist[$field] == 'note' && $id == 10) {
+                                                            $class .= ' tdoverflowmax200';
+                            }
+                            if ($fieldlist[$field] == 'tracking') {
+                                                            $class .= ' tdoverflowauto';
+                            }
+                            if ($fieldlist[$field] == 'code') {
+                                                            $class .= ' width100';
+                            }
+                            if ($fieldlist[$field] == 'position') {
+                                                            $class .= ' right';
+                            }
+                            if ($fieldlist[$field] == 'localtax1_type') {
+                                                            $class .= ' nowrap';
+                            }
+                            if ($fieldlist[$field] == 'localtax2_type') {
+                                                            $class .= ' nowrap';
+                            }
                             // Show value for field
-                            if ($showfield)
-                                print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            if ($showfield) {
+                                                            print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            }
                         }
                     }
 
@@ -1821,65 +1902,75 @@ 
                         $canbedisabled = 0;
                     }
                     $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP')
-                        $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm")
-                        $canbemodified = 1;
+                    if ($obj->code == 'RECEP') {
+                                            $canbemodified = 1;
+                    }
+                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm") {
+                                            $canbemodified = 1;
+                    }
 
                     // Url
                     $rowidcol = $tabrowid[$id];
                     // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27)))
-                        $rowidcol = 'rowid';
+                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27))) {
+                                            $rowidcol = 'rowid';
+                    }
                     $url = $_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
-                    if (!empty($param))
-                        $url .= '&' . $param;
-                    if (!is_null($withentity))
-                        $url .= '&entity=' . $withentity;
+                    if (!empty($param)) {
+                                            $url .= '&' . $param;
+                    }
+                    if (!is_null($withentity)) {
+                                            $url .= '&entity=' . $withentity;
+                    }
                     $url .= '&';
 
                     // Favorite
                     // Only activated on country dictionary
                     if ($id == 4) {
                         print '<td align="center" class="nowrap">';
-                        if ($iserasable)
-                            print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
-                        else
-                            print $langs->trans("AlwaysActive");
+                        if ($iserasable) {
+                                                    print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                         print '</td>';
                     }
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    if ($canbedisabled)
-                        print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
-                    else {
-                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')))
-                            print $langs->trans("AlwaysActive");
-                        else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active))
-                            print $langs->trans("Deprecated");
-                        else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH')
-                            print $langs->trans("UsedOnlyWithTypeOption");
-                        else
-                            print $langs->trans("AlwaysActive");
+                    if ($canbedisabled) {
+                                            print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
+                    } else {
+                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) {
+                                                    print $langs->trans("AlwaysActive");
+                        } else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) {
+                                                    print $langs->trans("Deprecated");
+                        } else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') {
+                                                    print $langs->trans("UsedOnlyWithTypeOption");
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                     }
                     print "</td>";
 
                     // Modify link
-                    if ($canbemodified)
-                        print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
-                    else
-                        print '<td>&nbsp;</td>';
+                    if ($canbemodified) {
+                                            print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     // Delete link
                     if ($iserasable) {
                         print '<td align="center">';
-                        if ($user->admin)
-                            print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        if ($user->admin) {
+                                                    print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        }
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    } else
-                        print '<td>&nbsp;</td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     print "</tr>\n";
                 }
@@ -1889,8 +1980,7 @@ 
 
         print '</table>';
         print '</div>';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -1913,8 +2003,9 @@ 
 
     $showemptyline = '';
     foreach ($taborder as $i) {
-        if (isset($tabname[$i]) && empty($tabcond[$i]))
-            continue;
+        if (isset($tabname[$i]) && empty($tabcond[$i])) {
+                    continue;
+        }
 
         if ($i) {
             if ($showemptyline) {
@@ -1976,8 +2067,9 @@ 
 
     $formadmin = new FormAdmin($db);
     $formcompany = new FormCompany($db);
-    if (!empty($conf->accounting->enabled))
-        $formaccounting = new FormAccounting($db);
+    if (!empty($conf->accounting->enabled)) {
+            $formaccounting = new FormAccounting($db);
+    }
 
     $withentity = '';
 
@@ -2046,10 +2138,11 @@ 
             print $type . '<input type="hidden" name="type" value="' . $type . '">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-            if ($fieldlist[$field] == 'type_cdr')
-                print '<td align="center">';
-            else
-                print '<td>';
+            if ($fieldlist[$field] == 'type_cdr') {
+                            print '<td align="center">';
+            } else {
+                            print '<td>';
+            }
             if ($fieldlist[$field] == 'type_cdr') {
                 print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
             } else {
@@ -2058,13 +2151,14 @@ 
             print '</td>';
         } elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
             $align = "left";
-            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2')))
-                $align = "center"; // Fields aligned on right
+            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) {
+                            $align = "center";
+            }
+            // Fields aligned on right
             print '<td align="' . $align . '">';
             print '<input type="text" class="flat" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" size="3" name="' . $fieldlist[$field] . '">';
             print '</td>';
-        }
-        elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+        } elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
             print '<td>';
             $transfound = 0;
             // Special case for labels
@@ -2124,25 +2218,33 @@ 
             print $form->selectExpenseRanges($obj->fk_range);
             print '</td>';
         } else {
-            if ($fieldlist[$field] == 'sortorder')
-                $fieldlist[$field] = 'position';
+            if ($fieldlist[$field] == 'sortorder') {
+                            $fieldlist[$field] = 'position';
+            }
 
             $classtd = '';
             $class = '';
-            if ($fieldlist[$field] == 'code')
-                $classtd = 'width100';
-            if ($fieldlist[$field] == 'affect')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'delay')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'position')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'tracking')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type')
-                $class = 'maxwidth50';
+            if ($fieldlist[$field] == 'code') {
+                            $classtd = 'width100';
+            }
+            if ($fieldlist[$field] == 'affect') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'delay') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'position') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'tracking') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+                            $class = 'maxwidth50';
+            }
             print '<td class="' . $classtd . '">';
             $transfound = 0;
             if (in_array($fieldlist[$field], array('label', 'libelle'))) {

dolibarr/htdocs/comm/propal/card.php

Braces +126 added lines, -90 removed lines

@@ -60,10 +60,12 @@ 
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'sendings'));
-if (!empty($conf->incoterm->enabled))
+if (!empty($conf->incoterm->enabled)) {
     $langs->load('incoterm');
-if (!empty($conf->margin->enabled))
+}
+if (!empty($conf->margin->enabled)) {
     $langs->load('margins');
+}
 
 $error = 0;
 
@@ -174,10 +176,12 @@ 
                         if ($difference != 0) {
                             $object->date_livraison = $date_delivery;
                             foreach ($object->lines as $line) {
-                                if (isset($line->date_start))
-                                    $line->date_start = $line->date_start + $difference;
-                                if (isset($line->date_end))
-                                    $line->date_end = $line->date_end + $difference;
+                                if (isset($line->date_start)) {
+                                                                    $line->date_start = $line->date_start + $difference;
+                                }
+                                if (isset($line->date_end)) {
+                                                                    $line->date_end = $line->date_end + $difference;
+                                }
                             }
                         }
                     }
@@ -273,11 +277,11 @@ 
 
         if (!$error) {
             $result = $object->set_date($user, $datep);
-            if ($result < 0)
-                dol_print_error($db, $object->error);
+            if ($result < 0) {
+                            dol_print_error($db, $object->error);
+            }
         }
-    }
-    else if ($action == 'setecheance' && $usercancreate) {
+    } else if ($action == 'setecheance' && $usercancreate) {
         $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
         if ($result < 0) {
             dol_print_error($db, $object->error);
@@ -501,8 +505,9 @@ 
                                 }
 
                                 $tva_tx = $lines[$i]->tva_tx;
-                                if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx))
-                                    $tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+                                if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+                                                                    $tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+                                }
 
                                 $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
@@ -565,10 +570,12 @@ 
                         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
                             $outputlangs = $langs;
                             $newlang = '';
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
-                                $newlang = GETPOST('lang_id', 'aZ09');
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-                                $newlang = $object->thirdparty->default_lang;
+                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+                                                            $newlang = GETPOST('lang_id', 'aZ09');
+                            }
+                            if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+                                                            $newlang = $object->thirdparty->default_lang;
+                            }
                             if (!empty($newlang)) {
                                 $outputlangs = new Translate("", $conf);
                                 $outputlangs->setDefaultLang($newlang);
@@ -577,14 +584,14 @@ 
 
                             $ret = $object->fetch($id); // Reload to get new records
                             $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                            if ($result < 0)
-                                dol_print_error($db, $result);
+                            if ($result < 0) {
+                                                            dol_print_error($db, $result);
+                            }
                         }
 
                         header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
                         exit();
-                    }
-                    else {
+                    } else {
                         $db->rollback();
                         $action = 'create';
                     }
@@ -848,8 +855,9 @@ 
                 // Update if prices fields are defined
                 $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
                 $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-                if (empty($tva_tx))
-                    $tva_npr = 0;
+                if (empty($tva_tx)) {
+                                    $tva_npr = 0;
+                }
 
                 // Price unique per product
                 $pu_ht = $prod->price;
@@ -864,10 +872,12 @@ 
                     $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
                     $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
                     if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
-                        if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level]))
-                            $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-                        if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level]))
-                            $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+                        if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+                                                    $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+                        }
+                        if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+                                                    $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+                        }
                     }
                 }
                 // If price per customer
@@ -886,11 +896,13 @@ 
                             $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
                             $price_base_type = $prodcustprice->lines[0]->price_base_type;
                             $tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx . ' (' . $prodcustprice->lines[0]->default_vat_code . ' )' : $prodcustprice->lines[0]->tva_tx);
-                            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx))
-                                $tva_tx .= ' (' . $prodcustprice->lines[0]->default_vat_code . ')';
+                            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+                                                            $tva_tx .= ' (' . $prodcustprice->lines[0]->default_vat_code . ')';
+                            }
                             $tva_npr = $prodcustprice->lines[0]->recuperableonly;
-                            if (empty($tva_tx))
-                                $tva_npr = 0;
+                            if (empty($tva_tx)) {
+                                                            $tva_npr = 0;
+                            }
                         }
                     }
                 }
@@ -902,8 +914,9 @@ 
 
                         // Search price into product_price_by_qty from $prod->id
                         foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
-                            if ($priceforthequantityarray['rowid'] != $pqp)
-                                continue;
+                            if ($priceforthequantityarray['rowid'] != $pqp) {
+                                                            continue;
+                            }
                             // We found the price
                             if ($priceforthequantityarray['price_base_type'] == 'HT') {
                                 $pu_ht = $priceforthequantityarray['unitprice'];
@@ -923,8 +936,9 @@ 
 
                         // Search price into product_price_by_qty from $prod->id
                         foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
-                            if ($priceforthequantityarray['rowid'] != $pqp)
-                                continue;
+                            if ($priceforthequantityarray['rowid'] != $pqp) {
+                                                            continue;
+                            }
                             // We found the price
                             if ($priceforthequantityarray['price_base_type'] == 'HT') {
                                 $pu_ht = $priceforthequantityarray['unitprice'];
@@ -961,10 +975,12 @@ 
                 if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
                     $outputlangs = $langs;
                     $newlang = '';
-                    if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
-                        $newlang = GETPOST('lang_id', 'aZ09');
-                    if (empty($newlang))
-                        $newlang = $object->thirdparty->default_lang;
+                    if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+                                            $newlang = GETPOST('lang_id', 'aZ09');
+                    }
+                    if (empty($newlang)) {
+                                            $newlang = $object->thirdparty->default_lang;
+                    }
                     if (!empty($newlang)) {
                         $outputlangs = new Translate("", $conf);
                         $outputlangs->setDefaultLang($newlang);
@@ -1327,8 +1343,9 @@ 
                 $error++;
             }
         }
-        if ($error)
-            $action = 'edit_extras';
+        if ($error) {
+                    $action = 'edit_extras';
+        }
     }
 
     if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
@@ -1406,8 +1423,9 @@ 
     print load_fiche_titre($langs->trans("NewProp"));
 
     $soc = new Societe($db);
-    if ($socid > 0)
-        $res = $soc->fetch($socid);
+    if ($socid > 0) {
+            $res = $soc->fetch($socid);
+    }
 
     // Load objectsrc
     if (!empty($origin) && !empty($originid)) {
@@ -1463,16 +1481,18 @@ 
             $object->array_options = $objectsrc->array_options;
 
             if (!empty($conf->multicurrency->enabled)) {
-                if (!empty($objectsrc->multicurrency_code))
-                    $currency_code = $objectsrc->multicurrency_code;
-                if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))
-                    $currency_tx = $objectsrc->multicurrency_tx;
+                if (!empty($objectsrc->multicurrency_code)) {
+                                    $currency_code = $objectsrc->multicurrency_code;
+                }
+                if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+                                    $currency_tx = $objectsrc->multicurrency_tx;
+                }
             }
         }
-    }
-    else {
-        if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code))
-            $currency_code = $soc->multicurrency_code;
+    } else {
+        if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+                    $currency_code = $soc->multicurrency_code;
+        }
     }
 
     $object = new Propal($db);
@@ -1686,14 +1706,15 @@ 
         print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
 
         $newclassname = $classname;
-        if ($newclassname == 'Propal')
-            $newclassname = 'CommercialProposal';
-        elseif ($newclassname == 'Commande')
-            $newclassname = 'Order';
-        elseif ($newclassname == 'Expedition')
-            $newclassname = 'Sending';
-        elseif ($newclassname == 'Fichinter')
-            $newclassname = 'Intervention';
+        if ($newclassname == 'Propal') {
+                    $newclassname = 'CommercialProposal';
+        } elseif ($newclassname == 'Commande') {
+                    $newclassname = 'Order';
+        } elseif ($newclassname == 'Expedition') {
+                    $newclassname = 'Sending';
+        } elseif ($newclassname == 'Fichinter') {
+                    $newclassname = 'Intervention';
+        }
 
         print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
         print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
@@ -1715,8 +1736,9 @@ 
      * Combobox pour la fonction de copie
      */
 
-    if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
-        print '<input type="hidden" name="createmode" value="empty">';
+    if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+            print '<input type="hidden" name="createmode" value="empty">';
+    }
 
     if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
         print '<br><table>';
@@ -1757,8 +1779,9 @@ 
         print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyPropal") . '</td></tr>';
     }
 
-    if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
-        print '</table>';
+    if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+            print '</table>';
+    }
 
     dol_fiche_end();
 
@@ -1871,17 +1894,19 @@ 
             $text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
         }
 
-        if (!$error)
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+        if (!$error) {
+                    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+        }
     }
 
     // Call Hook formConfirm
     $parameters = array('lineid' => $lineid);
     $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    if (empty($reshook))
-        $formconfirm .= $hookmanager->resPrint;
-    elseif ($reshook > 0)
-        $formconfirm = $hookmanager->resPrint;
+    if (empty($reshook)) {
+            $formconfirm .= $hookmanager->resPrint;
+    } elseif ($reshook > 0) {
+            $formconfirm = $hookmanager->resPrint;
+    }
 
     // Print form confirm
     print $formconfirm;
@@ -1897,9 +1922,10 @@ 
     $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
     // Thirdparty
     $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0)
-        // $morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
+    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+            // $morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
         $morehtmlref .= ' (<a href = "' . BASE_URI . '?controller=comm/propal&method=list&socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
+    }
     // Project
     if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
@@ -1975,9 +2001,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('Date');
     print '</td>';
-    if ($action != 'editdate' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+    if ($action != 'editdate' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editdate' && $usercancreate) {
@@ -2002,9 +2029,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('DateEndPropal');
     print '</td>';
-    if ($action != 'editecheance' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+    if ($action != 'editecheance' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editecheance' && $usercancreate) {
@@ -2018,8 +2046,9 @@ 
     } else {
         if (!empty($object->fin_validite)) {
             print dol_print_date($object->fin_validite, 'day');
-            if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
-                print img_warning($langs->trans("Late"));
+            if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) {
+                            print img_warning($langs->trans("Late"));
+            }
         } else {
             print '&nbsp;';
         }
@@ -2032,9 +2061,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('PaymentConditionsShort');
     print '</td>';
-    if ($action != 'editconditions' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
+    if ($action != 'editconditions' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editconditions' && $usercancreate) {
@@ -2058,12 +2088,14 @@ 
     print '<tr class="fielddeliverydelay"><td>';
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('AvailabilityPeriod');
-    if (!empty($conf->commande->enabled))
-        print ' (' . $langs->trans('AfterOrder') . ')';
+    if (!empty($conf->commande->enabled)) {
+            print ' (' . $langs->trans('AfterOrder') . ')';
+    }
     print '</td>';
-    if ($action != 'editavailability' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
+    if ($action != 'editavailability' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editavailability' && $usercancreate) {
@@ -2362,8 +2394,9 @@ 
     print '<div class="div-table-responsive-no-min">';
     print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-    if (!empty($object->lines))
-        $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+    if (!empty($object->lines)) {
+            $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+    }
 
     // Form to add new line
     if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
@@ -2399,8 +2432,9 @@ 
                     if ($usercanvalidate) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
                         print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
-                    } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('Validate') . '</a></div>';
+                    } else {
+                                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('Validate') . '</a></div>';
+                    }
                 }
                 // Create event
                 /* if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2425,8 +2459,9 @@ 
                     if ($usercansend) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
                         print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
-                    } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                    } else {
+                                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                    }
                 }
 
                 // Create an order
@@ -2496,8 +2531,9 @@ 
     }
 
     //Select mail models is same action as presend
-    if (GETPOST('modelselected'))
-        $action = 'presend';
+    if (GETPOST('modelselected')) {
+            $action = 'presend';
+    }
 
     if ($action != 'presend') {
         print '<div class="fichecenter"><div class="fichehalfleft">';

dolibarr/htdocs/comm/propal/class/propal.class.php

Braces +349 added lines, -240 removed lines

@@ -269,8 +269,9 @@ 
         // phpcs:enable
         global $conf, $mysoc;
 
-        if (!$qty)
-            $qty = 1;
+        if (!$qty) {
+                    $qty = 1;
+        }
 
         dol_syslog(get_class($this) . "::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0) {
@@ -281,8 +282,9 @@ 
 
             $tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
             $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-            if (empty($tva_tx))
-                $tva_npr = 0;
+            if (empty($tva_tx)) {
+                            $tva_npr = 0;
+            }
             $vat_src_code = '';     // May be defined into tva_tx
 
             $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
@@ -305,8 +307,9 @@ 
             $line->vat_src_code = $vat_src_code;
             $line->tva_tx = $tva_tx;
             $line->fk_unit = $prod->fk_unit;
-            if ($tva_npr)
-                $line->info_bits = 1;
+            if ($tva_npr) {
+                            $line->info_bits = 1;
+            }
 
             $this->lines[] = $line;
         }
@@ -429,16 +432,21 @@ 
             include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
 
             // Clean parameters
-            if (empty($remise_percent))
-                $remise_percent = 0;
-            if (empty($qty))
-                $qty = 0;
-            if (empty($info_bits))
-                $info_bits = 0;
-            if (empty($rang))
-                $rang = 0;
-            if (empty($fk_parent_line) || $fk_parent_line < 0)
-                $fk_parent_line = 0;
+            if (empty($remise_percent)) {
+                            $remise_percent = 0;
+            }
+            if (empty($qty)) {
+                            $qty = 0;
+            }
+            if (empty($info_bits)) {
+                            $info_bits = 0;
+            }
+            if (empty($rang)) {
+                            $rang = 0;
+            }
+            if (empty($fk_parent_line) || $fk_parent_line < 0) {
+                            $fk_parent_line = 0;
+            }
 
             $remise_percent = price2num($remise_percent);
             $qty = price2num($qty);
@@ -458,8 +466,9 @@ 
             }
 
             // Check parameters
-            if ($type < 0)
-                return -1;
+            if ($type < 0) {
+                            return -1;
+            }
 
             $this->db->begin();
 
@@ -574,8 +583,9 @@ 
             $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
 
             // Mise en option de la ligne
-            if (empty($qty) && empty($special_code))
-                $this->line->special_code = 3;
+            if (empty($qty) && empty($special_code)) {
+                            $this->line->special_code = 3;
+            }
 
             // TODO deprecated
             $this->line->price = $price;
@@ -588,8 +598,9 @@ 
             $result = $this->line->insert();
             if ($result > 0) {
                 // Reorder if child line
-                if (!empty($fk_parent_line))
-                    $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) {
+                                    $this->line_order(true, 'DESC');
+                }
 
                 // Mise a jour informations denormalisees au niveau de la propale meme
                 $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -657,12 +668,17 @@ 
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
         $pa_ht = price2num($pa_ht);
-        if (empty($qty) && empty($special_code))
-            $special_code = 3;    // Set option tag
-        if (!empty($qty) && $special_code == 3)
-            $special_code = 0;    // Remove option tag
-        if (empty($type))
-            $type = 0;
+        if (empty($qty) && empty($special_code)) {
+                    $special_code = 3;
+        }
+        // Set option tag
+        if (!empty($qty) && $special_code == 3) {
+                    $special_code = 0;
+        }
+        // Remove option tag
+        if (empty($type)) {
+                    $type = 0;
+        }
 
         if ($this->statut == self::STATUS_DRAFT) {
             $this->db->begin();
@@ -770,8 +786,9 @@ 
             $result = $this->line->update($notrigger);
             if ($result > 0) {
                 // Reorder if child line
-                if (!empty($fk_parent_line))
-                    $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) {
+                                    $this->line_order(true, 'DESC');
+                }
 
                 $this->update_price(1);
 
@@ -780,8 +797,7 @@ 
 
                 $this->db->commit();
                 return $result;
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
 
                 $this->db->rollback();
@@ -842,21 +858,26 @@ 
         $now = dol_now();
 
         // Clean parameters
-        if (empty($this->entity))
-            $this->entity = $conf->entity;
-        if (empty($this->date))
-            $this->date = $this->datep;
+        if (empty($this->entity)) {
+                    $this->entity = $conf->entity;
+        }
+        if (empty($this->date)) {
+                    $this->date = $this->datep;
+        }
         $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-        if (empty($this->availability_id))
-            $this->availability_id = 0;
-        if (empty($this->demand_reason_id))
-            $this->demand_reason_id = 0;
+        if (empty($this->availability_id)) {
+                    $this->availability_id = 0;
+        }
+        if (empty($this->demand_reason_id)) {
+                    $this->demand_reason_id = 0;
+        }
 
         // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-        if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx))
-            list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-        else
-            $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+                    list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+        } else {
+                    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        }
         if (empty($this->fk_multicurrency)) {
             $this->multicurrency_code = $conf->currency;
             $this->fk_multicurrency = 0;
@@ -970,8 +991,9 @@ 
 
                 dol_syslog(get_class($this) . "::create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
-                if (!$resql)
-                    $error++;
+                if (!$resql) {
+                                    $error++;
+                }
 
                 if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) { // To use new linkedObjectsIds instead of old linked_objects
                     $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
@@ -1003,8 +1025,9 @@ 
                 if (!$error && $this->origin && $this->origin_id) {
                     dol_syslog('Deprecated use of linked object, use ->linkedObjectsIds instead', LOG_WARNING);
                     $ret = $this->add_object_linked();
-                    if (!$ret)
-                        dol_print_error($this->db);
+                    if (!$ret) {
+                                            dol_print_error($this->db);
+                    }
                 }
 
                 /*
@@ -1027,8 +1050,9 @@ 
                         }
                         // Complete vat rate with code
                         $vatrate = $line->tva_tx;
-                        if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate))
-                            $vatrate .= ' (' . $line->vat_src_code . ')';
+                        if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+                                                    $vatrate .= ' (' . $line->vat_src_code . ')';
+                        }
 
                         $result = $this->addline(
                             $line->desc, $line->subprice, $line->qty, $vatrate, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, $line->rang, $line->special_code, $fk_parent_line, $line->fk_fournprice, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $this->element, $line->id
@@ -1143,8 +1167,9 @@ 
         $this->db->begin();
 
         // get extrafields so they will be clone
-        foreach ($this->lines as $line)
-            $line->fetch_optionals();
+        foreach ($this->lines as $line) {
+                    $line->fetch_optionals();
+        }
 
         // Load dest object
         $clonedObj = clone $this;
@@ -1190,22 +1215,25 @@ 
         $clonedObj->date = $now;
         $clonedObj->datep = $now;    // deprecated
         $clonedObj->fin_validite = $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
-        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING))
-            $clonedObj->ref_client = '';
+        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+                    $clonedObj->ref_client = '';
+        }
 
         // Create clone
         $result = $clonedObj->create($user);
-        if ($result < 0)
-            $error++;
-        else {
+        if ($result < 0) {
+                    $error++;
+        } else {
             // copy internal contacts
-            if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
-                $error++;
+            if ($clonedObj->copy_linked_contact($this, 'internal') < 0) {
+                            $error++;
+            }
 
             // copy external contacts if same company
             elseif ($this->socid == $clonedObj->socid) {
-                if ($clonedObj->copy_linked_contact($this, 'external') < 0)
-                    $error++;
+                if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+                                    $error++;
+                }
             }
         }
 
@@ -1215,8 +1243,9 @@ 
                 $parameters = array('objFrom' => $this, 'clonedObj' => $clonedObj);
                 $action = '';
                 $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
             }
         }
 
@@ -1280,8 +1309,9 @@ 
         if ($ref) {
             $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")"; // Dont't use entity if you use rowid
             $sql .= " AND p.ref='" . $this->db->escape($ref) . "'";
-        } else
-            $sql .= " WHERE p.rowid=" . $rowid;
+        } else {
+                    $sql .= " WHERE p.rowid=" . $rowid;
+        }
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1404,18 +1434,24 @@ 
         $error = 0;
 
         // Clean parameters
-        if (isset($this->ref))
-            $this->ref = trim($this->ref);
-        if (isset($this->ref_client))
-            $this->ref_client = trim($this->ref_client);
-        if (isset($this->note) || isset($this->note_private))
-            $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-        if (isset($this->note_public))
-            $this->note_public = trim($this->note_public);
-        if (isset($this->modelpdf))
-            $this->modelpdf = trim($this->modelpdf);
-        if (isset($this->import_key))
-            $this->import_key = trim($this->import_key);
+        if (isset($this->ref)) {
+                    $this->ref = trim($this->ref);
+        }
+        if (isset($this->ref_client)) {
+                    $this->ref_client = trim($this->ref_client);
+        }
+        if (isset($this->note) || isset($this->note_private)) {
+                    $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+        }
+        if (isset($this->note_public)) {
+                    $this->note_public = trim($this->note_public);
+        }
+        if (isset($this->modelpdf)) {
+                    $this->modelpdf = trim($this->modelpdf);
+        }
+        if (isset($this->import_key)) {
+                    $this->import_key = trim($this->import_key);
+        }
 
         // Check parameters
         // Put here code to add control on parameters values
@@ -1465,8 +1501,9 @@ 
         if (!$error && !$notrigger) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -1506,8 +1543,9 @@ 
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'propaldet as d';
         $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON (d.fk_product = p.rowid)';
         $sql .= ' WHERE d.fk_propal = ' . $this->id;
-        if ($only_product)
-            $sql .= ' AND p.fk_product_type = 0';
+        if ($only_product) {
+                    $sql .= ' AND p.fk_product_type = 0';
+        }
         $sql .= ' ORDER by d.rang';
 
         dol_syslog(get_class($this) . "::fetch_lines", LOG_DEBUG);
@@ -1750,8 +1788,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1805,8 +1844,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1860,8 +1900,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1916,8 +1957,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1980,8 +2022,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2040,8 +2083,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2101,8 +2145,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2161,8 +2206,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2197,8 +2243,9 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
         $sql .= " SET fk_statut = " . $this->statut . ",";
-        if (!empty($note))
-            $sql .= " note_private = '" . $this->db->escape($note) . "',";
+        if (!empty($note)) {
+                    $sql .= " note_private = '" . $this->db->escape($note) . "',";
+        }
         $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
         $sql .= " WHERE rowid = " . $this->id;
 
@@ -2362,8 +2409,9 @@ 
         if (!$notrigger && empty($error)) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -2414,8 +2462,9 @@ 
         if (!$notrigger && empty($error)) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -2456,23 +2505,28 @@ 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
         $sql .= " p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
         $sql .= " p.datep as dp, p.fin_validite as datelimite";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= ", sc.fk_soc, sc.fk_user";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= ", sc.fk_soc, sc.fk_user";
+        }
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as p, " . MAIN_DB_PREFIX . "c_propalst as c";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")";
         $sql .= " AND p.fk_soc = s.rowid";
         $sql .= " AND p.fk_statut = c.id";
         if (!$user->rights->societe->client->voir && !$socid) { //restriction
             $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
         }
-        if ($socid)
-            $sql .= " AND s.rowid = " . $socid;
-        if ($draft)
-            $sql .= " AND p.fk_statut = " . self::STATUS_DRAFT;
-        if ($notcurrentuser > 0)
-            $sql .= " AND p.fk_user_author <> " . $user->id;
+        if ($socid) {
+                    $sql .= " AND s.rowid = " . $socid;
+        }
+        if ($draft) {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_DRAFT;
+        }
+        if ($notcurrentuser > 0) {
+                    $sql .= " AND p.fk_user_author <> " . $user->id;
+        }
         $sql .= $this->db->order($sortfield, $sortorder);
         $sql .= $this->db->plimit($limit, $offset);
 
@@ -2583,8 +2637,9 @@ 
             } else {
                 return -1;
             }
-        } else
-            return $ga;
+        } else {
+                    return $ga;
+        }
     }
 
     /**
@@ -2619,13 +2674,15 @@ 
                 if ($this->db->query($sql)) {
                     // Delete linked object
                     $res = $this->deleteObjectLinked();
-                    if ($res < 0)
-                        $error++;
+                    if ($res < 0) {
+                                            $error++;
+                    }
 
                     // Delete linked contacts
                     $res = $this->delete_linked_contact();
-                    if ($res < 0)
-                        $error++;
+                    if ($res < 0) {
+                                            $error++;
+                    }
 
                     if (!$error) {
                         // We remove directory
@@ -2728,8 +2785,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2791,8 +2849,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2905,31 +2964,33 @@ 
         }
 
         $statuttrans = '';
-        if ($statut == self::STATUS_DRAFT)
-            $statuttrans = 'statut0';
-        elseif ($statut == self::STATUS_VALIDATED)
-            $statuttrans = 'statut1';
-        elseif ($statut == self::STATUS_SIGNED)
-            $statuttrans = 'statut3';
-        elseif ($statut == self::STATUS_NOTSIGNED)
-            $statuttrans = 'statut5';
-        elseif ($statut == self::STATUS_BILLED)
-            $statuttrans = 'statut6';
-
-        if ($mode == 0)
-            return $this->labelstatut[$statut];
-        elseif ($mode == 1)
-            return $this->labelstatut_short[$statut];
-        elseif ($mode == 2)
-            return img_picto($this->labelstatut_short[$statut], $statuttrans) . ' ' . $this->labelstatut_short[$statut];
-        elseif ($mode == 3)
-            return img_picto($this->labelstatut[$statut], $statuttrans);
-        elseif ($mode == 4)
-            return img_picto($this->labelstatut[$statut], $statuttrans) . ' ' . $this->labelstatut[$statut];
-        elseif ($mode == 5)
-            return '<span class="hideonsmartphone">' . $this->labelstatut_short[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
-        elseif ($mode == 6)
-            return '<span class="hideonsmartphone">' . $this->labelstatut[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        if ($statut == self::STATUS_DRAFT) {
+                    $statuttrans = 'statut0';
+        } elseif ($statut == self::STATUS_VALIDATED) {
+                    $statuttrans = 'statut1';
+        } elseif ($statut == self::STATUS_SIGNED) {
+                    $statuttrans = 'statut3';
+        } elseif ($statut == self::STATUS_NOTSIGNED) {
+                    $statuttrans = 'statut5';
+        } elseif ($statut == self::STATUS_BILLED) {
+                    $statuttrans = 'statut6';
+        }
+
+        if ($mode == 0) {
+                    return $this->labelstatut[$statut];
+        } elseif ($mode == 1) {
+                    return $this->labelstatut_short[$statut];
+        } elseif ($mode == 2) {
+                    return img_picto($this->labelstatut_short[$statut], $statuttrans) . ' ' . $this->labelstatut_short[$statut];
+        } elseif ($mode == 3) {
+                    return img_picto($this->labelstatut[$statut], $statuttrans);
+        } elseif ($mode == 4) {
+                    return img_picto($this->labelstatut[$statut], $statuttrans) . ' ' . $this->labelstatut[$statut];
+        } elseif ($mode == 5) {
+                    return '<span class="hideonsmartphone">' . $this->labelstatut_short[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        } elseif ($mode == 6) {
+                    return '<span class="hideonsmartphone">' . $this->labelstatut[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2955,12 +3016,15 @@ 
             $clause = " AND";
         }
         $sql .= $clause . " p.entity IN (" . getEntity('propal') . ")";
-        if ($mode == 'opened')
-            $sql .= " AND p.fk_statut = " . self::STATUS_VALIDATED;
-        if ($mode == 'signed')
-            $sql .= " AND p.fk_statut = " . self::STATUS_SIGNED;
-        if ($user->societe_id)
-            $sql .= " AND p.fk_soc = " . $user->societe_id;
+        if ($mode == 'opened') {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_VALIDATED;
+        }
+        if ($mode == 'signed') {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_SIGNED;
+        }
+        if ($user->societe_id) {
+                    $sql .= " AND p.fk_soc = " . $user->societe_id;
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3270,10 +3334,12 @@ 
         $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2)
-            $result .= $this->ref;
+        if ($withpicto) {
+                    $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        }
+        if ($withpicto != 2) {
+                    $result .= $this->ref;
+        }
         $result .= $linkend;
 
         return $result;
@@ -3566,46 +3632,66 @@ 
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
         // Clean parameters
-        if (empty($this->tva_tx))
-            $this->tva_tx = 0;
-        if (empty($this->localtax1_tx))
-            $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx))
-            $this->localtax2_tx = 0;
-        if (empty($this->localtax1_type))
-            $this->localtax1_type = 0;
-        if (empty($this->localtax2_type))
-            $this->localtax2_type = 0;
-        if (empty($this->total_localtax1))
-            $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2))
-            $this->total_localtax2 = 0;
-        if (empty($this->rang))
-            $this->rang = 0;
-        if (empty($this->remise))
-            $this->remise = 0;
-        if (empty($this->remise_percent) || !is_numeric($this->remise_percent))
-            $this->remise_percent = 0;
-        if (empty($this->info_bits))
-            $this->info_bits = 0;
-        if (empty($this->special_code))
-            $this->special_code = 0;
-        if (empty($this->fk_parent_line))
-            $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice))
-            $this->fk_fournprice = 0;
-        if (!is_numeric($this->qty))
-            $this->qty = 0;
-        if (empty($this->pa_ht))
-            $this->pa_ht = 0;
-        if (empty($this->multicurrency_subprice))
-            $this->multicurrency_subprice = 0;
-        if (empty($this->multicurrency_total_ht))
-            $this->multicurrency_total_ht = 0;
-        if (empty($this->multicurrency_total_tva))
-            $this->multicurrency_total_tva = 0;
-        if (empty($this->multicurrency_total_ttc))
-            $this->multicurrency_total_ttc = 0;
+        if (empty($this->tva_tx)) {
+                    $this->tva_tx = 0;
+        }
+        if (empty($this->localtax1_tx)) {
+                    $this->localtax1_tx = 0;
+        }
+        if (empty($this->localtax2_tx)) {
+                    $this->localtax2_tx = 0;
+        }
+        if (empty($this->localtax1_type)) {
+                    $this->localtax1_type = 0;
+        }
+        if (empty($this->localtax2_type)) {
+                    $this->localtax2_type = 0;
+        }
+        if (empty($this->total_localtax1)) {
+                    $this->total_localtax1 = 0;
+        }
+        if (empty($this->total_localtax2)) {
+                    $this->total_localtax2 = 0;
+        }
+        if (empty($this->rang)) {
+                    $this->rang = 0;
+        }
+        if (empty($this->remise)) {
+                    $this->remise = 0;
+        }
+        if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) {
+                    $this->remise_percent = 0;
+        }
+        if (empty($this->info_bits)) {
+                    $this->info_bits = 0;
+        }
+        if (empty($this->special_code)) {
+                    $this->special_code = 0;
+        }
+        if (empty($this->fk_parent_line)) {
+                    $this->fk_parent_line = 0;
+        }
+        if (empty($this->fk_fournprice)) {
+                    $this->fk_fournprice = 0;
+        }
+        if (!is_numeric($this->qty)) {
+                    $this->qty = 0;
+        }
+        if (empty($this->pa_ht)) {
+                    $this->pa_ht = 0;
+        }
+        if (empty($this->multicurrency_subprice)) {
+                    $this->multicurrency_subprice = 0;
+        }
+        if (empty($this->multicurrency_total_ht)) {
+                    $this->multicurrency_total_ht = 0;
+        }
+        if (empty($this->multicurrency_total_tva)) {
+                    $this->multicurrency_total_tva = 0;
+        }
+        if (empty($this->multicurrency_total_ttc)) {
+                    $this->multicurrency_total_ttc = 0;
+        }
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
@@ -3617,8 +3703,9 @@ 
         }
 
         // Check parameters
-        if ($this->product_type < 0)
-            return -1;
+        if ($this->product_type < 0) {
+                    return -1;
+        }
 
         $this->db->begin();
 
@@ -3763,42 +3850,62 @@ 
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
         // Clean parameters
-        if (empty($this->tva_tx))
-            $this->tva_tx = 0;
-        if (empty($this->localtax1_tx))
-            $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx))
-            $this->localtax2_tx = 0;
-        if (empty($this->total_localtax1))
-            $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2))
-            $this->total_localtax2 = 0;
-        if (empty($this->localtax1_type))
-            $this->localtax1_type = 0;
-        if (empty($this->localtax2_type))
-            $this->localtax2_type = 0;
-        if (empty($this->marque_tx))
-            $this->marque_tx = 0;
-        if (empty($this->marge_tx))
-            $this->marge_tx = 0;
-        if (empty($this->price))
-            $this->price = 0; // TODO A virer
-        if (empty($this->remise))
-            $this->remise = 0; // TODO A virer
-        if (empty($this->remise_percent))
-            $this->remise_percent = 0;
-        if (empty($this->info_bits))
-            $this->info_bits = 0;
-        if (empty($this->special_code))
-            $this->special_code = 0;
-        if (empty($this->fk_parent_line))
-            $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice))
-            $this->fk_fournprice = 0;
-        if (empty($this->subprice))
-            $this->subprice = 0;
-        if (empty($this->pa_ht))
-            $this->pa_ht = 0;
+        if (empty($this->tva_tx)) {
+                    $this->tva_tx = 0;
+        }
+        if (empty($this->localtax1_tx)) {
+                    $this->localtax1_tx = 0;
+        }
+        if (empty($this->localtax2_tx)) {
+                    $this->localtax2_tx = 0;
+        }
+        if (empty($this->total_localtax1)) {
+                    $this->total_localtax1 = 0;
+        }
+        if (empty($this->total_localtax2)) {
+                    $this->total_localtax2 = 0;
+        }
+        if (empty($this->localtax1_type)) {
+                    $this->localtax1_type = 0;
+        }
+        if (empty($this->localtax2_type)) {
+                    $this->localtax2_type = 0;
+        }
+        if (empty($this->marque_tx)) {
+                    $this->marque_tx = 0;
+        }
+        if (empty($this->marge_tx)) {
+                    $this->marge_tx = 0;
+        }
+        if (empty($this->price)) {
+                    $this->price = 0;
+        }
+        // TODO A virer
+        if (empty($this->remise)) {
+                    $this->remise = 0;
+        }
+        // TODO A virer
+        if (empty($this->remise_percent)) {
+                    $this->remise_percent = 0;
+        }
+        if (empty($this->info_bits)) {
+                    $this->info_bits = 0;
+        }
+        if (empty($this->special_code)) {
+                    $this->special_code = 0;
+        }
+        if (empty($this->fk_parent_line)) {
+                    $this->fk_parent_line = 0;
+        }
+        if (empty($this->fk_fournprice)) {
+                    $this->fk_fournprice = 0;
+        }
+        if (empty($this->subprice)) {
+                    $this->subprice = 0;
+        }
+        if (empty($this->pa_ht)) {
+                    $this->pa_ht = 0;
+        }
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
@@ -3837,11 +3944,13 @@ 
         }
         $sql .= ", fk_product_fournisseur_price=" . (!empty($this->fk_fournprice) ? "'" . $this->db->escape($this->fk_fournprice) . "'" : "null");
         $sql .= ", buy_price_ht=" . price2num($this->pa_ht);
-        if (strlen($this->special_code))
-            $sql .= ", special_code=" . $this->special_code;
+        if (strlen($this->special_code)) {
+                    $sql .= ", special_code=" . $this->special_code;
+        }
         $sql .= ", fk_parent_line=" . ($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-        if (!empty($this->rang))
-            $sql .= ", rang=" . $this->rang;
+        if (!empty($this->rang)) {
+                    $sql .= ", rang=" . $this->rang;
+        }
         $sql .= ", date_start=" . (!empty($this->date_start) ? "'" . $this->db->idate($this->date_start) . "'" : "null");
         $sql .= ", date_end=" . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null");
         $sql .= ", fk_unit=" . (!$this->fk_unit ? 'NULL' : $this->fk_unit);

dolibarr/htdocs/comm/propal/list.php

Braces +49 added lines, -39 removed lines

@@ -243,8 +243,9 @@ 
     $search_array_options = array();
     $search_categ_cus = 0;
 }
-if ($object_statut != '')
+if ($object_statut != '') {
     $viewstatut = $object_statut;
+}
 
 if (empty($reshook)) {
     $objectclass = 'Propal';
@@ -442,10 +443,10 @@ 
         $soc = new Societe($db);
         $soc->fetch($socid);
         $title = $langs->trans('ListOfProposals') . ' - ' . $soc->name;
-        if (empty($search_societe))
-            $search_societe = $soc->name;
-    }
-    else {
+        if (empty($search_societe)) {
+                    $search_societe = $soc->name;
+        }
+    } else {
         $title = $langs->trans('ListOfProposals');
     }
 
@@ -660,10 +661,12 @@ 
         print '<input class="flat" type="text" size="10" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '">';
         print '</td>';
     }
-    if (!empty($arrayfields['s.town']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="' . $search_town . '"></td>';
-    if (!empty($arrayfields['s.zip']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="' . $search_zip . '"></td>';
+    if (!empty($arrayfields['s.town']['checked'])) {
+            print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="' . $search_town . '"></td>';
+    }
+    if (!empty($arrayfields['s.zip']['checked'])) {
+            print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="' . $search_zip . '"></td>';
+    }
     // State
     if (!empty($arrayfields['state.nom']['checked'])) {
         print '<td class="liste_titre">';
@@ -687,8 +690,9 @@ 
     if (!empty($arrayfields['p.date']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="' . dol_escape_htmltag($search_day) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="' . dol_escape_htmltag($search_day) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="' . dol_escape_htmltag($search_month) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_year, 'search_year', 1, 20, 5);
@@ -698,8 +702,9 @@ 
     if (!empty($arrayfields['p.fin_validite']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="' . dol_escape_htmltag($search_dayfin) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="' . dol_escape_htmltag($search_dayfin) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month_end" value="' . dol_escape_htmltag($search_month_end) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yearfin, 'search_yearfin', 1, 20, 5);
@@ -709,8 +714,9 @@ 
     if (!empty($arrayfields['p.date_livraison']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="' . dol_escape_htmltag($search_daydelivery) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="' . dol_escape_htmltag($search_daydelivery) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthdelivery" value="' . dol_escape_htmltag($search_monthdelivery) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yeardelivery, 'search_yeardelivery', 1, 20, 5);
@@ -877,8 +883,9 @@ 
             print '</td>';
             // Warning
             $warnornote = '';
-            if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
-                $warnornote .= img_warning($langs->trans("Late"));
+            if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+                            $warnornote .= img_warning($langs->trans("Late"));
+            }
             if (!empty($obj->note_private)) {
                 $warnornote .= ($warnornote ? ' ' : '');
                 $warnornote .= '<span class="note">';
@@ -900,8 +907,9 @@ 
             print '</td></tr></table>';
 
             print "</td>\n";
-            if (!$i)
-                $totalarray['nbfield'] ++;
+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }
 
         if (!empty($arrayfields['p.ref_client']['checked'])) {
@@ -1009,8 +1017,9 @@ 
             } else {
                 print '<td>&nbsp;</td>';
             }
-            if (!$i)
-                $totalarray['nbfield'] ++;
+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }
         // Date delivery
         if (!empty($arrayfields['p.date_livraison']['checked'])) {
@@ -1185,18 +1194,18 @@ 
         while ($i < $totalarray['nbfield']) {
             $i++;
             if ($i == 1) {
-                if ($num < $limit && empty($offset))
-                    print '<td align="left">' . $langs->trans("Total") . '</td>';
-                else
-                    print '<td align="left">' . $langs->trans("Totalforthispage") . '</td>';
-            }
-            elseif ($totalarray['totalhtfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalht']) . '</td>';
-            elseif ($totalarray['totalvatfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalvat']) . '</td>';
-            elseif ($totalarray['totalttcfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalttc']) . '</td>';
-            elseif ($totalarray['totalizable']) {
+                if ($num < $limit && empty($offset)) {
+                                    print '<td align="left">' . $langs->trans("Total") . '</td>';
+                } else {
+                                    print '<td align="left">' . $langs->trans("Totalforthispage") . '</td>';
+                }
+            } elseif ($totalarray['totalhtfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalht']) . '</td>';
+            } elseif ($totalarray['totalvatfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalvat']) . '</td>';
+            } elseif ($totalarray['totalttcfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalttc']) . '</td>';
+            } elseif ($totalarray['totalizable']) {
                 $printed = false;
                 foreach ($totalarray['totalizable'] as $totalizable) {
                     if ($totalizable['pos'] == $i && !$printed) {
@@ -1207,8 +1216,9 @@ 
                 if (!$printed) {
                     print '<td></td>';
                 }
-            } else
-                print '<td></td>';
+            } else {
+                            print '<td></td>';
+            }
         }
         print '</tr>';
     }
@@ -1225,8 +1235,9 @@ 
     print '</form>' . "\n";
 
     $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-        $hidegeneratedfilelistifempty = 0;
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+            $hidegeneratedfilelistifempty = 0;
+    }
 
     // Show list of available documents
     $urlsource = $_SERVER['PHP_SELF'] . '?sortfield=' . $sortfield . '&sortorder=' . $sortorder;
@@ -1237,8 +1248,7 @@ 
     $delallowed = $user->rights->propal->creer;
 
     print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
     dol_print_error($db);
 }
 

dolibarr/htdocs/core/lib/propal.lib.php

Braces +21 added lines, -14 removed lines

@@ -50,10 +50,12 @@ 
         $text = '';
         // $head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=expedition&method=propal&id=' . $object->id;
-        if ($conf->expedition_bon->enabled)
-            $text = $langs->trans("Shipment");
-        if ($conf->livraison_bon->enabled)
-            $text .= '/' . $langs->trans("Receivings");
+        if ($conf->expedition_bon->enabled) {
+                    $text = $langs->trans("Shipment");
+        }
+        if ($conf->livraison_bon->enabled) {
+                    $text .= '/' . $langs->trans("Receivings");
+        }
         $head[$h][1] = $text;
         $head[$h][2] = 'shipping';
         $h++;
@@ -64,8 +66,9 @@ 
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=comm/propal&method=contact&id=' . $object->id;
         $head[$h][1] = $langs->trans('ContactsAddresses');
-        if ($nbContact > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbContact . '</span>';
+        if ($nbContact > 0) {
+                    $head[$h][1] .= ' <span class="badge">' . $nbContact . '</span>';
+        }
         $head[$h][2] = 'contact';
         $h++;
     }
@@ -78,15 +81,18 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
         $nbNote = 0;
-        if (!empty($object->note_private))
-            $nbNote++;
-        if (!empty($object->note_public))
-            $nbNote++;
+        if (!empty($object->note_private)) {
+                    $nbNote++;
+        }
+        if (!empty($object->note_public)) {
+                    $nbNote++;
+        }
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=comm/propal&method=note&id=' . $object->id;
         $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
+        if ($nbNote > 0) {
+                    $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
+        }
         $head[$h][2] = 'note';
         $h++;
     }
@@ -99,8 +105,9 @@ 
     // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
     $head[$h][0] = BASE_URI . '?controller=comm/propal&method=document&id=' . $object->id;
     $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0)
-        $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
+    if (($nbFiles + $nbLinks) > 0) {
+            $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
+    }
     $head[$h][2] = 'document';
     $h++;
 

dolibarr/htdocs/core/lib/doleditor.lib.php

Braces +9 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
         // $selected_theme = 'moono-lisa';
 
         $selected_theme = CKEDITOR_SKIN;
-    } else
-        $selected_theme = $conf->global->FCKEDITOR_SKIN;
+    } else {
+            $selected_theme = $conf->global->FCKEDITOR_SKIN;
+    }
 
     $colspan = 2;
 
@@ -99,10 +100,12 @@ 
                 while (($subdir = readdir($handle)) !== false) {
                     if (is_dir($dirskin . "/" . $subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
                         // Disable not stable themes (dir ends with _exp or _dev)
-                        if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir))
-                            continue;
-                        if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir))
-                            continue;
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+                                                    continue;
+                        }
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+                                                    continue;
+                        }
 
                         print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
                         if ($subdir == $selected_theme) {

dolibarr/htdocs/core/class/doleditor.class.php

Indentation +107 added lines, -107 removed lines

@@ -30,19 +30,19 @@ 
 {
     var $tool;      // Store the selected tool
 
-	// If using fckeditor
-	var $editor;
+    // If using fckeditor
+    var $editor;
 
-	// If not using fckeditor
-	var $content;
-	var $htmlname;
-	var $toolbarname;
-	var $toolbarstartexpanded;
-	var $rows;
-	var $cols;
-	var $height;
-	var $width;
-	var $readonly;
+    // If not using fckeditor
+    var $content;
+    var $htmlname;
+    var $toolbarname;
+    var $toolbarstartexpanded;
+    var $rows;
+    var $cols;
+    var $height;
+    var $width;
+    var $readonly;
 
 
     /**
@@ -57,22 +57,22 @@ 
      *                       		             			'In' each window has its own toolbar
      *                              		      			'Out:name' share toolbar into the div called 'name'
      *      @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
-	 *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
-	 *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
-	 *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
+     *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
+     *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
+     *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
      *      @param  int		$rows                   		Size of rows for textarea tool
-	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
-	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
-	 */
+     *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
+     *      @param	int		$readonly						0=Read/Edit, 1=Read only
+     */
     function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+        dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+        if (! $rows) $rows=round($height/20);
+        if (! $cols) $cols=($width?round($width/6):80);
+        $shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
         $defaulteditor='ckeditor';
@@ -82,7 +82,7 @@ 
 
         // Check if extended editor is ok. If not we force textarea
         if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+        if ($okforextendededitor === 'ace') $this->tool='ace';
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
@@ -91,50 +91,50 @@ 
             $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
-    	{
-        	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
-
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
-
-        	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
-        	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
-        	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
-        	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
-        	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
-        	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
-
-    		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
-    		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
-    		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
-    		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
-
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
-
-        	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
-        	{
-        		$this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
-        		$this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
-    		}
-    	}
-
-    	// Define some properties
+        {
+            require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
+
+            $content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+
+            $this->editor = new FCKeditor($htmlname);
+            $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
+            $this->editor->Value	= $content;
+            $this->editor->Height   = $height;
+            if (! empty($width)) $this->editor->Width = $width;
+            $this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
+            $this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
+            $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
+            $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
+
+            // Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
+            // Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
+            // Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
+            $modulepart='fckeditor';
+            $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
+            $this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+
+            $this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
+            $this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+
+            if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
+            {
+                $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
+                $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
+            }
+        }
+
+        // Define some properties
         if (in_array($this->tool,array('textarea','ckeditor','ace')))
         {
-    	    $this->content				= $content;
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
+            $this->content				= $content;
+            $this->htmlname 			= $htmlname;
+            $this->toolbarname			= $shorttoolbarname;
+            $this->toolbarstartexpanded = $toolbarstartexpanded;
             $this->rows					= max(ROWS_3,$rows);
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
-    	}
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -152,20 +152,20 @@ 
     function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
     {
         // phpcs:enable
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	$fullpage=false;
-    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-    	{
-    	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
-    	}
+        $fullpage=false;
+        if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
+        {
+            $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
+        }
 
-    	$found=0;
-		$out='';
+        $found=0;
+        $out='';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+            $found=1;
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,12 +179,12 @@ 
 
             if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+                if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
 
-            	if (! empty($conf->global->FCKEDITOR_SKIN)) {
-					$skin = $conf->global->FCKEDITOR_SKIN;
-				} else {
-					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
+                if (! empty($conf->global->FCKEDITOR_SKIN)) {
+                    $skin = $conf->global->FCKEDITOR_SKIN;
+                } else {
+                    // $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 
                     /**
                      * Alixar:
@@ -195,10 +195,10 @@ 
                     $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
                 }
 
-            	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+                $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
 
-            	$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out.= '<script type="text/javascript">
+                $out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+                $out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -233,8 +233,8 @@ 
                                                         });
                                                 }
                                             }';
-            	if ($this->uselocalbrowser)
-            	{
+                if ($this->uselocalbrowser)
+                {
                     $out.= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
                     $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
@@ -243,7 +243,7 @@ 
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
                     $out.= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
-					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
+                    /* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
                                filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
@@ -254,10 +254,10 @@ 
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+                }
+                $out.= '	})'.$morejs;
+                $out.= '});'."\n";
+                $out.= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+            $found=1;
+            $format=$option;
 
             $out.= "\n".'<!-- Output Ace editor -->'."\n";
 
-			if ($titlecontent)
-			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            if ($titlecontent)
+            {
+                $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+                $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+                $out.= '</div>';
+                $out.= '<script type="text/javascript" language="javascript">'."\n";
+                $out.= 'jQuery(document).ready(function() {'."\n";
+                $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
-			}
+                $out.= '</script>'."\n";
+            }
 
             $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
             $out.= ($this->height?' height: '.$this->height.'px; ':'');
             //$out.=" min-height: 100px;";
             $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</pre>';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            $out.= '<script type="text/javascript" language="javascript">'."\n";
+            $out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+            $out.= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,7 +343,7 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+            $out.= '</script>'."\n";
         }
 
         if (empty($found))

dolibarr/htdocs/core/modules/modFckeditor.class.php

Indentation +36 added lines, -36 removed lines

@@ -34,55 +34,55 @@
 
 class modFckeditor extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 2000;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 2000;
 
-		$this->family = "technic";
-		$this->module_position = '20';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Editeur WYSIWYG";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of png file (without png) used for this module.
-		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='list';
+        $this->family = "technic";
+        $this->module_position = '20';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Editeur WYSIWYG";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of png file (without png) used for this module.
+        // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
+        $this->picto='list';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array("/medias/temp","/medias/image");
+        // Data directories to create when module is enabled
+        $this->dirs = array("/medias/temp","/medias/image");
 
-		// Config pages
-		$this->config_page_url = array("fckeditor.php");
+        // Config pages
+        $this->config_page_url = array("fckeditor.php");
 
-		// Dependencies
-		$this->disabled = (in_array(constant('JS_CKEDITOR'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
-		$this->depends = array();
-		$this->requiredby = array('modWebsites');
+        // Dependencies
+        $this->disabled = (in_array(constant('JS_CKEDITOR'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->depends = array();
+        $this->requiredby = array('modWebsites');
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
         $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
         $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
         $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
         $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
         $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
         $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
-		//$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
+        //$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
         $this->const[6] = array("FCKEDITOR_SKIN", "string", CKEDITOR_SKIN, "Skin by default for fckeditor");
 
         // Boxes
-		$this->boxes = array();
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'fckeditor';
-	}
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'fckeditor';
+    }
 }