From aa4f13d17ac65f39ccbefbd02d51bcaf61a40050 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 20 Jun 2018 11:31:43 +0200 Subject: [PATCH] fixed errors in graphs --- pandora_console/include/chart_generator.php | 21 ++++++++++++------- pandora_console/include/functions.php | 6 ++++-- .../include/graphs/flot/pandora.flot.js | 11 +++++++--- .../include/graphs/functions_flot.php | 2 +- pandora_console/include/web2image.js | 18 +++++++++------- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 3291cd2519..f23107f39c 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -14,8 +14,8 @@ // Global & session manageme session_id($_REQUEST["session_id"]); -if (file_exists(session_save_path() . "/pansess_" . session_id())) { - $user = file_request_contents(session_save_path() . "/pansess_" . session_id()); +if (file_exists(session_save_path() . "/pansess_" . session_id()) ) { + $user = file_get_contents(session_save_path() . "/pansess_" . session_id()); } session_start(); if (isset($user)) { @@ -24,6 +24,7 @@ if (isset($user)) { session_write_close(); + require_once ('config.php'); require_once ($config['homedir'] . '/include/auth/mysql.php'); require_once ($config['homedir'] . '/include/functions.php'); @@ -38,13 +39,15 @@ require_once ($config['homedir'] . '/include/functions_tags.php'); check_login(); global $config; +//get_parameter(array)('data', ''); $params = json_decode($_REQUEST['data'], true); + // Metaconsole connection to the node $server_id = $params['server_id']; if ($config["metaconsole"] && !empty($server_id)) { - $server = metaconsole_request_connection_by_id($server_id); + $server = metaconsole_get_connection_by_id($server_id); // Error connecting if (metaconsole_connect($server) !== NOERR) { echo ""; @@ -68,7 +71,7 @@ if (file_exists ('languages/'.$user_language.'.mo')) { - Pandora FMS Graph (<?php echo agents_request_alias($agent_id) . ' - ' . $interface_name; ?>) + Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>) @@ -94,12 +97,11 @@ if (file_exists ('languages/'.$user_language.'.mo')) { '; echo graphic_combined_module( @@ -121,6 +126,8 @@ if (file_exists ('languages/'.$user_language.'.mo')) { echo grafico_modulo_sparse($params); echo ''; } + + $config['font_size'] = $aux_font_size; ?> diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 36ec32f746..854d7ef9cf 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3217,7 +3217,7 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal global $config; $file_js = $config["homedir"] . "/include/web2image.js"; - $url = $config["homeurl"] . "/include/chart_generator.php"; + $url = $config["homeurl"] . "include/chart_generator.php"; $img_file = "img_". uniqid() .".png"; $img_path = $config["homedir"] . "/attachment/" . $img_file; $img_url = $config["homeurl"] . "attachment/" . $img_file; @@ -3225,6 +3225,8 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal $width_img = 500; $height_img = (isset($config['graph_image_height'])) ? $config['graph_image_height'] : 350; + $params['height'] = $height_img; + $params_encode_json = urlencode(json_encode($params)); if($params_combined){ @@ -3259,7 +3261,7 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined = fal else{ // to be used in PDF files $config["temp_images"][] = $img_path; - return ''; + return ''; } } diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 796d17c196..06e6174e64 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1638,7 +1638,8 @@ function pandoraFlotArea( graph_id, values, legend, font: { size: font_size + 2, color: legend_color, - family: font+'Font' + family: font+'Font', + variant: "small-caps" }, }, yaxes: [{ @@ -1933,9 +1934,8 @@ function pandoraFlotArea( graph_id, values, legend, $('#legend_' + graph_id).height()); $('#timestamp_'+graph_id).css('color', legend_color); - $('#timestamp_'+graph_id).css('font-size', font_size + 2); + $('#timestamp_'+graph_id).css('font-size', font_size + 2+'px'); $('#timestamp_'+graph_id).css('font-family', font + 'Font'); - $('#timestamp_'+graph_id).css('color', legend_color); if (timesize+timenewpos > canvaslimit) { $('#timestamp_'+graph_id).css('left', timenewpos - timesize); @@ -1998,6 +1998,8 @@ function pandoraFlotArea( graph_id, values, legend, } $('#legend_' + graph_id + ' .legendLabel').eq(i).css('color', legend_color); + $('#legend_' + graph_id + ' .legendLabel').eq(i).css('font-size', font_size + 2 +'px'); + $('#legend_' + graph_id + ' .legendLabel').eq(i).css('font-family', font + 'Font'); i++; } @@ -2164,6 +2166,9 @@ function pandoraFlotArea( graph_id, values, legend, .eq(i).html(label_aux); } $('#legend_' + graph_id + ' .legendLabel').css('color', legend_color); + $('#legend_' + graph_id + ' .legendLabel').css('font-size', font_size + 2 +'px'); + $('#legend_' + graph_id + ' .legendLabel').css('font-family', font + 'Font'); + plot.clearCrosshair(); if(!vconsole){ overview.clearCrosshair(); diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 7e403efba8..87e7b0d9ea 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -137,7 +137,7 @@ function flot_area_graph ( $return = "
"; // Set some containers to legend, graph, timestamp tooltip, etc. if($params['show_legend']){ - $return .= "

"; + $return .= "

"; } if(isset($params['graph_combined']) && $params['graph_combined'] && (!isset($params['from_interface']) || !$params['from_interface']) ){ diff --git a/pandora_console/include/web2image.js b/pandora_console/include/web2image.js index 8b548fcbd1..6c2edeb47c 100644 --- a/pandora_console/include/web2image.js +++ b/pandora_console/include/web2image.js @@ -31,20 +31,23 @@ if(type_graph_pdf == 'combined'){ "&data_combined=" + url_params_comb + "&data_module_list=" + url_module_list + "&type_graph_pdf=" + type_graph_pdf + - "&session_id=" + session_id + - "&viewport_width=" + viewport_width; + "&session_id=" + session_id; } else{ post_data = "data=" + url_params + "&type_graph_pdf=" + type_graph_pdf + - "&session_id=" + session_id + - "&viewport_width=" + viewport_width; + "&session_id=" + session_id; } -page.viewportSize = { width: _width, height: _height }; -//page.zoomFactor = 1.75; +page.viewportSize = { + width: viewport_width, + height: viewport_height +}; +page.zoomFactor = 1; -page.open(post_data, 'POST', post_data, function start(status) {}); +page.open(url, 'POST', post_data, function start(status) { + +}); page.onLoadFinished = function (status) { if(!base_64){ @@ -52,6 +55,7 @@ page.onLoadFinished = function (status) { } else{ var base64 = page.renderBase64('png'); + //XXXX console.log(base64); } phantom.exit();