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

chg: [internal] Use AdminSetting::getSetting method

pull/7791/head
Jakub Onderka 2021-09-26 18:00:49 +02:00
parent 687556df32
commit 48016120b7
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Command/AdminShell.php
View File

@ -626,11 +626,8 @@ class AdminShell extends AppShell
{
$this->ConfigLoad->execute();
$dbActualSchema = $this->Server->getActualDBSchema();
$dbVersion = $this->AdminSetting->find('first', array(
'conditions' => array('setting' => 'db_version')
));
$dbVersion = $this->AdminSetting->getSetting('db_version');
if (!empty($dbVersion) && !empty($dbActualSchema['schema'])) {
$dbVersion = $dbVersion['AdminSetting']['value'];
$data = array(
'schema' => $dbActualSchema['schema'],
'indexes' => $dbActualSchema['indexes'],

13
app/Model/Event.php
View File

@ -3532,15 +3532,14 @@ class Event extends AppModel
public function checkEventBlockRules($event)
{
$this->AdminSetting = ClassRegistry::init('AdminSetting');
$setting = $this->AdminSetting->find('first', [
'conditions' => ['setting' => 'eventBlockRule'],
'recursive' => -1
]);
if (empty($setting) || empty($setting['AdminSetting']['value'])) {
if (!isset($this->AdminSetting)) {
$this->AdminSetting = ClassRegistry::init('AdminSetting');
}
$setting = $this->AdminSetting->getSetting('eventBlockRule');
if (empty($setting)) {
return true;
}
$rules = json_decode($setting['AdminSetting']['value'], true);
$rules = json_decode($setting, true);
if (empty($rules)) {
return true;
}

4
app/Model/Server.php
View File

@ -2756,9 +2756,7 @@ class Server extends AppModel
public function dbSchemaDiagnostic()
{
$this->AdminSetting = ClassRegistry::init('AdminSetting');
$actualDbVersion = $this->AdminSetting->find('first', array(
'conditions' => array('setting' => 'db_version')
))['AdminSetting']['value'];
$actualDbVersion = $this->AdminSetting->getSetting('db_version');
$dataSource = $this->getDataSource()->config['datasource'];
$schemaDiagnostic = array(
'dataSource' => $dataSource,

8
app/Model/User.php
View File

@ -231,12 +231,8 @@ class User extends AppModel
{
parent::__construct($id, $table, $ds);
$this->AdminSetting = ClassRegistry::init('AdminSetting');
$db_version = $this->AdminSetting->find('first', [
'recursive' => -1,
'conditions' => ['setting' => 'db_version'],
'fields' => ['value']
]);
if ($db_version['AdminSetting']['value'] >= 62) {
$db_version = $this->AdminSetting->getSetting('db_version');
if ($db_version >= 62) {
$this->bindModel([
'hasMany' => ['AuthKey']
], false);