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

2012-08-02 Sergio Martin <sergio.martin@artica.es> 

* include/functions_api.php: Fixed broken return of
	the get module from conf function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6841 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-08-02 10:46:43 +00:00
parent 8c677f654b
commit b68b34b37a
2 changed files with 8 additions and 3 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 @@
2012-08-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Fixed broken return of
the get module from conf function
2012-08-02 Sergio Martin <sergio.martin@artica.es> 2012-08-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Change the return of the * include/functions_api.php: Change the return of the

6
pandora_console/include/functions_api.php
View File

@ -3243,16 +3243,16 @@ function api_set_add_module_in_conf($id_agent, $module_name, $configuration_data
* *
* api.php?op=get&op2=module_from_conf&user=admin&pass=pandora&id=9043&id2=example_name * api.php?op=get&op2=module_from_conf&user=admin&pass=pandora&id=9043&id2=example_name
* *
* @return string 0 when success, -1 when error * @return string Module data when success, empty when error
*/ */
function api_get_module_from_conf($id_agent, $module_name, $thrash2, $thrash3) { function api_get_module_from_conf($id_agent, $module_name, $thrash2, $thrash3) {
$result = enterprise_hook('config_agents_get_module_from_conf', array($id_agent, io_safe_output($module_name))); $result = enterprise_hook('config_agents_get_module_from_conf', array($id_agent, io_safe_output($module_name)));
if($result !== ENTERPRISE_NOT_HOOK) { if($result !== ENTERPRISE_NOT_HOOK) {
returnData('string', array('type' => 'string', 'data' => '0')); returnData('string', array('type' => 'string', 'data' => $result));
} }
else { else {
returnError('error_adding_module_conf', '-1'); returnError('error_adding_module_conf', '');
} }
} }