MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [eventFiltering] display the number of active rules

pull/4076/head
mokaddem 2019-02-01 16:18:34 +01:00
parent fe3cd9d814
commit 04bb28dccd
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Controller/EventsController.php
View File

@ -1137,8 +1137,9 @@ class EventsController extends AppController
$this->set('typeGroups', array_keys($this->Event->Attribute->typeGroupings));
$this->set('attributeFilter', isset($filters['attributeFilter']) ? $filters['attributeFilter'] : 'all');
$this->set('filters', $filters);
$this->set('advancedFilteringActive', $this->__checkIfAdvancedFiltering($filters) ? 1 : 0);
$this->set('advancedFilteringRemovedElements', count($event['objects']));
$advancedFiltering = $this->__checkIfAdvancedFiltering($filters);
$this->set('advancedFilteringActive', $advancedFiltering['active'] ? 1 : 0);
$this->set('advancedFilteringActiveRules', $advancedFiltering['activeRules']);
$this->disableCache();
$this->layout = 'ajax';
$this->loadModel('Sighting');
@ -1361,8 +1362,9 @@ class EventsController extends AppController
$this->set('orgTable', $orgTable);
$this->set('currentUri', $attributeUri);
$this->set('filters', $filters);
$this->set('advancedFilteringActive', $this->__checkIfAdvancedFiltering($filters) ? 1 : 0);
$this->set('advancedFilteringRemovedElements', count($event['objects']));
$advancedFiltering = $this->__checkIfAdvancedFiltering($filters);
$this->set('advancedFilteringActive', $advancedFiltering['active'] ? 1 : 0);
$this->set('advancedFilteringActiveRules', $advancedFiltering['activeRules']);
$this->set('mitreAttackGalaxyId', $this->Event->GalaxyCluster->Galaxy->getMitreAttackGalaxyId());
}
@ -1599,7 +1601,26 @@ class EventsController extends AppController
} else {
$res = false;
}
return $res;
unset($filters['sort']);
unset($filters['direction']);
$defaultRules = array(
'searchFor' => '',
'attributeFilter' => 'all',
'proposal' => '0',
'correlation' => '0',
'warning' => '0',
'deleted' => '2',
'includeRelatedTags' => '0',
'distribution' => array('0', '1', '2', '3', '4', '5')
);
$activeRules = 0;
foreach ($filters as $k => $v) {
if ($defaultRules[$k] != $v) {
$activeRules++;
}
}
return array('active' => $res, 'activeRules' => $activeRules);
}
private function __removeChildren(&$pivot, $id)

2
app/View/Elements/eventattribute.ctp
View File

@ -158,7 +158,7 @@
<it class="fa fa-filter"></it>
<?php echo __('Filtering tool'); ?>
<?php if($advancedFilteringActive): ?>
<span class="badge badge-warning" title="<?php echo h($advancedFilteringRemovedElements) . __(' element(s) passed the filtering')?>"><?php echo h($advancedFilteringRemovedElements) ?></span>
<span class="badge badge-warning" title="<?php echo h($advancedFilteringActiveRules) . __(' active rule(s)')?>"><?php echo h($advancedFilteringActiveRules) ?></span>
<?php endif; ?>
</div>