MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [api] Fixed event index to include sharing group metadata

pull/3941/head
iglocska 2018-12-12 19:24:12 +01:00
parent ba74597e87
commit 147ab92aa9
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controller/EventsController.php
View File

@ -763,12 +763,28 @@ class EventsController extends AppController
}
}
$events = $this->GalaxyCluster->attachClustersToEventIndex($events);
$this->set('events', $events);
foreach ($events as $key => $event) {
$temp = $events[$key]['Event'];
$temp['Org'] = $event['Org'];
$temp['Orgc'] = $event['Orgc'];
unset($temp['user_id']);
$rearrangeObjects = array('GalaxyCluster', 'EventTag', 'SharingGroup');
foreach ($rearrangeObjects as $ro) {
if (isset($event[$ro])) {
$temp[$ro] = $event[$ro];
}
}
$events[$key] = $temp;
}
if ($this->response->type() === 'application/xml') {
$events = array('Event' => $events);
}
return $this->RestResponse->viewData($events, $this->response->type());
} else {
foreach ($events as $key => $event) {
$events[$key] = $event['Event'];
return $this->RestResponse->viewData($events, $this->response->type());
}
return $this->RestResponse->viewData($events, $this->response->type());
}
} else {
$events = $this->paginate();