diff --git a/app/Model/User.php b/app/Model/User.php index f0ca00e6d..ec9d33f18 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -1774,8 +1774,8 @@ class User extends AppModel $filters['includeEventCorrelations'] = !empty($periodicSettings['include_correlations']); $filters['includeGranularCorrelations'] = !empty($periodicSettings['include_correlations']); $filters['noSightings'] = true; - $filters['includeGalaxy'] = false; - $events = $this->__getEventsForFilters($user, $filters); + $filters['fetchFullClusters'] = false; + $events = $this->Event->fetchEvent($user, $filters); $elementCounter = 0; $renderView = false; @@ -1883,13 +1883,6 @@ class User extends AppModel ); } - private function __getEventsForFilters(array $user, array $filters): array - { - $this->Event = ClassRegistry::init('Event'); - $events = $this->Event->fetchEvent($user, $filters); - return $events; - } - public function prepareEmailTemplate(string $period='daily'): SendEmailTemplate { $subject = sprintf('[%s MISP] %s %s', Configure::read('MISP.org'), Inflector::humanize($period), __('Notification - %s', (new DateTime())->format('Y-m-d')));