1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 05:11:42 +02:00

Issue #600, Issue #823 - Now able to search an existing ban by full IP address in IP4 format. Ban files now regenerated after each change in admin area.

This commit is contained in:
Cameron
2015-03-09 20:19:06 -07:00
parent 7dbd07d5fe
commit b8bbbd3390
3 changed files with 88 additions and 76 deletions

View File

@@ -3644,27 +3644,22 @@ class e_admin_controller_ui extends e_admin_controller
default: // string usually.
if($this->fields[$filterField]['type'] == 'method') // More flexible filtering.
if($filterValue == '_ISEMPTY_')
{
if($filterValue == '_ISEMPTY_')
{
$searchQry[] = $this->fields[$filterField]['__tableField']." = '' ";
}
else
$searchQry[] = $this->fields[$filterField]['__tableField']." = '' ";
}
else
{
if($this->fields[$filterField]['type'] == 'method') // More flexible filtering.
{
$searchQry[] = $this->fields[$filterField]['__tableField']." LIKE \"%".$tp->toDB($filterValue)."%\"";
}
}
else
{
if($filterValue == '_ISEMPTY_')
{
$searchQry[] = $this->fields[$filterField]['__tableField']." = '' ";
}
else
else
{
$searchQry[] = $this->fields[$filterField]['__tableField']." = '".$tp->toDB($filterValue)."'";
}
}
@@ -3718,8 +3713,16 @@ class e_admin_controller_ui extends e_admin_controller
}
continue;
}
if($var['type'] == 'ip')
{
$filter[] = $var['__tableField']." LIKE '%".e107::getIpHandler()->ipEncode($searchQuery)."%'";
// Continue below for BC check also.
}
$filter[] = $var['__tableField']." LIKE '%".$searchQuery."%'";
if($isfilter)
{
$filterFrom[] = $var['__tableField'];
@@ -3728,7 +3731,10 @@ class e_admin_controller_ui extends e_admin_controller
}
}
// e107::getMessage()->addInfo(print_a($filter,true));
if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
{
// e107::getMessage()->addInfo(print_a($filter,true));
}
if($isfilter)
{