@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search |
45 | 45 | $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
46 | 46 | $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
47 | -$mode = GETPOST('mode', 'aZ'); // mode view (kanban or common) |
|
47 | +$mode = GETPOST('mode', 'aZ'); // mode view (kanban or common) |
|
48 | 48 | |
49 | 49 | |
50 | 50 | // Load variable for pagination |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | // Default sort order (if not yet defined by previous GETPOST) |
77 | 77 | if (!$sortfield) { |
78 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
78 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
79 | 79 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
80 | 80 | } |
81 | 81 | if (!$sortorder) { |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | } |
541 | 541 | |
542 | 542 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
543 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
543 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
544 | 544 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
545 | 545 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
546 | 546 | |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
636 | 636 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
637 | 637 | } |
638 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
638 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
639 | 639 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
640 | 640 | print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n"; |
641 | 641 | $totalarray['nbfield']++; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | 'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55), |
187 | 187 | 'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'), |
188 | 188 | 'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'), |
189 | - 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("shipping")), |
|
189 | + 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66, 'enabled' => isModEnabled("shipping")), |
|
190 | 190 | 'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67), |
191 | 191 | 'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68), |
192 | 192 | 'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69), |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | 'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130), |
210 | 210 | 'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1), |
211 | 211 | 'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140), |
212 | - 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("shipping")), 'position' => 990), |
|
212 | + 'shippable' => array('label' => "Shippable", 'checked' => 1, 'enabled' => (isModEnabled("shipping")), 'position' => 990), |
|
213 | 213 | 'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995), |
214 | 214 | 'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999), |
215 | 215 | 'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000) |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | $object->fields = dol_sort_array($object->fields, 'position'); |
230 | 230 | //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right'); |
231 | 231 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
232 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
232 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
233 | 233 | |
234 | 234 | |
235 | 235 | // Security check |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | $db->rollback(); |
693 | 693 | |
694 | 694 | $action = 'create'; |
695 | - $_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ? |
|
695 | + $_GET["origin"] = $_POST["origin"]; // Keep GET and POST here ? |
|
696 | 696 | $_GET["originid"] = $_POST["originid"]; // Keep GET and POST here ? |
697 | 697 | if (!empty($errors)) { |
698 | 698 | setEventMessages(null, $errors, 'errors'); |
@@ -1053,7 +1053,7 @@ discard block |
||
1053 | 1053 | if ($searchCategoryCustomerOperator == 0) { |
1054 | 1054 | $searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")"; |
1055 | 1055 | } else { |
1056 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer); |
|
1056 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer); |
|
1057 | 1057 | } |
1058 | 1058 | } |
1059 | 1059 | } |
@@ -1083,7 +1083,7 @@ discard block |
||
1083 | 1083 | if ($searchCategoryProductOperator == 0) { |
1084 | 1084 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
1085 | 1085 | } else { |
1086 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
1086 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
1087 | 1087 | } |
1088 | 1088 | } |
1089 | 1089 | } |
@@ -1534,7 +1534,7 @@ discard block |
||
1534 | 1534 | } |
1535 | 1535 | |
1536 | 1536 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1537 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1537 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1538 | 1538 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1539 | 1539 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1540 | 1540 | |
@@ -2648,13 +2648,13 @@ discard block |
||
2648 | 2648 | print '<td class="center">'; |
2649 | 2649 | if (!empty($show_shippable_command) && isModEnabled('stock')) { |
2650 | 2650 | if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) { |
2651 | - $generic_commande->getLinesArray(); // Load array ->lines |
|
2652 | - $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
2651 | + $generic_commande->getLinesArray(); // Load array ->lines |
|
2652 | + $generic_commande->loadExpeditions(); // Load array ->expeditions |
|
2653 | 2653 | |
2654 | 2654 | $numlines = count($generic_commande->lines); // Loop on each line of order |
2655 | 2655 | for ($lig = 0; $lig < $numlines; $lig++) { |
2656 | 2656 | if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) { |
2657 | - $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
2657 | + $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id]; |
|
2658 | 2658 | } else { |
2659 | 2659 | $reliquat = $generic_commande->lines[$lig]->qty; |
2660 | 2660 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $search_date_endday = GETPOSTINT('search_date_endday'); |
77 | 77 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
78 | 78 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
79 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
79 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
80 | 80 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
81 | 81 | $optioncss = GETPOST('optioncss', 'alpha'); |
82 | 82 | $socid = GETPOSTINT('socid'); |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
106 | 106 | $object = new Fichinter($db); |
107 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
107 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
108 | 108 | |
109 | 109 | $extrafields = new ExtraFields($db); |
110 | 110 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | |
152 | 152 | $object->fields = dol_sort_array($object->fields, 'position'); |
153 | 153 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
154 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
154 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
155 | 155 | |
156 | 156 | // Security check |
157 | 157 | $id = GETPOSTINT('id'); |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | // Output page |
413 | 413 | // -------------------------------------------------------------------- |
414 | 414 | |
415 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
415 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
416 | 416 | |
417 | 417 | |
418 | 418 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | } |
566 | 566 | |
567 | 567 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
568 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
568 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
569 | 569 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
570 | 570 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
571 | 571 | |
@@ -785,7 +785,7 @@ discard block |
||
785 | 785 | $objectstatic->id = $obj->rowid; |
786 | 786 | $objectstatic->ref = $obj->ref; |
787 | 787 | $objectstatic->ref_client = $obj->ref_client; |
788 | - $objectstatic->statut = $obj->status; // deprecated |
|
788 | + $objectstatic->statut = $obj->status; // deprecated |
|
789 | 789 | $objectstatic->status = $obj->status; |
790 | 790 | |
791 | 791 | $companystatic->name = $obj->name; |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | $this->duration = $obj->duree; |
319 | 319 | $this->socid = $obj->fk_soc; |
320 | 320 | $this->status = $obj->status; |
321 | - $this->statut = $obj->status; // deprecated |
|
321 | + $this->statut = $obj->status; // deprecated |
|
322 | 322 | $this->fk_project = $obj->fk_projet; |
323 | 323 | $this->fk_contrat = $obj->fk_contrat; |
324 | 324 | $this->note_private = $obj->note_private; |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | $result .= $link.$this->ref.$linkend; |
665 | 665 | } |
666 | 666 | global $action; |
667 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
667 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
668 | 668 | $parameters = array('id' => $this->id, 'getnomurl' => &$result); |
669 | 669 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
670 | 670 | if ($reshook > 0) { |
@@ -414,7 +414,7 @@ |
||
414 | 414 | } |
415 | 415 | |
416 | 416 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
417 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
417 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
418 | 418 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
419 | 419 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
420 | 420 |
@@ -43,47 +43,47 @@ discard block |
||
43 | 43 | |
44 | 44 | |
45 | 45 | // Get parameters |
46 | -$action = GETPOST('action', 'aZ09'); |
|
46 | +$action = GETPOST('action', 'aZ09'); |
|
47 | 47 | $massaction = GETPOST('massaction', 'alpha'); |
48 | 48 | $show_files = GETPOSTINT('show_files'); |
49 | -$confirm = GETPOST('confirm', 'alpha'); |
|
49 | +$confirm = GETPOST('confirm', 'alpha'); |
|
50 | 50 | $cancel = GETPOST('cancel', 'alpha'); |
51 | -$toselect = GETPOST('toselect', 'array'); |
|
51 | +$toselect = GETPOST('toselect', 'array'); |
|
52 | 52 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search |
53 | 53 | $backtopage = GETPOST('backtopage', 'alpha'); |
54 | 54 | $optioncss = GETPOST('optioncss', 'aZ'); |
55 | -$mode = GETPOST('mode', 'alpha'); |
|
55 | +$mode = GETPOST('mode', 'alpha'); |
|
56 | 56 | |
57 | 57 | // Search fields |
58 | -$search = GETPOST("search", 'alpha'); |
|
59 | -$search_ref = GETPOST("search_ref", 'alpha'); |
|
58 | +$search = GETPOST("search", 'alpha'); |
|
59 | +$search_ref = GETPOST("search_ref", 'alpha'); |
|
60 | 60 | $search_lastname = GETPOST("search_lastname", 'alpha'); |
61 | -$search_firstname = GETPOST("search_firstname", 'alpha'); |
|
61 | +$search_firstname = GETPOST("search_firstname", 'alpha'); |
|
62 | 62 | $search_gender = GETPOST("search_gender", 'alpha'); |
63 | 63 | $search_civility = GETPOST("search_civility", 'alpha'); |
64 | 64 | $search_company = GETPOST('search_company', 'alphanohtml'); |
65 | -$search_login = GETPOST("search_login", 'alpha'); |
|
65 | +$search_login = GETPOST("search_login", 'alpha'); |
|
66 | 66 | $search_address = GETPOST("search_address", 'alpha'); |
67 | -$search_zip = GETPOST("search_zip", 'alpha'); |
|
68 | -$search_town = GETPOST("search_town", 'alpha'); |
|
69 | -$search_state = GETPOST("search_state", 'alpha'); // county / departement / federal state |
|
70 | -$search_country = GETPOST("search_country", 'alpha'); |
|
67 | +$search_zip = GETPOST("search_zip", 'alpha'); |
|
68 | +$search_town = GETPOST("search_town", 'alpha'); |
|
69 | +$search_state = GETPOST("search_state", 'alpha'); // county / departement / federal state |
|
70 | +$search_country = GETPOST("search_country", 'alpha'); |
|
71 | 71 | $search_phone = GETPOST("search_phone", 'alpha'); |
72 | 72 | $search_phone_perso = GETPOST("search_phone_perso", 'alpha'); |
73 | 73 | $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha'); |
74 | -$search_type = GETPOST("search_type", 'alpha'); |
|
74 | +$search_type = GETPOST("search_type", 'alpha'); |
|
75 | 75 | $search_email = GETPOST("search_email", 'alpha'); |
76 | 76 | $search_categ = GETPOST("search_categ", 'intcomma'); |
77 | -$search_morphy = GETPOST("search_morphy", 'alpha'); |
|
78 | -$search_import_key = trim(GETPOST("search_import_key", 'alpha')); |
|
77 | +$search_morphy = GETPOST("search_morphy", 'alpha'); |
|
78 | +$search_import_key = trim(GETPOST("search_import_key", 'alpha')); |
|
79 | 79 | |
80 | -$socid = GETPOSTINT('socid'); |
|
80 | +$socid = GETPOSTINT('socid'); |
|
81 | 81 | if (GETPOSTINT('catid') && empty($search_categ)) { |
82 | 82 | $search_categ = GETPOSTINT('catid'); |
83 | 83 | } |
84 | 84 | |
85 | 85 | $search_filter = GETPOST("search_filter", 'alpha'); |
86 | -$search_status = GETPOST("search_status", 'intcomma'); // status |
|
86 | +$search_status = GETPOST("search_status", 'intcomma'); // status |
|
87 | 87 | $search_datec_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datec_start_month'), GETPOSTINT('search_datec_start_day'), GETPOSTINT('search_datec_start_year')); |
88 | 88 | $search_datec_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datec_end_month'), GETPOSTINT('search_datec_end_day'), GETPOSTINT('search_datec_end_year')); |
89 | 89 | $search_datem_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datem_start_month'), GETPOSTINT('search_datem_start_day'), GETPOSTINT('search_datem_start_year')); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | } |
208 | 208 | } |
209 | 209 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
210 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
210 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
211 | 211 | //var_dump($arrayfields);exit; |
212 | 212 | |
213 | 213 | // Security check |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | $sqlfields = $sql; // $sql fields to remove for count total |
435 | 435 | |
436 | 436 | // SQL Alias adherent |
437 | -$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d |
|
437 | +$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d |
|
438 | 438 | if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { |
439 | 439 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)"; |
440 | 440 | } |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | if ($searchCategoryContactOperator == 0) { |
460 | 460 | $searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = ".((int) $searchCategoryContact).")"; |
461 | 461 | } else { |
462 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact); |
|
462 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact); |
|
463 | 463 | } |
464 | 464 | } |
465 | 465 | } |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | // Output page |
624 | 624 | // -------------------------------------------------------------------- |
625 | 625 | |
626 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
626 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
627 | 627 | |
628 | 628 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
629 | 629 | |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | } |
820 | 820 | |
821 | 821 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
822 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
822 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
823 | 823 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
824 | 824 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
825 | 825 |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | |
28 | 28 | $sapi_type = php_sapi_name(); |
29 | 29 | $script_file = basename(__FILE__); |
30 | -$path = dirname(__FILE__) . '/'; |
|
30 | +$path = dirname(__FILE__).'/'; |
|
31 | 31 | |
32 | 32 | // Test si mode batch |
33 | 33 | $sapi_type = php_sapi_name(); |
34 | 34 | if (substr($sapi_type, 0, 3) == 'cgi') { |
35 | - echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n"; |
|
35 | + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
36 | 36 | exit(); |
37 | 37 | } |
38 | 38 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | |
103 | 103 | // PHAN setup. Configuration is required, otherwise phan is disabled. |
104 | 104 | $PHAN_CONFIG = "{$path}phan/config_extended.php"; |
105 | -$PHAN_BASELINE = "{$path}phan/baseline_extended.txt"; // BASELINE is ignored if it does not exist |
|
105 | +$PHAN_BASELINE = "{$path}phan/baseline_extended.txt"; // BASELINE is ignored if it does not exist |
|
106 | 106 | $PHAN_MIN_PHP = "7.0"; |
107 | 107 | $PHAN_MEMORY_OPT = "--memory-limit 5G"; |
108 | 108 | |
@@ -992,19 +992,19 @@ discard block |
||
992 | 992 | fwrite($fh, '<?xml version="1.0" encoding="UTF-8" ?>'."\n"); |
993 | 993 | fwrite($fh, '<rss version="2.0">'."\n"); |
994 | 994 | fwrite($fh, '<channel>'."\n"); |
995 | - fwrite($fh, '<title>' . htmlspecialchars($title_security) . '</title>'."\n"); |
|
996 | - fwrite($fh, '<description>' . htmlspecialchars("Feed of the latest security reports on the project") . '</description>'."\n"); |
|
995 | + fwrite($fh, '<title>'.htmlspecialchars($title_security).'</title>'."\n"); |
|
996 | + fwrite($fh, '<description>'.htmlspecialchars("Feed of the latest security reports on the project").'</description>'."\n"); |
|
997 | 997 | if ($url_site) { |
998 | - fwrite($fh, '<link>' . htmlspecialchars($url_site) . '</link>'."\n"); |
|
998 | + fwrite($fh, '<link>'.htmlspecialchars($url_site).'</link>'."\n"); |
|
999 | 999 | } |
1000 | 1000 | if ($url_flux) { |
1001 | - fwrite($fh, '<atom:link href="' . htmlspecialchars($url_flux) . '" rel="self" type="application/rss+xml" />'."\n"); |
|
1001 | + fwrite($fh, '<atom:link href="'.htmlspecialchars($url_flux).'" rel="self" type="application/rss+xml" />'."\n"); |
|
1002 | 1002 | } |
1003 | 1003 | // Image |
1004 | 1004 | fwrite($fh, '<image>'."\n"); |
1005 | 1005 | fwrite($fh, '<url>https://www.dolibarr.org/medias/image/www.dolibarr.org/badge-openssf.png</url>'."\n"); |
1006 | 1006 | if ($url_site) { |
1007 | - fwrite($fh, '<link>' . htmlspecialchars($url_site) . '</link>'."\n"); |
|
1007 | + fwrite($fh, '<link>'.htmlspecialchars($url_site).'</link>'."\n"); |
|
1008 | 1008 | } |
1009 | 1009 | fwrite($fh, '</image>'."\n"); |
1010 | 1010 | |
@@ -1012,10 +1012,10 @@ discard block |
||
1012 | 1012 | $alert['url_commit'] = 'https://github.com/Dolibarr/dolibarr/commit/'.$alert['commitid']; |
1013 | 1013 | |
1014 | 1014 | fwrite($fh, '<item>'."\n"); |
1015 | - fwrite($fh, '<title>' . htmlspecialchars($alert['title']) . '</title>'."\n"); |
|
1016 | - fwrite($fh, '<description>' . $alert['description'] . '</description>'."\n"); // no htmlspeciachars here |
|
1017 | - fwrite($fh, '<link>' . htmlspecialchars($alert['url_commit']) . '</link>'."\n"); |
|
1018 | - fwrite($fh, '<pubDate>' . htmlspecialchars($alert['created_at']) . '</pubDate>'."\n"); |
|
1015 | + fwrite($fh, '<title>'.htmlspecialchars($alert['title']).'</title>'."\n"); |
|
1016 | + fwrite($fh, '<description>'.$alert['description'].'</description>'."\n"); // no htmlspeciachars here |
|
1017 | + fwrite($fh, '<link>'.htmlspecialchars($alert['url_commit']).'</link>'."\n"); |
|
1018 | + fwrite($fh, '<pubDate>'.htmlspecialchars($alert['created_at']).'</pubDate>'."\n"); |
|
1019 | 1019 | fwrite($fh, '</item>'."\n"); |
1020 | 1020 | } |
1021 | 1021 |