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

2012-12-13 Ramon Novoa <rnovoa@artica.es> 

* include/functions_reporting.php,
	  operation/netflow/nf_live_view.php: Fixes to the metaconsole part of
	  the viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2012-12-13 14:49:05 +00:00
parent 834edfad33
commit 25062d6da9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_reporting.php,
operation/netflow/nf_live_view.php: Fixes to the metaconsole part of
the viewer.
2012-12-13 Sancho Lerena <slerena@artica.es>
* operation/agentes/datos_agente.php: Uses "mono" instead

5
pandora_console/include/functions_reporting.php
View File

@ -4922,13 +4922,10 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$description = $filter['id_name'];
}
// Generate a unique id for the cache
$unique_id = netflow_generate_unique_id ($content["type"], $filter, $start_date);
$table->colspan[0][0] = 4;
$table->data[0][0] = '<h4>' . $description . '</h4>';
$table->colspan[1][0] = 4;
$table->data[1][0] = netflow_draw_item ($start_date, $end_date, $resolution, $type, $filter, $max_aggregates, $unique_id, $server_name, 'HTML');
$table->data[1][0] = netflow_draw_item ($start_date, $end_date, $resolution, $type, $filter, $max_aggregates, $server_name, 'HTML');
break;
}
//Restore dbconnection

11
pandora_console/operation/netflow/nf_live_view.php
View File

@ -100,6 +100,9 @@ $start_date = $end_date - $period;
if (! defined ('METACONSOLE')) {
//Header
ui_print_page_header (__('Netflow live view'), "images/networkmap/so_cisco_new.png", false, "", false, array ());
if (! is_executable ($config['netflow_nfdump'])) {
ui_print_error_message(__('nfdump binary not found!'));
}
} else {
$nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')),
array('link' => 'index.php?sec=netf&sec2=operation/netflow/nf_live_view', 'text' => __('Netflow live view')));
@ -143,10 +146,6 @@ else if ($update != '' && check_acl ($config["id_user"], 0, "AW")) {
// The filter name will not be needed anymore
$filter['id_name'] = '';
if (! is_executable ($config['netflow_nfdump'])) {
ui_print_error_message(__('nfdump binary not found!'));
}
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
// Chart options table
@ -179,8 +178,8 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
$table->data[0][9] = html_print_select ($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true);
if (defined ('METACONSOLE')) {
$table->data[0][8] = '<b>'.__('Connection').'</b>';
$table->data[0][9] = html_print_select (metaconsole_get_connection_names (), 'connection_name', $connection_name, '', '', 0, true, false, false);
$table->data[0][10] = '<b>'.__('Connection').'</b>';
$table->data[0][11] = html_print_select (metaconsole_get_connection_names (), 'connection_name', $connection_name, '', '', 0, true, false, false);
}
html_print_table ($table);