lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply stickler CI recommendation to avoid concatenating string literals

Browse Source
This commit is contained in:
Florian Mortgat 2020-11-10 23:50:42 +01:00
parent a64c4b0cb5
commit 952f398a60
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/extrafields.class.php
View File

@ -1077,8 +1077,7 @@ class ExtraFields
$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">'
. $langs->trans('From') . ' '
. $form->selectDate($prefill['start'], $keyprefix . $key . $keysuffix . '_start', 0, 0, 1)
. '</div>'
. '<div class="nowrap">'
. '</div><div class="nowrap">'
. $langs->trans('to') . ' '
. $form->selectDate($prefill['end'], $keyprefix . $key . $keysuffix . '_end', 0, 0, 1)
. '</div></div>';

20
htdocs/core/tpl/extrafields_list_search_param.tpl.php
View File

@ -19,17 +19,17 @@ if (!empty($search_array_options) && is_array($search_array_options)) // $extraf
if (is_array($val) && array_key_exists('start', $val) && array_key_exists('end', $val)) {
// date range from list filters is stored as array('start' => <timestamp>, 'end' => <timestamp>)
// start date
$param .= '&' . $search_options_pattern.$tmpkey.'_startyear' . '=' . intval(dol_print_date($val['start'], '%Y'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startmonth' . '=' . intval(dol_print_date($val['start'], '%m'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startday' . '=' . intval(dol_print_date($val['start'], '%d'));
$param .= '&' . $search_options_pattern.$tmpkey.'_starthour' . '=' . intval(dol_print_date($val['start'], '%H'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startmin' . '=' . intval(dol_print_date($val['start'], '%M'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startyear=' . intval(dol_print_date($val['start'], '%Y'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startmonth=' . intval(dol_print_date($val['start'], '%m'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startday=' . intval(dol_print_date($val['start'], '%d'));
$param .= '&' . $search_options_pattern.$tmpkey.'_starthour=' . intval(dol_print_date($val['start'], '%H'));
$param .= '&' . $search_options_pattern.$tmpkey.'_startmin=' . intval(dol_print_date($val['start'], '%M'));
// end date
$param .= '&' . $search_options_pattern.$tmpkey.'_endyear' . '=' . intval(dol_print_date($val['end'], '%Y'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endmonth' . '=' . intval(dol_print_date($val['end'], '%m'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endday' . '=' . intval(dol_print_date($val['end'], '%d'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endhour' . '=' . intval(dol_print_date($val['end'], '%H'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endmin' . '=' . intval(dol_print_date($val['end'], '%M'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endyear=' . intval(dol_print_date($val['end'], '%Y'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endmonth=' . intval(dol_print_date($val['end'], '%m'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endday=' . intval(dol_print_date($val['end'], '%d'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endhour=' . intval(dol_print_date($val['end'], '%H'));
$param .= '&' . $search_options_pattern.$tmpkey.'_endmin=' . intval(dol_print_date($val['end'], '%M'));
}
if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
}