diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f7626ed6f9..942b599f40 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2013-06-07 Sergio Martin + + * operation/menu.php: Fixed CSV and RSS links + from submenu setting the default filters: 8 hours, + pagination of 20, etc. + + * operation/agentes/status_monitor.php: Added All option + to the group filter in monitor view and other little fixes + 2013-06-07 Miguel de Dios * godmode/reporting/reporting_builder.php: fixed the link of the diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index ea9f7430d6..0c172c785e 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -15,7 +15,6 @@ // GNU General Public License for more details. - // Load global vars global $config; @@ -163,12 +162,16 @@ if ($tag_filter !== 0) { } } -if (defined('METACONSOLE')) { +if (defined('METACONSOLE') && $ag_group !== 0) { $ag_group = groups_get_id($ag_group); } $sql_conditions_tags = tags_get_acl_tags($config['id_user'], $ag_group, 'AR', 'module_condition', 'AND', 'tagente_modulo'); +if(is_numeric($sql_conditions_tags)) { + $sql_conditions_tags = ' AND 1 = 0'; +} + // Two modes of filter. All the filters and only ACLs filter $sql_conditions_all = $sql_conditions_base . $sql_conditions . $sql_conditions_group . $sql_conditions_tags; $sql_conditions_acl = $sql_conditions_base . $sql_conditions_group . $sql_conditions_tags; @@ -322,7 +325,7 @@ if (!defined('METACONSOLE')) { ' . __('Group') . ' ' . html_print_select_groups(false, "AR", true, "ag_group", - $ag_group, '', '', '0', true, false, false, 'w130', + $ag_group, '', __('All'), '0', true, false, false, 'w130', false, 'width:150px;') . ' '; } @@ -331,7 +334,7 @@ else { ' . __('Group') . ' ' . html_print_select($groups_select, "ag_group", - io_safe_output($ag_group), '', '', '0', true, false, false, 'w130', + io_safe_output($ag_group), '', __('All'), '0', true, false, false, 'w130', false, 'width:150px;') . ' '; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index a03f8dbcb2..e1d3e01ee4 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -234,12 +234,12 @@ if (check_acl ($config['id_user'], 0, "ER")) { $pss = get_user_info($config['id_user']); $hashup = md5($config['id_user'].$pss['password']); - $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["text"] = __('RSS'); - $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["type"] = "direct"; + $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup."&search=&event_type=&severity=-1&status=3&ev_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure="]["text"] = __('RSS'); + $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup."&search=&event_type=&severity=-1&status=3&ev_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure="]["type"] = "direct"; //CSV - $sub["operation/events/export_csv.php"]["text"] = __('CSV File'); - $sub["operation/events/export_csv.php"]["type"] = "direct"; + $sub["operation/events/export_csv.php?search=&event_type=&severity=-1&status=3&ev_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure="]["text"] = __('CSV File'); + $sub["operation/events/export_csv.php?search=&event_type=&severity=-1&status=3&ev_group=0&refr=0&id_agent=0&pagination=20&group_rep=1&event_view_hr=8&id_user_ack=0&tag_with=&tag_without=&filter_only_alert-1&offset=0&toogle_filter=no&filter_id=0&id_name=&id_group=0&history=0§ion=list&open_filter=0&pure="]["type"] = "direct"; //Marquee $sub["operation/events/events_marquee.php"]["text"] = __('Marquee');