tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted

This commit is contained in:
fbsanchez 2021-06-01 10:04:53 +02:00
parent b0e3b0aa24
commit a98a72354b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/lib/Module.php
View File

@ -228,8 +228,10 @@ class Module extends Entity
throw $e;
}
if ($this->nombre() === 'delete_pending') {
return null;
if ($this->nombre() === 'delete_pending'
|| $this->nombre() === 'pendingdelete'
) {
throw new \Exception('Object is pending to be deleted', 1);
}
if ($link_agent === true) {

12
pandora_console/index.php
View File

@ -1124,9 +1124,15 @@ if ($searchPage) {
include 'general/noaccess.php';
} else {
$sec = $main_sec;
if (file_exists($page)) {
if (! extensions_is_extension($page)) {
include_once $page;
if (file_exists($page) === true) {
if ((bool) extensions_is_extension($page) === false) {
try {
include_once $page;
} catch (Exception $e) {
ui_print_error_message(
$e->getMessage().' in '.$e->getFile().':'.$e->getLine()
);
}
} else {
if ($sec[0] == 'g') {
extensions_call_godmode_function(basename($page));