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

fix: [internal] Array to string conversion

pull/8123/head
Jakub Onderka 2022-02-02 15:36:35 +01:00
parent 39fc9fa5f8
commit abafe09188
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Model/Event.php
View File

@ -6190,21 +6190,30 @@ class Event extends AppModel
$eventLock->insertLock($user, $id);
}
private function __logUploadResult($server, $event, $newTextBody)
/**
* @param array $server
* @param array $event
* @param mixed $newTextBody
* @throws Exception
*/
private function __logUploadResult(array $server, array $event, $newTextBody)
{
if (!is_string($newTextBody)) {
$newTextBody = JsonTool::encode($newTextBody);
}
$this->Log = ClassRegistry::init('Log');
$this->Log->create();
$this->Log->save(array(
'org' => 'SYSTEM',
'model' => 'Server',
'model_id' => $server['Server']['id'],
'email' => 'SYSTEM',
'action' => 'warning',
'user_id' => 0,
'title' => 'Uploading Event (' . $event['Event']['id'] . ') to Server (' . $server['Server']['id'] . ')',
'change' => 'Returned message: ' . $newTextBody,
'org' => 'SYSTEM',
'model' => 'Server',
'model_id' => $server['Server']['id'],
'email' => 'SYSTEM',
'action' => 'warning',
'user_id' => 0,
'title' => 'Uploading Event (' . $event['Event']['id'] . ') to Server (' . $server['Server']['id'] . ')',
'change' => 'Returned message: ' . $newTextBody,
));
return false;
}
/**