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

fix: Various fixes to the add feed action/view

pull/3267/head
iglocska 2018-05-17 10:03:26 +02:00
parent a21fcadd94
commit 2b2a0c25a4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/FeedsController.php
View File

@ -161,7 +161,10 @@ class FeedsController extends AppController {
}
if (empty($this->request->data['Feed']['input_source'])) {
$this->request->data['Feed']['input_source'] = 'network';
} else if (!in_array($this->request->data['Feed']['input_source'], array('network', 'file'))) {
} else {
$this->request->data['Feed']['input_source'] = strtolower($this->request->data['Feed']['input_source']);
}
if (!in_array($this->request->data['Feed']['input_source'], array('network', 'local'))) {
$this->request->data['Feed']['input_source'] = 'network';
}
if (!isset($this->request->data['Feed']['delete_local_file'])) {
@ -179,13 +182,13 @@ class FeedsController extends AppController {
}
$this->Flash->success($message);
$this->redirect(array('controller' => 'feeds', 'action' => 'index'));
}
else {
$messsage = __('Feed could not be added. Invalid field: %s', array_keys($this->Feed->validationErrors)[0]);
} else {
$message = __('Feed could not be added. Invalid field: %s', array_keys($this->Feed->validationErrors)[0]);
if ($this->_isRest()) {
return $this->RestResponse->saveFailResponse('Feeds', 'add', false, $message, $this->response->type());
}
$this->Flash->error($message);
$this->request->data['Feed']['settings'] = json_decode($this->request->data['Feed']['settings'], true);
}
}
} else if ($this->_isRest()) {

6
app/View/Feeds/add.ctp
View File

@ -115,7 +115,7 @@
'div' => 'input clear',
'placeholder' => ',',
'class' => 'form-control span6',
'value' => ','
'value' => isset($this->request->data['Feed']['settings']['csv']['delimiter']) ? $this->request->data['Feed']['settings']['csv']['delimiter'] : ','
));
?>
</div>
@ -165,7 +165,7 @@
'options' => array($distributionLevels),
'div' => 'input clear',
'label' => __('Distribution'),
'selected' => 3,
'selected' => isset($this->request->data['Feed']['distribution']) ? $this->request->data['Feed']['distribution'] : 3,
));
?>
<div id="SGContainer" style="display:none;">
@ -183,7 +183,7 @@
echo $this->Form->input('tag_id', array(
'options' => $tags,
'label' => __('Default Tag'),
'selected' => 0,
'selected' => isset($this->request->data['Feed']['tag_id']) ? $this->request->data['Feed']['tag_id'] : 0,
));
echo $this->Form->input('pull_rules', array('style' => 'display:none;', 'label' => false, 'div' => false));
?>