Merge branch 'develop' of https://github.com/MISP/MISP into develop

pull/217/head
iglocska 2013-07-15 11:35:46 +02:00
commit dff2379ec3
2 changed files with 0 additions and 14 deletions

View File

@ -9,9 +9,6 @@ foreach ($events as $key => $event) {
// cleanup the array from things we do not want to expose
unset($events[$key]['user_id']);
unset($events[$key]['cluster']);
unset($events[$key]['private']);
unset($events[$key]['communitie']);
// hide the org field is we are not in showorg mode
if ('true' != Configure::read('CyDefSIG.showorg') && !$isAdmin) {
unset($events[$key]['org']);

View File

@ -17,9 +17,6 @@ if (isset($relatedEvents)) {
// cleanup the array from things we do not want to expose
//
unset($event['Event']['user_id']);
unset($event['Event']['cluster']);
unset($event['Event']['private']);
unset($event['Event']['communitie']);
// hide the org field is we are not in showorg mode
if ('true' != Configure::read('CyDefSIG.showorg') && !$isAdmin) {
unset($event['Event']['org']);
@ -29,10 +26,6 @@ if ('true' != Configure::read('CyDefSIG.showorg') && !$isAdmin) {
// remove value1 and value2 from the output
foreach ($event['Event']['Attribute'] as $key => $value) {
unset($event['Event']['Attribute'][$key]['private']);
unset($event['Event']['Attribute'][$key]['communitie']);
unset($event['Event']['Attribute'][$key]['cluster']);
unset($event['Event']['Attribute'][$key]['value1']);
unset($event['Event']['Attribute'][$key]['value2']);
@ -41,13 +34,9 @@ foreach ($event['Event']['Attribute'] as $key => $value) {
if (isset($event['Event']['RelatedEvent'])) {
foreach ($event['Event']['RelatedEvent'] as $key => $value) {
unset($event['Event']['RelatedEvent'][$key]['user_id']);
unset($event['Event']['RelatedEvent'][$key]['private']);
unset($event['Event']['RelatedEvent'][$key]['communitie']);
unset($event['Event']['RelatedEvent'][$key]['cluster']);
if ('true' != Configure::read('CyDefSIG.showorg') && !$isAdmin) {
unset($event['Event']['RelatedEvent'][$key]['org']);
unset($event['Event']['RelatedEvent'][$key]['orgc']);
unset($event['Event']['RelatedEvent'][$key]['from']);
}
}
}