tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FilterExpression: Give the row a chance to dynamically return a value 

refs #10304
This commit is contained in:
Johannes Meyer 2015-10-05 14:01:03 +02:00
parent 07e5664fbe
commit 65e7f7a8ca
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,8 @@
namespace Icinga\Data\Filter;
use Exception;
class FilterExpression extends Filter
{
protected $column;
@ -97,22 +99,24 @@ class FilterExpression extends Filter
public function matches($row)
{
if (! isset($row->{$this->column})) {
try {
$rowValue = $row->{$this->column};
} catch (Exception $e) {
// TODO: REALLY? Exception?
return false;
}
if (is_array($this->expression)) {
return in_array($row->{$this->column}, $this->expression);
return in_array($rowValue, $this->expression);
}
$expression = (string) $this->expression;
if (strpos($expression, '*') === false) {
if (is_array($row->{$this->column})) {
return in_array($expression, $row->{$this->column});
if (is_array($rowValue)) {
return in_array($expression, $rowValue);
}
return (string) $row->{$this->column} === $expression;
return (string) $rowValue === $expression;
}
$parts = array();
@ -121,8 +125,8 @@ class FilterExpression extends Filter
}
$pattern = '/^' . implode('.*', $parts) . '$/';
if (is_array($row->{$this->column})) {
foreach ($row->{$this->column} as $candidate) {
if (is_array($rowValue)) {
foreach ($rowValue as $candidate) {
if (preg_match($pattern, $candidate)) {
return true;
}
@ -131,7 +135,7 @@ class FilterExpression extends Filter
return false;
}
return (bool) preg_match($pattern, $row->{$this->column});
return (bool) preg_match($pattern, $rowValue);
}
public function andFilter(Filter $filter)