fix: don't add wildcard if user defined one in search string

geokrety · Aug 11, 2023 · 4c18320 · 4c18320
1 parent 597d284
commit 4c18320
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/website/app/GeoKrety/Controller/Pages/SearchByGeokret.php b/website/app/GeoKrety/Controller/Pages/SearchByGeokret.php
@@ -21,7 +21,8 @@ protected function getFilter(): array {
         $search_geokrety = \Base::instance()->get('PARAMS.geokret');
         Smarty::assign('search_geokrety', $search_geokrety);
 
-        $filter = ['lower(name) like lower(?) OR upper(tracking_code) = upper(?)', sprintf('%%%s%%', $search_geokrety), $search_geokrety];
+        $search_wildcard = str_contains($search_geokrety, '%') ? '%s' : '%%%s%%';
+        $filter = ['lower(name) like lower(?) OR upper(tracking_code) = upper(?)', sprintf($search_wildcard, $search_geokrety), $search_geokrety];
 
         $gkid = Geokret::gkid2id($search_geokrety);
         if (is_numeric($gkid)) {

diff --git a/website/app/GeoKrety/Controller/Pages/SearchByUser.php b/website/app/GeoKrety/Controller/Pages/SearchByUser.php
@@ -17,7 +17,8 @@ public function get(\Base $f3) {
         Smarty::assign('search_user', $search_user);
 
         $user = new User();
-        $filter = ['lower(username) like lower(?)', sprintf('%%%s%%', $search_user)];
+        $search_wildcard = str_contains($search_user, '%') ? '%s' : '%%%s%%';
+        $filter = ['lower(username) like lower(?)', sprintf($search_wildcard, $search_user)];
         $option = ['order' => 'username ASC'];
         $subset = $user->paginate(Pagination::findCurrentPage() - 1, GK_PAGINATION_SEARCH_BY_USER, $filter, $option);
         Smarty::assign('users', $subset);