mirror of https://github.com/MISP/MISP
fix: [api] Fixed event index to include sharing group metadata
parent
ba74597e87
commit
147ab92aa9
|
@ -763,13 +763,29 @@ class EventsController extends AppController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$events = $this->GalaxyCluster->attachClustersToEventIndex($events);
|
$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 {
|
} else {
|
||||||
foreach ($events as $key => $event) {
|
foreach ($events as $key => $event) {
|
||||||
$events[$key] = $event['Event'];
|
$events[$key] = $event['Event'];
|
||||||
}
|
|
||||||
return $this->RestResponse->viewData($events, $this->response->type());
|
return $this->RestResponse->viewData($events, $this->response->type());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$events = $this->paginate();
|
$events = $this->paginate();
|
||||||
foreach ($events as $k => $event) {
|
foreach ($events as $k => $event) {
|
||||||
|
|
Loading…
Reference in New Issue