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

fix: Fixed a potential empty event_id field that blocked new CSV feeds from being added

pull/1617/merge
Iglocska 2016-10-24 02:06:08 +02:00
parent 0fc7407f33
commit 7f0bc3a207
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/FeedsController.php
View File

@ -61,6 +61,9 @@ class FeedsController extends AppController {
if (!isset($this->request->data['Feed']['settings'])) { if (!isset($this->request->data['Feed']['settings'])) {
$this->request->data['Feed']['settings'] = array(); $this->request->data['Feed']['settings'] = array();
} }
if (empty($this->request->data['Feed']['target_event'])) {
$this->request->data['Feed']['target_event'] = 0;
}
$this->request->data['Feed']['settings'] = json_encode($this->request->data['Feed']['settings']); $this->request->data['Feed']['settings'] = json_encode($this->request->data['Feed']['settings']);
$this->request->data['Feed']['event_id'] = !empty($this->request->data['Feed']['fixed_event']) ? $this->request->data['Feed']['target_event'] : 0; $this->request->data['Feed']['event_id'] = !empty($this->request->data['Feed']['fixed_event']) ? $this->request->data['Feed']['target_event'] : 0;
if (!$error) { if (!$error) {
@ -69,7 +72,7 @@ class FeedsController extends AppController {
$this->Session->setFlash('Feed added.'); $this->Session->setFlash('Feed added.');
$this->redirect(array('controller' => 'feeds', 'action' => 'index')); $this->redirect(array('controller' => 'feeds', 'action' => 'index'));
} }
else $this->Session->setFlash('Feed could not be added.'); else $this->Session->setFlash('Feed could not be added. Invalid field: ' . array_keys($this->Feed->validationErrors)[0]);
} }
} }
$this->loadModel('Event'); $this->loadModel('Event');