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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3188/head
chrisr3d 2018-04-24 11:19:46 +02:00
parent 5330c8f3ef ffcecbf3cc
commit 3afcf9d6da
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/FeedsController.php
View File

@ -273,7 +273,9 @@ class FeedsController extends AppController {
$this->Session->setFlash($message); $this->Session->setFlash($message);
} }
} else { } else {
if ($this->_isRest()) {
return $this->RestResponse->describe('Feeds', 'edit', false, $this->response->type()); return $this->RestResponse->describe('Feeds', 'edit', false, $this->response->type());
}
if (!isset($this->request->data['Feed'])) { if (!isset($this->request->data['Feed'])) {
$this->request->data = $this->Feed->data; $this->request->data = $this->Feed->data;
if ($this->Feed->data['Feed']['event_id']) { if ($this->Feed->data['Feed']['event_id']) {

6
app/Model/Server.php
View File

@ -1070,7 +1070,7 @@ class Server extends AppModel {
'value' => '', 'value' => '',
'errorMessage' => '', 'errorMessage' => '',
'test' => 'testForNumeric', 'test' => 'testForNumeric',
'type' => 'string', 'type' => 'string'
), ),
'cookie_timeout' => array( 'cookie_timeout' => array(
'level' => 0, 'level' => 0,
@ -1078,7 +1078,7 @@ class Server extends AppModel {
'value' => '', 'value' => '',
'errorMessage' => '', 'errorMessage' => '',
'test' => 'testForNumeric', 'test' => 'testForNumeric',
'type' => 'string', 'type' => 'numeric'
) )
), ),
'Plugin' => array( 'Plugin' => array(
@ -2737,7 +2737,7 @@ class Server extends AppModel {
Configure::write($settingFix, $arrayElements); Configure::write($settingFix, $arrayElements);
} }
} }
$settingsToSave = array('debug', 'MISP', 'GnuPG', 'SMIME', 'Proxy', 'SecureAuth', 'Security', 'Session.defaults', 'Session.timeout', 'Session.autoRegenerate', 'site_admin_debug', 'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth'); $settingsToSave = array('debug', 'MISP', 'GnuPG', 'SMIME', 'Proxy', 'SecureAuth', 'Security', 'Session.defaults', 'Session.timeout', 'Session.cookie_timeout', 'Session.autoRegenerate', 'site_admin_debug', 'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth');
$settingsArray = array(); $settingsArray = array();
foreach ($settingsToSave as $setting) { foreach ($settingsToSave as $setting) {
$settingsArray[$setting] = Configure::read($setting); $settingsArray[$setting] = Configure::read($setting);