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

Merge branch '2.4' into feature/attribute-tagging

pull/1857/head
Iglocska 2017-01-17 14:52:59 +01:00
parent e0c7c000ab 770b69dbc2
commit 0960791008
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Controller/EventsController.php
View File

@ -3680,8 +3680,12 @@ class EventsController extends AppController {
} else {
$json = $this->__buildGraphJson($id);
}
$this->set('json', $json);
$this->set('_serialize', 'json');
array_walk_recursive($json, function(&$item, $key){
if(!mb_detect_encoding($item, 'utf-8', true)){
$item = utf8_encode($item);
}
});
return new CakeResponse(array('body' => json_encode($json), 'status' => 200));
}
private function __buildGraphJson($id, $json = array()) {
@ -3782,6 +3786,13 @@ class EventsController extends AppController {
$links[] = $temp;
}
$json['links'] = $links;
} else {
if (!isset($json['links'])) {
$json['links'] = array();
}
if (!isset($json['nodes'])) {
$json['nodes'] = array();
}
}
return $json;
}