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

Merge pull request #6625 from JakubOnderka/setting-change-exception 

chg: [internal] Throw exception if setting name doesn't exists
pull/6628/head
Jakub Onderka 2020-11-19 21:10:16 +01:00 committed by GitHub
parent af0e4f354d 071f8877b3
commit 206c38d5d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/ServersController.php
View File

@ -1416,6 +1416,9 @@ class ServersController extends AppController
}
$setting = $this->Server->getSettingData($setting_name);
if ($setting === false) {
throw new NotFoundException(__('Setting %s is invalid.', $setting_name));
}
if (!empty($setting['cli_only'])) {
throw new MethodNotAllowedException(__('This setting can only be edited via the CLI.'));
}
@ -1430,7 +1433,6 @@ class ServersController extends AppController
if (isset($setting['optionsSource']) && !empty($setting['optionsSource'])) {
$setting['options'] = $this->{'__load' . $setting['optionsSource']}();
}
$subGroup = 'general';
$subGroup = explode('.', $setting['name']);
if ($subGroup[0] === 'Plugin') {
$subGroup = explode('_', $subGroup[1])[0];

2
app/Model/Server.php
View File

@ -4316,7 +4316,7 @@ class Server extends AppModel
return $setting;
}
public function serverSettingsEditValue($user, $setting, $value, $forceSave = false)
public function serverSettingsEditValue(array $user, array $setting, $value, $forceSave = false)
{
if (isset($setting['beforeHook'])) {
$beforeResult = call_user_func_array(array($this, $setting['beforeHook']), array($setting['name'], $value));