maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix search for webspace and traffic related values, also, for integer fields (like diskspace) you can now use the following operators when searching: >, < and =; fixes #772

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-09 17:24:11 +01:00
parent a5b1065195
commit 8822067311
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/classes/output/class.paging.php
View File

@@ -175,7 +175,7 @@ class paging {
&& (preg_match('/[-_@\p{L}\p{N}*.]+$/u', $_REQUEST['searchtext']) && (preg_match('/[-_@\p{L}\p{N}*.]+$/u', $_REQUEST['searchtext'])
|| $_REQUEST['searchtext'] === '') || $_REQUEST['searchtext'] === '')
) { ) {
$this->searchtext = $_REQUEST['searchtext']; $this->searchtext = trim($_REQUEST['searchtext']);
} else { } else {
if ($checklastpaging if ($checklastpaging
&& isset($this->userinfo['lastpaging']['searchtext']) && isset($this->userinfo['lastpaging']['searchtext'])
@@ -279,8 +279,27 @@ class paging {
} }
$searchfield = implode('.', $searchfield); $searchfield = implode('.', $searchfield);
$searchtext = str_replace('*', '%', $this->searchtext); // check for logical operators and whether searchtext is a number
$condition.= $searchfield . " LIKE " . Database::quote($searchtext); // in any other case the logical-operators would make no sense
$ops = array('<', '>', '=');
if (in_array(substr($this->searchtext, 0, 1), $ops) && is_numeric(substr($this->searchtext, 1))) {
// if we're checking on traffic or diskspace, we need to adjust the search-value
if (strpos($searchfield, 'diskspace') > 0) {
// anything with diskspace is *1024
$searchtext = ((int)substr($this->searchtext, 1))*1024;
} elseif (strpos($searchfield, 'traffic') > 0) {
// anything with traffic is *1024*1024
$searchtext = ((int)substr($this->searchtext, 1))*1024*1024;
} else {
// any other field
$searchtext = substr($this->searchtext, 1);
}
// now as we use >, < or = we use the given operator and not LIKE
$condition.= $searchfield . " ".substr($this->searchtext, 0, 1)." " . Database::quote($searchtext);
} else {
$searchtext = str_replace('*', '%', $this->searchtext);
$condition.= $searchfield . " LIKE " . Database::quote($searchtext);
}
} else { } else {
$condition = ''; $condition = '';
} }