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

2013-10-14 Miguel de Dios <miguel.dedios@artica.es> 

* operation/agentes/status_monitor.php: fixed the filter by group
	in the metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8908 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-14 12:36:41 +00:00
parent 70c57a4b3c
commit e3f33a6340
2 changed files with 19 additions and 4 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-10-14 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/status_monitor.php: fixed the filter by group
in the metaconsole.
2013-10-14 Ramon Novoa <rnovoa@artica.es> 2013-10-14 Ramon Novoa <rnovoa@artica.es>
* operation/snmpconsole/snmp_view.php: Made the SNMP trap viewer look * operation/snmpconsole/snmp_view.php: Made the SNMP trap viewer look

16
pandora_console/operation/agentes/status_monitor.php
View File

@ -47,7 +47,14 @@ else {
$ag_freestring = get_parameter ('ag_freestring'); $ag_freestring = get_parameter ('ag_freestring');
$ag_modulename = (string) get_parameter ('ag_modulename'); $ag_modulename = (string) get_parameter ('ag_modulename');
$ag_group = (int) get_parameter ('ag_group', 0); if (!defined('METACONSOLE')) {
$ag_group = (int) get_parameter ('ag_group', 0);
}
else {
$ag_group = get_parameter ('ag_group', 0);
$ag_group_metaconsole = $ag_group;
}
$offset = (int) get_parameter ('offset', 0); $offset = (int) get_parameter ('offset', 0);
$status = (int) get_parameter ('status', 4); $status = (int) get_parameter ('status', 4);
$modulegroup = (int) get_parameter ('modulegroup', -1); $modulegroup = (int) get_parameter ('modulegroup', -1);
@ -180,7 +187,7 @@ $groups = users_get_groups($config["id_user"]);
$sql_conditions_tags = tags_get_acl_tags($config['id_user'], array_keys($groups), 'AR', 'module_condition', 'AND', 'tagente_modulo'); $sql_conditions_tags = tags_get_acl_tags($config['id_user'], array_keys($groups), 'AR', 'module_condition', 'AND', 'tagente_modulo');
if(is_numeric($sql_conditions_tags)) { if (is_numeric($sql_conditions_tags)) {
$sql_conditions_tags = ' AND 1 = 0'; $sql_conditions_tags = ' AND 1 = 0';
} }
@ -330,6 +337,9 @@ if (defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
unset($groups_select[__('All')]); unset($groups_select[__('All')]);
$key_group_all = array_search(__('All'), $groups_select);
if ($key_group_all !== false)
unset($groups_select[$key_group_all]);
} }
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
@ -346,7 +356,7 @@ else {
<td valign="middle">' . __('Group') . '</td> <td valign="middle">' . __('Group') . '</td>
<td valign="middle">' . <td valign="middle">' .
html_print_select($groups_select, "ag_group", html_print_select($groups_select, "ag_group",
io_safe_output($ag_group), '', __('All'), '0', true, false, false, 'w130', io_safe_output($ag_group_metaconsole), '', __('All'), '0', true, false, false, 'w130',
false, 'width:150px;') . ' false, 'width:150px;') . '
</td>'; </td>';
} }