From b549ab6a35635437be891a68b1ec5b7938430d25 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 2 Jun 2016 12:57:04 +0200 Subject: [PATCH] Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549 (cherry picked from commit db8c7cb4f5dfac3a2e96fe6d8fac8d9e825d6e2d) --- .../godmode/update_manager/update_manager.setup.php | 12 ++++-------- pandora_console/include/ajax/update_manager.ajax.php | 2 ++ pandora_console/include/functions_update_manager.php | 5 +++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php index 0fdabc9188..b318040e13 100644 --- a/pandora_console/godmode/update_manager/update_manager.setup.php +++ b/pandora_console/godmode/update_manager/update_manager.setup.php @@ -29,14 +29,10 @@ $action_update_url_update_manager = (bool)get_parameter( $url_update_manager = get_parameter('url_update_manager', $config['url_update_manager']); -$update_manager_proxy_server = get_parameter('update_manager_proxy_server', - $config['update_manager_proxy_server']); -$update_manager_proxy_port = get_parameter('update_manager_proxy_port', - $config['update_manager_proxy_port']); -$update_manager_proxy_user = get_parameter('update_manager_proxy_user', - $config['update_manager_proxy_user']); -$update_manager_proxy_password = get_parameter('update_manager_proxy_password', - $config['update_manager_proxy_password']); +$update_manager_proxy_server = get_parameter('update_manager_proxy_server'); +$update_manager_proxy_port = get_parameter('update_manager_proxy_port'); +$update_manager_proxy_user = get_parameter('update_manager_proxy_user'); +$update_manager_proxy_password = get_parameter('update_manager_proxy_password'); if ($action_update_url_update_manager) { diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php index 76187eaaff..dcf0ebf7e1 100644 --- a/pandora_console/include/ajax/update_manager.ajax.php +++ b/pandora_console/include/ajax/update_manager.ajax.php @@ -105,6 +105,7 @@ if ($upload_file) { } if ($install_package) { + global $config; ob_clean(); $package = (string) get_parameter("package"); @@ -224,6 +225,7 @@ if ($install_package) { } update_manager_enterprise_set_version($version); + db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']); $return["status"] = "success"; echo json_encode($return); diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php index 7064ef1fe7..b4ec1c2ae7 100755 --- a/pandora_console/include/functions_update_manager.php +++ b/pandora_console/include/functions_update_manager.php @@ -179,12 +179,13 @@ function update_manager_install_package_step2() { return; } + update_manager_enterprise_set_version($version); + db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']); + $return["status"] = "success"; $return["message"]= __("The package is installed."); echo json_encode($return); - update_manager_enterprise_set_version($version); - return; }