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

fix: return api error when feed is not enabled

pull/7440/head
Luciano Righetti 2021-05-25 11:51:16 +02:00
parent 4207787777
commit ebeab4d245
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/FeedsController.php
View File

@ -459,8 +459,15 @@ class FeedsController extends AppController
$this->Feed->data['Feed']['settings'] = json_decode($this->Feed->data['Feed']['settings'], true);
}
if (!$this->Feed->data['Feed']['enabled']) {
$this->Flash->error(__('Feed is currently not enabled. Make sure you enable it.'));
$this->redirect(array('action' => 'index'));
if ($this->_isRest()) {
return $this->RestResponse->viewData(
array('result' => __('Feed is currently not enabled. Make sure you enable it.')),
$this->response->type()
);
} else {
$this->Flash->error(__('Feed is currently not enabled. Make sure you enable it.'));
$this->redirect(array('action' => 'index'));
}
}
if (Configure::read('MISP.background_jobs')) {
$this->loadModel('Job');