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

FilterMatchNot: Do not re-invent the parents implementation of matches() 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-23 13:01:08 +02:00
parent 939188be94
commit e4e560ab1a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Icinga/Data/Filter/FilterMatchNot.php
View File

@ -7,15 +7,6 @@ class FilterMatchNot extends FilterExpression
{ {
public function matches($row) public function matches($row)
{ {
$expression = (string) $this->expression; return !parent::matches($row);
if (strpos($expression, '*') === false) {
return (string) $row->{$this->column} !== $expression;
} else {
$parts = array();
foreach (preg_split('/\*/', $expression) as $part) {
$parts[] = preg_quote($part);
}
return ! preg_match('/^' . implode('.*', $parts) . '$/', $row->{$this->column});
}
} }
} }