mirror of https://github.com/MISP/MISP
fix: [dashboard:*SightingsWidget] Updated to support the correct response type
parent
6677f216c0
commit
4c30854e27
|
@ -35,21 +35,21 @@ class RecentSightingsWidget
|
|||
$data = array();
|
||||
$count = 0;
|
||||
|
||||
foreach (JsonTool::decode($Sighting->restSearch($user, 'json', $filters)->intoString())->{'response'} as $el) {
|
||||
$sighting = $el->{'Sighting'};
|
||||
$event = $sighting->{'Event'};
|
||||
$attribute = $sighting->{'Attribute'};
|
||||
foreach (JsonTool::decode($Sighting->restSearch($user, 'json', $filters)->intoString())['response'] as $el) {
|
||||
$sighting = $el['Sighting'];
|
||||
$event = $sighting['Event'];
|
||||
$attribute = $sighting['Attribute'];
|
||||
|
||||
if ($sighting->{'type'} == 0) $type = "Sighting";
|
||||
elseif ($sighting->{'type'} == 1) $type = "False positive";
|
||||
if ($sighting['type'] == 0) $type = "Sighting";
|
||||
elseif ($sighting['type'] == 1) $type = "False positive";
|
||||
else $type = "Expiration";
|
||||
|
||||
$output = $attribute->{'value'} . " (id: " . $attribute->{'id'} . ") in " . $event->{'info'} . " (id: " . $event->{'id'} . ")";
|
||||
$output = $attribute['value'] . " (id: " . $attribute['id'] . ") in " . $event['info'] . " (id: " . $event['id'] . ")";
|
||||
$data[] = array( 'title' => $type, 'value' => $output,
|
||||
'html' => sprintf(
|
||||
' (Event <a href="%s%s">%s</a>)',
|
||||
Configure::read('MISP.baseurl') . '/events/view/', $event->{'id'},
|
||||
$event->{'id'}
|
||||
Configure::read('MISP.baseurl') . '/events/view/', $event['id'],
|
||||
$event['id']
|
||||
)
|
||||
);
|
||||
++$count;
|
||||
|
|
|
@ -31,21 +31,21 @@ class TresholdSightingsWidget
|
|||
|
||||
$data = array();
|
||||
$sightings_score = array();
|
||||
$restSearch = JsonTool::decode($Sighting->restSearch($user, 'json', $filters)->intoString())->{'response'};
|
||||
$restSearch = JsonTool::decode($Sighting->restSearch($user, 'json', $filters)->intoString())['response'];
|
||||
|
||||
foreach ($restSearch as $el) {
|
||||
$sighting = $el->{'Sighting'};
|
||||
$attribute = $sighting->{'Attribute'};
|
||||
$event = $sighting->{'Event'};
|
||||
$sighting = $el['Sighting'];
|
||||
$attribute = $sighting['Attribute'];
|
||||
$event = $sighting['Event'];
|
||||
|
||||
if (!array_key_exists($attribute->{'id'}, $sightings_score)) $sightings_score[$attribute->{'id'}] = array( 'value' => $attribute->{'value'},
|
||||
if (!array_key_exists($attribute['id'], $sightings_score)) $sightings_score[$attribute['id']] = array( 'value' => $attribute['value'],
|
||||
'score' => 0,
|
||||
'event_title' => $event->{'info'},
|
||||
'event_id' => $event->{'id'});
|
||||
'event_title' => $event['info'],
|
||||
'event_id' => $event['id']);
|
||||
# Sighting
|
||||
if ($sighting->{'type'} == 0) $sightings_score[$attribute->{'id'}]['score'] = $sightings_score[$attribute->{'id'}]['score'] - 1;
|
||||
if ($sighting['type'] == 0) $sightings_score[$attribute['id']]['score'] = $sightings_score[$attribute['id']]['score'] - 1;
|
||||
# False Positive
|
||||
elseif ($sighting->{'type'} == 1) $sightings_score[$attribute->{'id'}]['score'] = $sightings_score[$attribute->{'id'}]['score'] + 1;
|
||||
elseif ($sighting['type'] == 1) $sightings_score[$attribute['id']]['score'] = $sightings_score[$attribute['id']]['score'] + 1;
|
||||
}
|
||||
|
||||
foreach ($sightings_score as $attribute_id => $s) {
|
||||
|
|
Loading…
Reference in New Issue