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

Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549

This commit is contained in:
m-lopez-f 2016-06-02 12:57:04 +02:00
parent 0acf4f41eb
commit db8c7cb4f5
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -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) {

2
pandora_console/include/ajax/update_manager.ajax.php
View File

@ -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);

5
pandora_console/include/functions_update_manager.php
View File

@ -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;
}