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

2011-11-28 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2011-11-28 11:35:06 +00:00
parent 51233c78c3
commit 2010058251
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php: Clean deprecated lock policies
code for bug 3437881
2011-11-28 Sergio Martin <sergio.martin@artica.es> 2011-11-28 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_gd.php: Fixed rounded corners * include/graphs/functions_gd.php: Fixed rounded corners

23
pandora_console/include/functions_config.php
View File

@ -238,24 +238,7 @@ function config_update_config () {
config_update_value ('refr', get_parameter('refr', $config['refr'])); config_update_value ('refr', get_parameter('refr', $config['refr']));
config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr'])); config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr']));
$enterprise = enterprise_include_once('include/functions_policies.php'); 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 = enterprise_include_once ('include/functions_skins.php'); $enterprise = enterprise_include_once ('include/functions_skins.php');
if ($enterprise !== ENTERPRISE_NOT_HOOK) { if ($enterprise !== ENTERPRISE_NOT_HOOK) {
$config['relative_path'] = get_parameter('relative_path', $config['relative_path']); $config['relative_path'] = get_parameter('relative_path', $config['relative_path']);
@ -626,10 +609,6 @@ function config_process_config () {
config_update_value ( 'autoupdate', 0); config_update_value ( 'autoupdate', 0);
} }
if (!isset ($config['can_block_policies'])) {
config_update_value ( 'can_block_policies', 0);
}
if (!isset ($config['api_password'])) { if (!isset ($config['api_password'])) {
config_update_value( 'api_password', ''); config_update_value( 'api_password', '');
} }