From be2b4b7d1073aa0dbbc4ccee81a4364e98d2f611 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Mon, 23 Jan 2012 09:03:57 +0000 Subject: [PATCH] 2012-01-23 Juan Manuel Ramon * include/functions_api.php: Modified get_policy_modules function. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ pandora_console/include/functions_api.php | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 08fbbd0d64..e420e62989 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-01-23 Juan Manuel Ramon + + * include/functions_api.php: Modified get_policy_modules function. + 2012-01-23 Koichiro Kikuchi * include/functions_servers.php: Exclude modules which belong to diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 2e611e1639..b4e8307163 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -980,10 +980,13 @@ function get_policy_modules($thrash1, $thrash2, $other, $thrash3) { returnError('error_policy_modules', 'Error retrieving policy modules. Id_policy cannot be left blank.'); return; } - - $sql = sprintf("select policy.id, policy.name, pol_modules.id id_module FROM tpolicies policy, tpolicy_modules pol_modules where policy.id = pol_modules.id_policy AND policy.id = %d", $other['data'][0]); - - $policies = db_get_all_rows_sql($sql); + + $policies = enterprise_hook('policies_get_modules_api', array($other['data'][0], $other['data'][1])); + + if ($policies === ENTERPRISE_NOT_HOOK){ + returnError('error_policy_modules', 'Error retrieving policy modules.'); + return; + } if (count($policies) > 0 and $policies !== false){ $data = array('type' => 'array', 'data' => $policies);