From 952f398a609cc112e4f06748b54a24b80f6650f4 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Tue, 10 Nov 2020 23:50:42 +0100
Subject: [PATCH] Apply stickler CI recommendation to avoid concatenating
 string literals

---
 htdocs/core/class/extrafields.class.php       |  3 +--
 .../tpl/extrafields_list_search_param.tpl.php | 20 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index a188dafd885..b5d4852d128 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -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>';
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 009d05b30ee..902d4df59ca 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -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);
     }