Skip to content

Update Tablequery.php #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Tablequery.php #1562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions app/lib/munkireport/Tablequery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,31 @@ public function fetch($cfg)
if ($search_cols) {
$sWhere = $where ? $where . " AND (" : "WHERE (";
foreach ($search_cols as $pos => $val) {
if (preg_match('/([<>=] \d+)|BETWEEN\s+\d+\s+AND\s+\d+$/', $val)) {
// Special case, use unquoted
$compstr = $val;
} elseif(preg_match('/[%_]+/', $val)) {
$bindings[] = $val;
$compstr = " LIKE ?";
$valTrim = trim($val);
if (preg_match('/^IS\s+NULL$/i', $valTrim)) {
// Handle IS NULL without binding
$compstr = ' IS NULL';
} elseif (preg_match('/^IS\s+NOT\s+NULL$/i', $valTrim)) {
// Handle IS NOT NULL without binding
$compstr = ' IS NOT NULL';
} elseif (preg_match('/^!=\s*(.+)$/', $valTrim, $m)) {
// Handle not equals for strings/numbers
$bindings[] = $m[1];
$compstr = ' != ?';
} elseif (preg_match('/([<>=] \d+)|BETWEEN\s+\d+\s+AND\s+\d+$/', $valTrim)) {
// Special case, numeric comparison or BETWEEN, use unquoted
$compstr = $valTrim;
} elseif (preg_match('/[%_]+/', $valTrim)) {
// LIKE with wildcard(s)
$bindings[] = $valTrim;
$compstr = ' LIKE ?';
} else {
$bindings[] = $val;
$compstr = " = ?";
// Default to equals
$bindings[] = $valTrim;
$compstr = ' = ?';
}

$sWhere .= $formatted_columns[$pos].$compstr." OR ";
$sWhere .= $formatted_columns[$pos] . $compstr . " OR ";
}
$sWhere = substr_replace($sWhere, "", -3);
$sWhere .= ')';
Expand Down