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

chg: [internal] Threat levels list

pull/7186/head
Jakub Onderka 2021-03-10 08:17:11 +01:00
parent e716df5259
commit 3935dee16b
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/EventsController.php
View File

@ -590,13 +590,7 @@ class EventsController extends AppController
$searchTermInternal = $searchTerm;
if ($searchTerm == 'threatlevel') {
$searchTermInternal = 'threat_level_id';
$threatLevels = $this->Event->ThreatLevel->find('all', array(
'recursive' => -1,
'fields' => array('id', 'name'),
));
foreach ($threatLevels as $tl) {
$terms[$tl['ThreatLevel']['id']] = $tl['ThreatLevel']['name'];
}
$terms = $this->Event->ThreatLevel->list();
} elseif ($searchTerm == 'analysis') {
$terms = $this->Event->analysisLevels;
} else {
@ -4765,8 +4759,7 @@ class EventsController extends AppController
);
$this->set('events', $this->paginate());
$threat_levels = $this->Event->ThreatLevel->find('all');
$this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
$this->set('threatLevels', $this->Event->ThreatLevel->list());
$this->set('eventDescriptions', $this->Event->fieldDescriptions);
$this->set('analysisLevels', $this->Event->analysisLevels);
$this->set('distributionLevels', $this->Event->distributionLevels);

6
app/Controller/FeedsController.php
View File

@ -690,8 +690,7 @@ class FeedsController extends AppController
}
$this->set('events', $events);
$this->loadModel('Event');
$threat_levels = $this->Event->ThreatLevel->find('all');
$this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
$this->set('threatLevels', $this->Event->ThreatLevel->list());
$this->set('eventDescriptions', $this->Event->fieldDescriptions);
$this->set('analysisLevels', $this->Event->analysisLevels);
$this->set('distributionLevels', $this->Event->distributionLevels);
@ -798,8 +797,7 @@ class FeedsController extends AppController
$this->set($alias, $currentModel->{$variable});
}
}
$threat_levels = $this->Event->ThreatLevel->find('all');
$this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
$this->set('threatLevels', $this->Event->ThreatLevel->list());
} else {
if ($event === 'blocked') {
throw new MethodNotAllowedException(__('This event is blocked by the Feed filters.'));

6
app/Controller/ServersController.php
View File

@ -124,8 +124,7 @@ class ServersController extends AppController
}
$this->loadModel('Event');
$threat_levels = $this->Event->ThreatLevel->find('list', ['fields' => ['id', 'name']]);
$this->set('threatLevels', $threat_levels);
$this->set('threatLevels', $this->Event->ThreatLevel->list());
App::uses('CustomPaginationTool', 'Tools');
$customPagination = new CustomPaginationTool();
$params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias);
@ -202,8 +201,7 @@ class ServersController extends AppController
$this->set($alias, $currentModel->{$variable});
}
}
$threat_levels = $this->Event->ThreatLevel->find('list', ['fields' => ['id', 'name']]);
$this->set('threatLevels', $threat_levels);
$this->set('threatLevels', $this->Event->ThreatLevel->list());
$this->set('title_for_layout', __('Remote event preview'));
}

7
app/Model/ThreatLevel.php
View File

@ -22,4 +22,11 @@ class ThreatLevel extends AppModel
),
),
);
public function list()
{
return $this->find('list', [
'fields' => ['id', 'name'],
]);
}
}