From ea57c58f40bae722da8533efe0f1ee5c70f11f06 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Mon, 5 Jul 2021 11:34:32 +0200
Subject: [PATCH] set default font size on graph modules when is send in mails

---
 pandora_console/godmode/alerts/alert_list.list.php | 2 +-
 pandora_console/include/ajax/alert_list.ajax.php   | 2 +-
 pandora_console/include/functions_api.php          | 4 ++++
 pandora_console/include/functions_graph.php        | 6 +++++-
 pandora_console/include/styles/pandora_black.css   | 4 +++-
 pandora_server/lib/PandoraFMS/Core.pm              | 4 ++--
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 399bb55cfd..7025433316 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -708,7 +708,7 @@ foreach ($simple_alerts as $alert) {
 
         $data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible left">';
             $data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post">';
-                $data[3] .= '<table class="databox_color w100p">';
+                $data[3] .= '<table class="databox_color w100p bg_color222">';
                     $data[3] .= html_print_input_hidden('add_action', 1, true);
                     $data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true);
 
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index 73971caa9c..0d39b7733d 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -423,7 +423,7 @@ if ($show_update_action_menu) {
     );
 
     $data .= '<form id="update_action-'.$alert['id'].'" method="post">';
-    $data .= '<table class="databox_color w100p">';
+    $data .= '<table class="databox_color w100p bg_color222">';
         $data .= html_print_input_hidden(
             'update_action',
             1,
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 03fb8b9be2..db60cbef1c 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -14532,6 +14532,9 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4)
 
         // Graph width (optional).
         $width = (!empty($other) && isset($other['data'][4]) && $other['data'][4]) ? $other['data'][4] : '';
+
+        // If recive value its from mail call.
+        $graph_font_size = $other['data'][5];
     } else {
         // Fixed parameters for _modulegraph_nh_.
         $graph_seconds = $other['data'];
@@ -14568,6 +14571,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4)
         'fullscale'          => false,
         'return_img_base_64' => true,
         'image_treshold'     => $graph_threshold,
+        'graph_font_size'    => $graph_font_size,
     ];
 
     // Format MIME RFC 2045 (line break 76 chars).
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index a5463283db..d18db7e096 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -829,7 +829,11 @@ function grafico_modulo_sparse($params)
         $params['stacked'] = 0;
     }
 
-    $font_size = $config['font_size'];
+    if (isset($params['graph_font_size']) === true) {
+        $font_size = $params['graph_font_size'];
+    } else {
+        $font_size = $config['font_size'];
+    }
 
     // If is metaconsole set 10pt size value.
     if (is_metaconsole()) {
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 63a0bb6e85..80151c9cbd 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -308,6 +308,7 @@ table.black_table_modal_alternate tr:nth-child(even) td {
 .action_buttons input[type="image"],
 .action_button_img {
   filter: brightness(4.5) contrast(50%);
+  background-color: transparent !important;
 }
 
 a.pandora_pagination {
@@ -657,7 +658,8 @@ form ul.form_flex {
 
 .graph_conteiner_inside,
 .container_table,
-.second_background {
+.second_background,
+.bg_color222 {
   background-color: #222;
 }
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index b24d6696a1..28fd2773b4 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1424,11 +1424,11 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 			my $threshold = shift;
 			my $period = $hours * 3600; # Hours to seconds
 			if($threshold == 0){
-				$params->{"other"} = $period . '%7C1%7C0%7C225';
+				$params->{"other"} = $period . '%7C1%7C0%7C225%7C""%7C14';
 				$cid = 'module_graph_' . $hours . 'h';
 			}
 			else{
-				$params->{"other"} = $period . '%7C1%7C1%7C225';
+				$params->{"other"} = $period . '%7C1%7C1%7C225%7C""%7C14';
 				$cid = 'module_graphth_' . $hours . 'h';
 			}