From 281db68aa27f91e60875ef0271c3f859441510ed Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 5 Nov 2019 10:27:21 -0800 Subject: [PATCH] Provide raw search query to custom method. Issue: #4009 Support banlist filtering using wildcards. --- e107_admin/banlist.php | 5 +++-- e107_handlers/admin_ui.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 494072ce9..7b5fc4220 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -153,9 +153,10 @@ class banlist_ui extends e_admin_ui "banlist_ip = '".$srch."'" ); - if($ip6 = e107::getIPHandler()->ipEncode($srch)) + if($ip6 = e107::getIPHandler()->ipEncode($srch,true)) { - $ret[] = "banlist_ip = '".$ip6."'"; + $ip = str_replace('x', '', $ip6); + $ret[] = "banlist_ip LIKE '%".$ip."%'"; } return implode(" OR ",$ret); diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 643252309..4277a42c5 100755 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -4228,7 +4228,7 @@ class e_admin_controller_ui extends e_admin_controller { // Search for customer filter handler. $cutomerFilterMethod = 'handle'.$this->getRequest()->getActionName().$this->getRequest()->camelize($key).'Filter'; - $args = array($searchQuery); + $args = array($tp->toDB($request->getQuery('searchquery', ''))); e107::getMessage()->addDebug("Searching for custom filter method: ".$className.'::'.$cutomerFilterMethod."(".implode(', ', $args).")"); if(method_exists($this, $cutomerFilterMethod)) // callback handling