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

2013-01-29 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/groups/group_list.php, include/ajax/events.php,
	include/functions_api.php: improved the style code.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-01-29 18:03:08 +00:00
parent 3ccd6225d2
commit 3b22a943a8
4 changed files with 66 additions and 87 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 @@
2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php, include/ajax/events.php,
include/functions_api.php: improved the style code.
2013-01-29 Dario Rodriguez <dario@artica.es> 2013-01-29 Dario Rodriguez <dario@artica.es>
* images/pandora_report_logo.png: Added new images missed for * images/pandora_report_logo.png: Added new images missed for

29
pandora_console/godmode/groups/group_list.php
View File

@ -87,37 +87,8 @@ if (is_ajax ()) {
$filter['string'] = $search; $filter['string'] = $search;
} }
/*if ($config['metaconsole'] == 1) {
enterprise_include_once('include/functions_metaconsole.php');
$connection_names = enterprise_hook('metaconsole_get_connection_names');
if ($connection_names === false)
$connection_names = array();
$agents_tmp = array();
$agents = array();
foreach ($connection_names as $connection) {
$connection_data = enterprise_hook('metaconsole_get_connection', array($connection));
$connection_result = enterprise_hook('metaconsole_load_external_db', array($connection_data));
if ($connection_result == NOERR) {
$agents_tmp = agents_get_group_agents ($id_group, $filter, "none", false, $recursion);
if ($agents_tmp === false)
$agents_tmp = array();
foreach ($agents_tmp as $agent_key => $agent_name) {
$agents[$connection_data['server_name'] . '|' . $agent_key] = $agent_name;
}
}
enterprise_hook('metaconsole_restore_db');
}
}
else { */
$agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion); $agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion);
//}
echo json_encode ($agents); echo json_encode ($agents);
return; return;

3
pandora_console/include/functions_api.php
View File

@ -3530,16 +3530,19 @@ function api_set_update_snmp_module_policy($id, $thrash1, $other, $thrash3) {
if ($other['data'][21] != "AES" and $other['data'][21] != "DES"){ if ($other['data'][21] != "AES" and $other['data'][21] != "DES"){
returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_priv_method doesn\'t exists. Set it to \'AES\' or \'DES\'. ')); returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_priv_method doesn\'t exists. Set it to \'AES\' or \'DES\'. '));
return; return;
} }
if ($other['data'][23] != "authNoPriv" and $other['data'][23] != "authPriv" and $other['data'][23] != "noAuthNoPriv"){ if ($other['data'][23] != "authNoPriv" and $other['data'][23] != "authPriv" and $other['data'][23] != "noAuthNoPriv"){
returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_sec_level doesn\'t exists. Set it to \'authNoPriv\' or \'authPriv\' or \'noAuthNoPriv\'. ')); returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_sec_level doesn\'t exists. Set it to \'authNoPriv\' or \'authPriv\' or \'noAuthNoPriv\'. '));
return; return;
} }
if ($other['data'][24] != "MD5" and $other['data'][24] != "SHA"){ if ($other['data'][24] != "MD5" and $other['data'][24] != "SHA"){
returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_auth_method doesn\'t exists. Set it to \'MD5\' or \'SHA\'. ')); returnError('error_update_snmp_module_policy', __('Error updating SNMP module. snmp3_auth_method doesn\'t exists. Set it to \'MD5\' or \'SHA\'. '));
return; return;
} }