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

fix: [internal] Class 'Folder' not found

pull/8164/head
Jakub Onderka 2022-02-23 16:29:56 +01:00
parent 8424b2637f
commit 3dc40aa33e
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/Model/Dashboard.php
View File

@ -29,7 +29,13 @@ class Dashboard extends AppModel
)
);
public function loadWidget($user, $name, $returnOnException = false)
/**
* @param array $user
* @param string $name
* @param bool $returnOnException
* @return false|mixed
*/
public function loadWidget(array $user, $name, $returnOnException = false)
{
$name = str_replace('/', '', $name);
if (file_exists(APP . 'Lib/Dashboard/' . $name . '.php')) {
@ -37,14 +43,17 @@ class Dashboard extends AppModel
} else if (file_exists(APP . 'Lib/Dashboard/Custom/' . $name . '.php')) {
App::uses($name, 'Dashboard/Custom');
} else {
$customdir = new Folder(APP . 'Lib/Dashboard/Custom');
$subDirectories = $customdir->read();
$found = false;
foreach ($subDirectories[0] as $subDir) {
if (file_exists(APP . 'Lib/Dashboard/Custom/' . $subDir . '/' . $name . '.php')) {
App::uses($name, 'Dashboard/Custom/' . $subDir);
$found = true;
break;
if (file_exists(APP . 'Lib/Dashboard/Custom')) {
App::uses('Folder', 'Utility');
$customdir = new Folder(APP . 'Lib/Dashboard/Custom');
$subDirectories = $customdir->read();
foreach ($subDirectories[0] as $subDir) {
if (file_exists(APP . 'Lib/Dashboard/Custom/' . $subDir . '/' . $name . '.php')) {
App::uses($name, 'Dashboard/Custom/' . $subDir);
$found = true;
break;
}
}
}
if (!$found) {
@ -55,13 +64,11 @@ class Dashboard extends AppModel
}
}
$widget = new $name();
if (method_exists($widget, 'checkPermissions')) {
if (!$widget->checkPermissions($user)) {
if ($returnOnException) {
return false;
}
throw new NotFoundException(__('Invalid widget or widget not found.'));
if (method_exists($widget, 'checkPermissions') && !$widget->checkPermissions($user)) {
if ($returnOnException) {
return false;
}
throw new NotFoundException(__('Invalid widget or widget not found.'));
}
return $widget;
}
@ -72,12 +79,12 @@ class Dashboard extends AppModel
'/',
'/Custom'
);
App::uses('Folder', 'Utility');
$customdir = new Folder(APP . 'Lib/Dashboard/Custom');
$subDirectories = $customdir->read();
foreach ($subDirectories[0] as $subDir) {
$paths[] = '/Custom/' . $subDir;
}
$widgetMeta = array();
$widgets = array();
foreach ($paths as $path) {
$currentDir = new Folder(APP . 'Lib/Dashboard' . $path);