Merge branch '2.4' of github.com:MISP/MISP into 2.4

SteveClement · Oct 14, 2020 · 93ea6f5 · 93ea6f5
2 parents c77206a + f3ab1f2
commit 93ea6f5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/app/Model/Server.php b/app/Model/Server.php
@@ -2597,6 +2597,10 @@ private function __checkIfPulledEventExistsAndAddOrUpdate($event, $eventId, &$su
             $result = $eventModel->_add($event, true, $user, $server['Server']['org_id'], $passAlong, true, $jobId);
             if ($result) {
                 $successes[] = $eventId;
+                if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->event_save(array('Event' => $eventId, 'Server' => $server['Server']['id']), 'add_from_connected_server');
+                }
             } else {
                 $fails[$eventId] = __('Failed (partially?) because of validation errors: ') . json_encode($eventModel->validationErrors, true);
             }
@@ -2607,6 +2611,10 @@ private function __checkIfPulledEventExistsAndAddOrUpdate($event, $eventId, &$su
                 $result = $eventModel->_edit($event, $user, $existingEvent['Event']['id'], $jobId, $passAlong, $force);
                 if ($result === true) {
                     $successes[] = $eventId;
+                    if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {
+                        $pubSubTool = $this->getPubSubTool();
+                        $pubSubTool->event_save(array('Event' => $eventId, 'Server' => $server['Server']['id']), 'edit_from_connected_server');
+                    }
                 } elseif (isset($result['error'])) {
                     $fails[$eventId] = $result['error'];
                 } else {