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

2013-06-07 Sergio Martin <sergio.martin@artica.es> 

* 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




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8277 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-06-07 12:28:20 +00:00
parent 3af367e9b4
commit 2a2c79e0b0
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-06-07 Sergio Martin <sergio.martin@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: fixed the link of the

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

@ -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')) {
<td valign="middle">' . __('Group') . '</td>
<td valign="middle">' .
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;') . '
</td>';
}
@ -331,7 +334,7 @@ else {
<td valign="middle">' . __('Group') . '</td>
<td valign="middle">' .
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;') . '
</td>';
}

8
pandora_console/operation/menu.php
View File

@ -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']."&amp;hashup=".$hashup]["text"] = __('RSS');
$sub["operation/events/events_rss.php?user=".$config['id_user']."&amp;hashup=".$hashup]["type"] = "direct";
$sub["operation/events/events_rss.php?user=".$config['id_user']."&amp;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&section=list&open_filter=0&pure="]["text"] = __('RSS');
$sub["operation/events/events_rss.php?user=".$config['id_user']."&amp;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&section=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&section=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&section=list&open_filter=0&pure="]["type"] = "direct";
//Marquee
$sub["operation/events/events_marquee.php"]["text"] = __('Marquee');