@@ -145,38 +145,38 @@ discard block |
||
145 | 145 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
146 | 146 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
147 | 147 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
148 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
148 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
149 | 149 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
150 | 150 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
151 | 151 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
152 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
152 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
153 | 153 | |
154 | 154 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
155 | 155 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
156 | 156 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
157 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
157 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
158 | 158 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
159 | 159 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
160 | 160 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
161 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
161 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
162 | 162 | |
163 | 163 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
164 | 164 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
165 | 165 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
166 | -$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
166 | +$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
167 | 167 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
168 | 168 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
169 | 169 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
170 | -$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
170 | +$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
171 | 171 | |
172 | 172 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
173 | 173 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
174 | 174 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
175 | -$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
175 | +$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
176 | 176 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
177 | 177 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
178 | 178 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
179 | -$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
179 | +$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
180 | 180 | |
181 | 181 | $search_category_array = array(); |
182 | 182 | |
@@ -263,12 +263,12 @@ discard block |
||
263 | 263 | |
264 | 264 | $object->fields = dol_sort_array($object->fields, 'position'); |
265 | 265 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
266 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
266 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
267 | 267 | |
268 | 268 | // Add a groupby field |
269 | 269 | if ($mode == 'kanban') { |
270 | 270 | $groupbyold = null; |
271 | - $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut' |
|
271 | + $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut' |
|
272 | 272 | $groupbyfield = preg_replace('/[a-z]\./', '', $groupby); |
273 | 273 | if (!empty($object->fields[$groupbyfield]['alias'])) { |
274 | 274 | $groupbyfield = $object->fields[$groupbyfield]['alias']; |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | if ($searchCategoryProjectOperator == 0) { |
699 | 699 | $searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")"; |
700 | 700 | } else { |
701 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject); |
|
701 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject); |
|
702 | 702 | } |
703 | 703 | } |
704 | 704 | } |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | $param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday)); |
896 | 896 | } |
897 | 897 | if ($search_date_end_end) { |
898 | - $param .= '&search_date_end_end=' . urlencode($search_date_end_end); |
|
898 | + $param .= '&search_date_end_end='.urlencode($search_date_end_end); |
|
899 | 899 | } |
900 | 900 | if ($search_date_creation_startmonth) { |
901 | 901 | $param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth)); |
@@ -943,7 +943,7 @@ discard block |
||
943 | 943 | $param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday)); |
944 | 944 | } |
945 | 945 | if ($search_date_modif_end) { |
946 | - $param .= '&search_date_modif_end=' . urlencode($search_date_modif_end); |
|
946 | + $param .= '&search_date_modif_end='.urlencode($search_date_modif_end); |
|
947 | 947 | } |
948 | 948 | if ($socid) { |
949 | 949 | $param .= '&socid='.urlencode((string) ($socid)); |
@@ -1170,7 +1170,7 @@ discard block |
||
1170 | 1170 | } |
1171 | 1171 | |
1172 | 1172 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1173 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1173 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1174 | 1174 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1175 | 1175 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1176 | 1176 | |
@@ -1636,7 +1636,7 @@ discard block |
||
1636 | 1636 | // Start kanban column |
1637 | 1637 | if ($groupbyold !== $obj->$groupbyfield) { |
1638 | 1638 | if (!is_null($groupbyold)) { |
1639 | - print '</div>'; // end box-flex-container |
|
1639 | + print '</div>'; // end box-flex-container |
|
1640 | 1640 | } |
1641 | 1641 | print '<div class="box-flex-container-column kanban column" data-html="column_'.preg_replace('/[^a-z0-9]/', '', $obj->$groupbyfield).'">'; |
1642 | 1642 | } |
@@ -1661,10 +1661,10 @@ discard block |
||
1661 | 1661 | if ($i == ($imaxinloop - 1)) { |
1662 | 1662 | // Close kanban column |
1663 | 1663 | if (!empty($groupby)) { |
1664 | - print '</div>'; // end box-flex-container |
|
1665 | - print '</div>'; // end box-flex-container-columns |
|
1664 | + print '</div>'; // end box-flex-container |
|
1665 | + print '</div>'; // end box-flex-container-columns |
|
1666 | 1666 | } else { |
1667 | - print '</div>'; // end box-flex-container |
|
1667 | + print '</div>'; // end box-flex-container |
|
1668 | 1668 | } |
1669 | 1669 | |
1670 | 1670 | print '</td></tr>'; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $action = GETPOST('action', 'aZ09'); |
47 | 47 | $massaction = GETPOST('massaction', 'alpha'); |
48 | 48 | $cancel = GETPOST('cancel', 'alpha'); |
49 | -$toselect = GETPOST('toselect', 'array'); |
|
49 | +$toselect = GETPOST('toselect', 'array'); |
|
50 | 50 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search |
51 | 51 | $backtopage = GETPOST('backtopage', 'alpha'); |
52 | 52 | $mode = GETPOST('mode', 'alpha'); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $object->note_public = trim($comment); |
147 | 147 | $object->note_private = ''; |
148 | 148 | $object->mail_valid = trim($mail_valid); |
149 | - $object->vote = $vote; // $vote is already int |
|
149 | + $object->vote = $vote; // $vote is already int |
|
150 | 150 | |
151 | 151 | // Fill array 'array_options' with data from add form |
152 | 152 | $ret = $extrafields->setOptionalsFromPost(null, $object); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | $urltogo = $backtopage ? str_replace('__ID__', (string) $id, $backtopage) : $backurlforlist; |
181 | 181 | $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', (string) $object->id, $urltogo); // New method to autoselect field created after a New on another form object creation |
182 | 182 | |
183 | - header("Location: " . $urltogo); |
|
183 | + header("Location: ".$urltogo); |
|
184 | 184 | exit; |
185 | 185 | } else { |
186 | 186 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $object->note_public = trim($comment); |
208 | 208 | $object->note_private = ''; |
209 | 209 | $object->mail_valid = trim($mail_valid); |
210 | - $object->vote = $vote; // $vote is already int. |
|
210 | + $object->vote = $vote; // $vote is already int. |
|
211 | 211 | |
212 | 212 | // Fill array 'array_options' with data from add form |
213 | 213 | $ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET'); |