From f86ad11bd1471a7d19c192ab79dc957d50ce7e5c Mon Sep 17 00:00:00 2001 From: mokaddem Date: Wed, 16 Sep 2020 10:01:31 +0200 Subject: [PATCH] chg: [events] Usage of `fix_login` in restoreDeletedEvents --- app/Controller/EventsController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index 382611ae7..7ac0aea04 100644 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -5607,7 +5607,11 @@ class EventsController extends AppController public function restoreDeletedEvents($force = false) { $startDate = '2020-07-31 00:00:00'; - $endDate = date('Y-m-d H:i:s', time()); + $this->loadModel('AdminSetting'); + $endDate = date('Y-m-d H:i:s', $this->AdminSetting->getSetting('fix_login')); + if (empty($endDate)) { + $endDate = date('Y-m-d H:i:s', time()); + } $this->loadModel('Log'); $redis = $this->Event->setupRedis(); if ($force || ($redis && !$redis->exists('misp:event_recovery'))) {