From 14d78421a933fd96e9a95cbb7870c1167969e45f Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Wed, 20 May 2020 10:00:38 +0200
Subject: [PATCH] Fixed errors in vartical and gauges graph

---
 pandora_console/include/functions_graph.php     |  4 ++--
 pandora_console/include/functions_reporting.php | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 9302c4ce94..5a1d482e1d 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1989,8 +1989,8 @@ function graphic_combined_module(
             $color = color_graph_array();
 
             if ($params['vconsole'] === false) {
-                $width = 200;
-                $height = 200;
+                $new_width = 200;
+                $new_height = 200;
             } else {
                 $ratio = ((200 * ( $height / (200 * $number_elements) )) / (200 * ( $width / (200 * $number_elements))));
 
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 98eb1b5025..7869e8f6e7 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -7788,8 +7788,9 @@ function reporting_custom_graph(
                 'labels'         => $content['style']['label'],
             ];
 
+            $return['chart'] = '';
             if ($pdf === true) {
-                $return['chart'] = '<img src="data:image/jpg;base64,';
+                $return['chart'] .= '<img src="data:image/jpg;base64,';
                 $return['chart'] .= graphic_combined_module(
                     $modules,
                     $params,
@@ -7797,11 +7798,18 @@ function reporting_custom_graph(
                 );
                 $return['chart'] .= '" />';
             } else {
-                $return['chart'] = graphic_combined_module(
+                if ($graphs[0]['stacked'] == CUSTOM_GRAPH_VBARS) {
+                    $return['chart'] .= '<div style="height:'.$config['graph_image_height'].'px;">';
+                }
+
+                $return['chart'] .= graphic_combined_module(
                     $modules,
                     $params,
                     $params_combined
                 );
+                if ($graphs[0]['stacked'] === CUSTOM_GRAPH_VBARS) {
+                    $return['chart'] .= '</div>';
+                }
             }
         break;