From 6299d2352860d15db9097e32fe16603c9b344764 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 14 Mar 2019 17:49:44 +0100
Subject: [PATCH] [Netflow live] Minor fixes

Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
---
 pandora_console/include/functions_graph.php        |  2 ++
 pandora_console/include/functions_netflow.php      | 10 +++++++++-
 pandora_console/operation/netflow/nf_live_view.php |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 6e881a06b9..19e04e39f8 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -4166,6 +4166,8 @@ function graph_netflow_aggregate_area($data, $period, $width, $height, $ttl=1, $
         'array_data_create' => $chart,
         'stacked'           => 1,
         'date'              => $date,
+        'show_export_csv'   => false,
+        'show_overview'     => false,
     ];
 
     return grafico_modulo_sparse($params);
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 76b75f44ae..c89366b1c4 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -1131,7 +1131,15 @@ function netflow_draw_item($start_date, $end_date, $interval_length, $type, $fil
                     $html .= '&nbsp;<b>'._('Resolution').':</b> '.netflow_get_resolution_name($interval_length);
                 }
 
-                $html .= graph_netflow_aggregate_area($data, $interval, $width, $height, 1, false, $end_date);
+                $html .= graph_netflow_aggregate_area(
+                    $data,
+                    $interval,
+                    $width,
+                    $height,
+                    ($output === 'HTML') ? 1 : 2,
+                    ($output === 'HTML'),
+                    $end_date
+                );
                 return $html;
             } else if ($output == 'XML') {
                 $xml .= "<aggregate>$aggregate</aggregate>\n";
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index b9913f6b76..662403c370 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -449,7 +449,7 @@ if (is_metaconsole()) {
     echo '<td><b>'.__('IP address resolution').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).'</td>';
     echo '<td colspan="2">'.$radio_buttons.'</td>';
 
-    echo '<td><b>'.__('Router ip').'</b></td>';
+    echo '<td><b>'.__('Source ip').'</b></td>';
     echo '<td colspan="2">'.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'</td>';
 
     echo '</tr>';