mirror of https://github.com/MISP/MISP
fix: [internal] mactime template uuid fix and saveObject improvement
parent
db385f030f
commit
511538c14a
|
@ -6014,7 +6014,6 @@ class EventsController extends AppController
|
|||
$this->set('file_uploaded', "1");
|
||||
$this->set('file_name', $this->request['data']['Event']['analysis_file']['name']);
|
||||
$this->set('file_content', file_get_contents($this->request['data']['Event']['analysis_file']['tmp_name']));
|
||||
|
||||
//$result = $this->Event->upload_mactime($this->Auth->user(), );
|
||||
} elseif ($this->request->is('post') && $this->request['data']['SelectedData']['mactime_data']) {
|
||||
// Find the event that is to be updated
|
||||
|
@ -6042,7 +6041,7 @@ class EventsController extends AppController
|
|||
'meta-category' => 'file',
|
||||
'description' => 'Mactime template, used in forensic investigations to describe the timeline of a file activity',
|
||||
'template_version' => 1,
|
||||
'template_uuid' => '9297982e-be62-4772-a665-c91f5a8d639'
|
||||
'template_uuid' => '58149b06-eabe-4937-9dac-01d63f504e14'
|
||||
);
|
||||
|
||||
$object['Attribute'] = array(
|
||||
|
@ -6105,7 +6104,7 @@ class EventsController extends AppController
|
|||
|
||||
);
|
||||
$this->loadModel('MispObject');
|
||||
$ObjectResult = $this->MispObject->saveObject($object, $eventId, "", "");
|
||||
$ObjectResult = $this->MispObject->saveObject($object, $eventId, false, $this->Auth->user());
|
||||
$temp = $this->MispObject->ObjectReference->Object->find('first', array(
|
||||
'recursive' => -1,
|
||||
'fields' => array('Object.uuid','Object.id'),
|
||||
|
|
Loading…
Reference in New Issue