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

chg: [internal] Unsetting SharingGroup is not necessary

pull/6265/head
Jakub Onderka 2020-09-01 16:07:18 +02:00
parent 06ceece0e5
commit 50a630197a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Model/Event.php
View File

@ -804,11 +804,8 @@ class Event extends AppModel
return $conditionsCorrelation;
}
public function getRelatedEvents($user, $eventId = null, $sgids)
private function getRelatedEvents($user, $eventId, $sgids)
{
if ($eventId == null) {
$eventId = $this->data['Event']['id'];
}
if (!isset($sgids) || empty($sgids)) {
$sgids = array(-1);
}
@ -1510,6 +1507,7 @@ class Event extends AppModel
{
$conditions = array();
if (!$user['Role']['perm_site_admin']) {
$unpublishedPrivate = Configure::read('MISP.unpublishedprivate');
$sgids = $this->cacheSgids($user, true);
$conditions['AND']['OR'] = array(
'Event.org_id' => $user['org_id'],
@ -1517,14 +1515,14 @@ class Event extends AppModel
'AND' => array(
'Event.distribution >' => 0,
'Event.distribution <' => 4,
Configure::read('MISP.unpublishedprivate') ? array('Event.published =' => 1) : array(),
$unpublishedPrivate ? array('Event.published' => 1) : array(),
),
),
array(
'AND' => array(
'Event.sharing_group_id' => $sgids,
'Event.distribution' => 4,
Configure::read('MISP.unpublishedprivate') ? array('Event.published =' => 1) : array(),
$unpublishedPrivate ? array('Event.published' => 1) : array(),
)
)
);
@ -5082,9 +5080,6 @@ class Event extends AppModel
}
}
}
if (isset($object['distribution']) && $object['distribution'] != 4) {
unset($object['SharingGroup']);
}
$object = $this->Warninglist->checkForWarning($object, $eventWarnings, $warningLists);
return $object;
}