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

fix: [API] Fixed the broken CSV export

pull/3626/head
iglocska 2018-09-05 11:36:31 +02:00
parent 7570b9a588
commit bcfc1f3a1a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/EventsController.php
View File

@ -2768,18 +2768,18 @@ class EventsController extends AppController
$params['page'] = 1;
$i = 0;
$continue = true;
$options = array(
$params = array_merge($params, array(
'requested_obj_attributes' => $requested_obj_attributes,
'requested_attributes' => $requested_attributes,
'includeContext' => $includeContext
);
));
App::uses('CsvExport', 'Export');
$export = new CsvExport();
$final = $export->header($options);
$final = $export->header($params);
while ($continue) {
$attributes = $this->Event->csv($user, $params, false, $continue);
$params['page'] += 1;
$final .= $export->handler($attributes, $options);
$final .= $export->handler($attributes, $params);
$final .= $export->separator($attributes);
}
$export->footer();

2
app/Lib/Export/CsvExport.php
View File

@ -14,7 +14,7 @@ class CsvExport
'event_tag' => array('object' => 'Tag', 'var' => 'name')
);
public function handler($attributes, $final, $options = array())
public function handler($attributes, $options = array())
{
$result = array();
foreach ($attributes as $attribute) {