diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index 90bf21afe..fc6d23eab 100644 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -590,7 +590,7 @@ class EventsController extends AppController $searchTermInternal = $searchTerm; if ($searchTerm == 'threatlevel') { $searchTermInternal = 'threat_level_id'; - $terms = $this->Event->ThreatLevel->list(); + $terms = $this->Event->ThreatLevel->listThreatLevels(); } elseif ($searchTerm == 'analysis') { $terms = $this->Event->analysisLevels; } else { @@ -4694,7 +4694,7 @@ class EventsController extends AppController $this->render('/Elements/view_galaxy_matrix'); } } - + // Displays all the cluster relations for the provided event public function viewClusterRelations($eventId) { @@ -4759,7 +4759,7 @@ class EventsController extends AppController ); $this->set('events', $this->paginate()); - $this->set('threatLevels', $this->Event->ThreatLevel->list()); + $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels()); $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 b07c07c29..aa7b6d8c5 100644 --- a/app/Controller/FeedsController.php +++ b/app/Controller/FeedsController.php @@ -694,7 +694,7 @@ class FeedsController extends AppController } $this->set('events', $events); $this->loadModel('Event'); - $this->set('threatLevels', $this->Event->ThreatLevel->list()); + $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels()); $this->set('eventDescriptions', $this->Event->fieldDescriptions); $this->set('analysisLevels', $this->Event->analysisLevels); $this->set('distributionLevels', $this->Event->distributionLevels); diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php index d8eb3a38c..c89f30a94 100644 --- a/app/Controller/ServersController.php +++ b/app/Controller/ServersController.php @@ -124,7 +124,7 @@ class ServersController extends AppController } $this->loadModel('Event'); - $this->set('threatLevels', $this->Event->ThreatLevel->list()); + $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels()); App::uses('CustomPaginationTool', 'Tools'); $customPagination = new CustomPaginationTool(); $params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias); @@ -202,7 +202,7 @@ class ServersController extends AppController $this->set($alias, $currentModel->{$variable}); } } - $this->set('threatLevels', $this->Event->ThreatLevel->list()); + $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels()); $this->set('title_for_layout', __('Remote event preview')); } diff --git a/app/Model/ThreatLevel.php b/app/Model/ThreatLevel.php index 1b0114450..6e6118b2e 100644 --- a/app/Model/ThreatLevel.php +++ b/app/Model/ThreatLevel.php @@ -23,7 +23,7 @@ class ThreatLevel extends AppModel ), ); - public function list() + public function listThreatLevels() { return $this->find('list', [ 'fields' => ['id', 'name'],