diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index 5b2363a76..b0126935c 100644 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -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); diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php index f25cf37ca..e5dfed8bc 100644 --- a/app/Controller/FeedsController.php +++ b/app/Controller/FeedsController.php @@ -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.')); diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php index 52a95d388..9e16ee11e 100644 --- a/app/Controller/ServersController.php +++ b/app/Controller/ServersController.php @@ -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')); } diff --git a/app/Model/ThreatLevel.php b/app/Model/ThreatLevel.php index 232f0dfa3..1b0114450 100644 --- a/app/Model/ThreatLevel.php +++ b/app/Model/ThreatLevel.php @@ -22,4 +22,11 @@ class ThreatLevel extends AppModel ), ), ); + + public function list() + { + return $this->find('list', [ + 'fields' => ['id', 'name'], + ]); + } }