From 7f07f019c38a5427367ff28e52926562dc704c7f Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 5 Nov 2019 09:20:48 -0800 Subject: [PATCH] Issue #4009 - refining banlist ip search --- e107_admin/banlist.php | 11 ++++++++++- e107_handlers/admin_ui.php | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 7228ae84f..494072ce9 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -149,7 +149,16 @@ class banlist_ui extends e_admin_ui */ function handleListBanlistIpFilter($srch) { - return "banlist_ip = '".e107::getIPHandler()->ipEncode($srch)."' OR banlist_ip = '".$srch."'"; + $ret = array( + "banlist_ip = '".$srch."'" + ); + + if($ip6 = e107::getIPHandler()->ipEncode($srch)) + { + $ret[] = "banlist_ip = '".$ip6."'"; + } + + return implode(" OR ",$ret); } diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index dfda93336..643252309 100755 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -4197,7 +4197,7 @@ class e_admin_controller_ui extends e_admin_controller { e107::getMessage()->addDebug(print_a($searchQry,true)); } - + $className = get_class($this); // main table should select everything