From 43c7dfe3832c8a11b9bcd6fccd26894cd2e0bb7f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 21 Jun 2023 18:15:18 +0200 Subject: [PATCH 1/2] #11589 fixed generate pdf graph --- pandora_console/include/chart_generator.php | 50 +++++++++---------- pandora_console/include/functions.php | 13 +++-- .../include/graphs/functions_flot.php | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 2695b89c22..2f1ea1d5b3 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -142,31 +142,31 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { Pandora FMS Graph - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + ;'> createPage(); + $curl = curl_init(); - // Navigate to an URL. - $navigation = $page->navigate($url.'?data='.urlencode(json_encode($data))); - $navigation->waitForNavigation(Page::DOM_CONTENT_LOADED); + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_POSTFIELDS, ['data' => json_encode($data)]); + + $response = curl_exec($curl); + + curl_close($curl); + + $page->setHtml($response); // Dynamic. $dynamic_height = $page->evaluate('document.getElementById("container-chart-generator-item").clientHeight')->getReturnValue(); diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index d1856b7b4c..97f254b021 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -755,7 +755,7 @@ function flot_slicesbar_graph( 'date_to' => $date_to, 'server_id' => $server_id, ]; - // TO-DO Cambiar esto para que se pase por POST, NO SE PUEDE PASAR POR GET. + update_check_config_token($tokem_config, json_encode($graph_data)); $_SESSION['slicebar'] = $tokem_config; $_SESSION['slicebar_value'] = json_encode($graph_data); From 6fb72de3ff64589f0bf54c332ece18ad50608b7f Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 22 Jun 2023 09:28:07 +0200 Subject: [PATCH 2/2] #11589 fixed generate pdf graph in metaconsole --- pandora_console/include/chart_generator.php | 51 +++++++++++---------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index 2f1ea1d5b3..7c603322cc 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -136,37 +136,38 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { $l10n->load_tables(); } +$hack_metaconsole = (is_metaconsole() === true) ? '../../' : ''; ?> Pandora FMS Graph - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + ;'>