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

chg: [internal] Use reference for event modification

pull/7850/head
Jakub Onderka 2021-10-17 13:13:51 +02:00
parent e0144c595c
commit 2cdddfe039
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Model/Event.php
View File

@ -2137,7 +2137,7 @@ class Event extends AppModel
$justExportableTags = false; $justExportableTags = false;
} }
foreach ($results as $eventKey => &$event) { foreach ($results as &$event) {
/* /*
// REMOVING THIS FOR NOW - users should see data they own, even if they're not in the sharing group. // REMOVING THIS FOR NOW - users should see data they own, even if they're not in the sharing group.
if ($event['Event']['distribution'] == 4 && !in_array($event['Event']['sharing_group_id'], $sgids)) { if ($event['Event']['distribution'] == 4 && !in_array($event['Event']['sharing_group_id'], $sgids)) {
@ -2190,15 +2190,15 @@ class Event extends AppModel
} }
// Let's find all the related events and attach it to the event itself // Let's find all the related events and attach it to the event itself
if ($options['includeEventCorrelations']) { if ($options['includeEventCorrelations']) {
$results[$eventKey]['RelatedEvent'] = $this->getRelatedEvents($user, $event['Event']['id'], $sgids); $event['RelatedEvent'] = $this->getRelatedEvents($user, $event['Event']['id'], $sgids);
} }
// Let's also find all the relations for the attributes - this won't be in the xml export though // Let's also find all the relations for the attributes - this won't be in the xml export though
if (!empty($options['includeGranularCorrelations'])) { if (!empty($options['includeGranularCorrelations'])) {
$results[$eventKey]['RelatedAttribute'] = $this->getRelatedAttributes($user, $event['Event']['id']); $event['RelatedAttribute'] = $this->getRelatedAttributes($user, $event['Event']['id']);
if (!empty($options['includeRelatedTags'])) { if (!empty($options['includeRelatedTags'])) {
$results[$eventKey] = $this->includeRelatedTags($results[$eventKey], $options); $event = $this->includeRelatedTags($event, $options);
} }
$results[$eventKey]['RelatedShadowAttribute'] = $this->getRelatedAttributes($user, $event['Event']['id'], true); $event['RelatedShadowAttribute'] = $this->getRelatedAttributes($user, $event['Event']['id'], true);
} }
if (!empty($event['ShadowAttribute']) && $options['includeAttachments']) { if (!empty($event['ShadowAttribute']) && $options['includeAttachments']) {
foreach ($event['ShadowAttribute'] as $k => $sa) { foreach ($event['ShadowAttribute'] as $k => $sa) {
@ -2262,16 +2262,16 @@ class Event extends AppModel
foreach ($event['ShadowAttribute'] as $k => $sa) { foreach ($event['ShadowAttribute'] as $k => $sa) {
if (!empty($sa['old_id'])) { if (!empty($sa['old_id'])) {
if ($event['ShadowAttribute'][$k]['old_id'] == $attribute['id']) { if ($event['ShadowAttribute'][$k]['old_id'] == $attribute['id']) {
$results[$eventKey]['Attribute'][$key]['ShadowAttribute'][] = $sa; $event['Attribute'][$key]['ShadowAttribute'][] = $sa;
unset($results[$eventKey]['ShadowAttribute'][$k]); unset($event['ShadowAttribute'][$k]);
} }
} }
} }
} }
if ($proposalBlockAttributes && !empty($options['allow_proposal_blocking'])) { if ($proposalBlockAttributes && !empty($options['allow_proposal_blocking'])) {
foreach ($results[$eventKey]['Attribute'][$key]['ShadowAttribute'] as $sa) { foreach ($event['Attribute'][$key]['ShadowAttribute'] as $sa) {
if ($sa['proposal_to_delete'] || $sa['to_ids'] == 0) { if ($sa['proposal_to_delete'] || $sa['to_ids'] == 0) {
unset($results[$eventKey]['Attribute'][$key]); unset($event['Attribute'][$key]);
continue; continue;
} }
} }