From 201005825188d455ccb9ac52675e3ad487d50949 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 28 Nov 2011 11:35:06 +0000 Subject: [PATCH] 2011-11-28 Sergio Martin * include/functions_config.php: Clean deprecated lock policies code for bug 3437881 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_config.php | 23 +------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6c53fbf600..cd0a391f12 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-11-28 Sergio Martin + + * include/functions_config.php: Clean deprecated lock policies + code for bug 3437881 + 2011-11-28 Sergio Martin * include/graphs/functions_gd.php: Fixed rounded corners diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 54e2b68262..4c6134ab62 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -238,24 +238,7 @@ function config_update_config () { config_update_value ('refr', get_parameter('refr', $config['refr'])); config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr'])); - $enterprise = enterprise_include_once('include/functions_policies.php'); - if ($enterprise !== ENTERPRISE_NOT_HOOK) { - $locked = enterprise_hook('policies_semaphore_test_and_set'); - if ($locked) { - db_pandora_audit("Policy management", "BLOCK policies for change tconfig['can_block_policies'] by " . $config['id_user']); - - config_update_value ('can_block_policies', get_parameter('can_block_policies', $config['can_block_policies'])); - - db_pandora_audit("Policy management", "UNBLOCK policies for change tconfig['can_block_policies'] by " . $config['id_user']); - enterprise_hook('policies_semaphore_unlock'); - } - else { - db_pandora_audit("Policy management", "Try to BLOCK policies for change tconfig['can_block_policies'] by " . $config['id_user']); - } - } - else { - config_update_value ('can_block_policies', get_parameter('can_block_policies', $config['can_block_policies'])); - } + enterprise_include_once('include/functions_policies.php'); $enterprise = enterprise_include_once ('include/functions_skins.php'); if ($enterprise !== ENTERPRISE_NOT_HOOK) { $config['relative_path'] = get_parameter('relative_path', $config['relative_path']); @@ -626,10 +609,6 @@ function config_process_config () { config_update_value ( 'autoupdate', 0); } - if (!isset ($config['can_block_policies'])) { - config_update_value ( 'can_block_policies', 0); - } - if (!isset ($config['api_password'])) { config_update_value( 'api_password', ''); }