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

Bug fixes 

- issues with the way users were passed to the related event finder during a publish
pull/217/head
iglocska 2014-02-14 13:32:19 +01:00
parent 85e3837919
commit 411c017707
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Command/EventShell.php
View File

@ -244,7 +244,7 @@ class EventShell extends AppShell
$userId = $this->args[3];
$isSiteAdmin = $this->args[4];
$processId = $this->args[5];
$this->Job->id = $ProcessId;
$this->Job->id = $processId;
$user = $this->User->read(null, $userId);
$eventId = $this->args[2];
$result = $this->Event->sendContactEmail($id, $message, $all, $user, $isSiteAdmin);

2
app/Model/Event.php
View File

@ -1243,7 +1243,7 @@ class Event extends AppModel {
}
$body .= 'Risk : ' . $event['ThreatLevel']['name'] . "\n";
$body .= 'Analysis : ' . $event['Event']['analysis'] . "\n";
$relatedEvents = $this->getRelatedEvents($user, $isSiteAdmin);
$relatedEvents = $this->getRelatedEvents($user['User'], $isSiteAdmin);
if (!empty($relatedEvents)) {
foreach ($relatedEvents as &$relatedEvent) {
$body .= 'Related to : ' . Configure::read('MISP.baseurl') . '/events/view/' . $relatedEvent['Event']['id'] . ' (' . $relatedEvent['Event']['date'] . ')' . "\n";