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

chg: [module] Remove unused variable from Module::getModules method

pull/6483/head
Jakub Onderka 2020-10-22 12:54:23 +02:00
parent 8db2c4b574
commit 8da3679c73
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/Module.php
View File

@ -82,8 +82,7 @@ class Module extends AppModel
return true;
}
public function getModules($type = false, $moduleFamily = 'Enrichment', &$exception = false)
public function getModules($moduleFamily = 'Enrichment', &$exception = false)
{
$modules = $this->queryModuleServer('/modules', false, false, $moduleFamily, $exception);
if (!$modules) {
@ -99,7 +98,7 @@ class Module extends AppModel
public function getEnabledModules($user, $type = false, $moduleFamily = 'Enrichment')
{
$modules = $this->getModules($type, $moduleFamily);
$modules = $this->getModules($moduleFamily);
if (is_array($modules)) {
foreach ($modules['modules'] as $k => $module) {
if (!Configure::read('Plugin.' . $moduleFamily . '_' . $module['name'] . '_enabled') || ($type && !in_array(strtolower($type), $module['meta']['module-type']))) {
@ -156,7 +155,7 @@ class Module extends AppModel
throw new InvalidArgumentException("Invalid type '$type'.");
}
$moduleFamily = $this->__typeToFamily[$type];
$modules = $this->getModules($type, $moduleFamily);
$modules = $this->getModules($moduleFamily);
if (!Configure::read('Plugin.' . $moduleFamily . '_' . $name . '_enabled')) {
return 'The requested module is not enabled.';
}
@ -255,7 +254,7 @@ class Module extends AppModel
public function getModuleSettings($moduleFamily = 'Enrichment')
{
$modules = $this->getModules(false, $moduleFamily);
$modules = $this->getModules($moduleFamily);
$result = array();
if (!empty($modules['modules'])) {
foreach ($modules['modules'] as $module) {

3
app/Model/Server.php
View File

@ -5228,11 +5228,10 @@ class Server extends AppModel
public function moduleDiagnostics(&$diagnostic_errors, $type = 'Enrichment')
{
$this->Module = ClassRegistry::init('Module');
$types = array('Enrichment', 'Import', 'Export', 'Cortex');
$diagnostic_errors++;
if (Configure::read('Plugin.' . $type . '_services_enable')) {
$exception = false;
$result = $this->Module->getModules(false, $type, $exception);
$result = $this->Module->getModules($type, $exception);
if ($exception) {
return $exception;
}