diff --git a/pandora_console/include/lib/Module.php b/pandora_console/include/lib/Module.php index 4a49bd5435..229025b338 100644 --- a/pandora_console/include/lib/Module.php +++ b/pandora_console/include/lib/Module.php @@ -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) { diff --git a/pandora_console/index.php b/pandora_console/index.php index b42fb3e1fb..0f50391be1 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -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));