tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

FilterExpression: make case insensitive matching possible

Browse Source 
refs #11051
This commit is contained in:
Alexander A. Klimov 2016-02-11 11:48:50 +01:00
parent a5924f2ca8
commit 809861cb53
1 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
library/Icinga/Data/Filter/FilterExpression.php
View File

@ -11,12 +11,20 @@ class FilterExpression extends Filter
protected $sign; protected $sign;
protected $expression; protected $expression;
/**
* Does this filter compare case sensitive?
*
* @var bool
*/
protected $caseSensitive;
public function __construct($column, $sign, $expression) public function __construct($column, $sign, $expression)
{ {
$column = trim($column); $column = trim($column);
$this->column = $column; $this->column = $column;
$this->sign = $sign; $this->sign = $sign;
$this->expression = $expression; $this->expression = $expression;
$this->caseSensitive = true;
} }
public function isExpression() public function isExpression()
@ -55,6 +63,14 @@ class FilterExpression extends Filter
return $this->expression; return $this->expression;
} }
/**
* @return bool
*/
public function getCaseSensitive()
{
return $this->caseSensitive;
}
public function setExpression($expression) public function setExpression($expression)
{ {
$this->expression = $expression; $this->expression = $expression;
@ -69,6 +85,17 @@ class FilterExpression extends Filter
return $this; return $this;
} }
/**
* @param bool $caseSensitive
*
* @return $this
*/
public function setCaseSensitive($caseSensitive)
{
$this->caseSensitive = $caseSensitive;
return $this;
}
public function listFilteredColumns() public function listFilteredColumns()
{ {
return array($this->getColumn()); return array($this->getColumn());
@ -97,6 +124,26 @@ class FilterExpression extends Filter
return $this->column . $this->sign . $expression; return $this->column . $this->sign . $expression;
} }
/**
* If $var is a scalar, do the same as strtolower() would do.
* If $var is an array, map $this->strtolowerRecursive() to its elements.
* Otherwise, return $var unchanged.
*
* @param mixed $var
*
* @return mixed
*/
protected function strtolowerRecursive($var)
{
if ($var === null || is_scalar($var)) {
return strtolower($var);
}
if (is_array($var)) {
return array_map(array($this, 'strtolowerRecursive'), $var);
}
return $var;
}
public function matches($row) public function matches($row)
{ {
try { try {
@ -106,11 +153,18 @@ class FilterExpression extends Filter
return false; return false;
} }
if (is_array($this->expression)) { if ($this->caseSensitive) {
return in_array($rowValue, $this->expression); $expression = $this->expression;
} else {
$rowValue = $this->strtolowerRecursive($rowValue);
$expression = $this->strtolowerRecursive($this->expression);
} }
$expression = (string) $this->expression; if (is_array($expression)) {
return in_array($rowValue, $expression);
}
$expression = (string) $expression;
if (strpos($expression, '*') === false) { if (strpos($expression, '*') === false) {
if (is_array($rowValue)) { if (is_array($rowValue)) {
return in_array($expression, $rowValue); return in_array($expression, $rowValue);