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

Revert "monitoring/security: Guard delete comment action" 

This reverts commit 4ef5f0c813.
This commit is contained in:
Eric Lippmann 2015-02-03 16:49:39 +01:00
parent e8466ec7be
commit 49e96b7200
2 changed files with 20 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
library/Icinga/Web/Widget/FilterEditor.php
View File

@ -123,55 +123,26 @@ class FilterEditor extends AbstractWidget
{
$found = false;
if ($filter->isChain() && $filter->getOperatorName() === 'AND') {
if (is_array($column)) {
foreach ($filter->filters() as $f) {
if ($f->isChain() && $f->getOperatorName() === 'OR') {
}
}
} else {
foreach ($filter->filters() as $f) {
if ($f->isExpression()
&& $f->getColumn() === $column
&& $f->getSign() === $sign
) {
$f->setExpression($expression);
$found = true;
break;
}
foreach ($filter->filters() as $f) {
if ($f->isExpression()
&& $f->getColumn() === $column
&& $f->getSign() === $sign
) {
$f->setExpression($expression);
$found = true;
break;
}
}
} elseif ($filter->isExpression() && $filter->getSign() === $sign) {
if (is_array($column)) {
if (in_array($filter->getColumn(), $column)) {
$or = Filter::matchAny();
foreach ($column as $col) {
$or->addFilter(
Filter::expression($col, $sign, $expression)
);
}
$filter = $filter->andFilter($or);
$found = true;
}
} elseif ($filter->getColumn() === $column) {
} elseif ($filter->isExpression()) {
if ($filter->getColumn() === $column && $filter->getSign() === $sign) {
$filter->setExpression($expression);
$found = true;
}
}
if (! $found) {
if (is_array($column)) {
$or = Filter::matchAny();
foreach ($column as $col) {
$or->addFilter(
Filter::expression($col, $sign, $expression)
);
}
$filter = $filter->andFilter($or);
} else {
$filter = $filter->andFilter(
Filter::expression($column, $sign, $expression)
);
}
$filter = $filter->andFilter(
Filter::expression($column, $sign, $expression)
);
}
return $filter;
}
@ -212,25 +183,25 @@ class FilterEditor extends AbstractWidget
// TODO: Ask the view for (multiple) search columns
switch($request->getActionName()) {
case 'services':
$searchCols = array('service_description', 'service_display_name');
$searchCol = 'service_description';
break;
case 'hosts':
$searchCols = array('host_name', 'host_display_name');
$searchCol = 'host_name';
break;
case 'hostgroups':
$searchCols = array('hostgroup', 'hostgroup_alias');
$searchCol = 'hostgroup';
break;
case 'servicegroups':
$searchCols = array('servicegroup', 'servicegroup_alias');
$searchCol = 'servicegroup';
break;
default:
$searchCols = null;
$searchCol = null;
}
if ($searchCols === null) {
if ($searchCol === null) {
throw new Exception('Cannot search here');
}
$filter = $this->mergeRootExpression($filter, $searchCols, '=', "*$search*");
$filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
} else {
list($k, $v) = preg_split('/=/', $search);

1
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -142,7 +142,6 @@ abstract class MonitoredObjectController extends Controller
public function deleteCommentAction()
{
$this->assertHttpMethod('POST');
$this->assertPermission('monitoring/command/comment/delete');
$this->handleCommandForm(new DeleteCommentCommandForm());
}