diff --git a/pandora_console/godmode/um_client/index.php b/pandora_console/godmode/um_client/index.php index 20f209e643..c6d1b6d69d 100644 --- a/pandora_console/godmode/um_client/index.php +++ b/pandora_console/godmode/um_client/index.php @@ -70,6 +70,10 @@ if (empty($license) === true) { } $mode_str = ''; +if (isset($mode) === false) { + $mode = null; +} + if ($mode === Manager::MODE_ONLINE) { $mode_str = 'online'; } else if ($mode === Manager::MODE_OFFLINE) { diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php index d324df1120..3f76de4405 100644 --- a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php +++ b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php @@ -1340,18 +1340,17 @@ class Client error_reporting(E_ALL ^ E_NOTICE); set_error_handler( function ($errno, $errstr) { - if (preg_match('/Undefined index/', $errstr) > 1) { - return; - } - throw new \Exception($errstr, $errno); - } + }, + E_ERROR ); register_shutdown_function( function () { $error = error_get_last(); - if (null !== $error) { + if (null !== $error + && $error['type'] === E_ERROR + ) { echo __('Failed to analyze package: %s', $error['message']); } } @@ -1434,7 +1433,8 @@ class Client set_error_handler( function ($errno, $errstr) { throw new \Exception($errstr, $errno); - } + }, + E_ERROR ); if ($package === null) { diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php index cafd94f27c..a3d5677729 100644 --- a/pandora_console/include/config.inc.php +++ b/pandora_console/include/config.inc.php @@ -1,38 +1,54 @@