tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop' 

Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
This commit is contained in:
Daniel Rodriguez 2021-03-05 12:53:24 +00:00
parent ea7c7c88b2 cfded31e1b
commit 84da313641
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/chart_generator.php
View File

@ -178,14 +178,19 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params_combined = json_decode($data_combined, true);
$module_list = json_decode($data_module_list, true);
$type_graph_pdf = $type_graph_pdf;
if (isset($params['vconsole']) === false || $params['vconsole'] === false) {
$params['width'] = (int) $viewport_width;
if ((int) $viewport_width > 0) {
$params['width'] = (int) $viewport_width;
}
if ((isset($params['width']) === false
|| ($params['width'] <= 0))
) {
$params['width'] = 650;
if ((int) $params['width'] <= 0) {
$params['width'] = 650;
}
if ((int) $params['landscape'] === 1) {
$params['width'] = 850;
}

16
pandora_console/include/functions_api.php
View File

@ -13908,18 +13908,30 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4)
return;
}
$user_defined = false;
if (is_array($other['data']) === true) {
$user_defined = true;
// Parameters received by user call.
$graph_seconds = (!empty($other) && isset($other['data'][0])) ? $other['data'][0] : SECONDS_1HOUR;
// Base64.
$base64 = $other['data'][1];
// 1 hour by default.
$graph_threshold = (!empty($other) && isset($other['data'][2]) && $other['data'][2]) ? $other['data'][2] : 0;
// Graph height when send email by alert
$height = (!empty($other) && isset($other['data'][3]) && $other['data'][3]) ? $other['data'][3] : 225;
// Graph width (optional).
$width = (!empty($other) && isset($other['data'][4]) && $other['data'][4]) ? $other['data'][4] : '';
} else {
// Fixed parameters for _modulegraph_nh_.
$graph_seconds = $other['data'];
$graph_threshold = 0;
$other['data'][1] = 0;
$base64 = 0;
$height = 225;
$width = '90%';
}
if (is_nan($graph_seconds) || $graph_seconds <= 0) {
@ -13954,7 +13966,7 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4)
// Format MIME RFC 2045 (line break 76 chars).
$graph_html = chunk_split(grafico_modulo_sparse($params));
if ($other['data'][1]) {
if ((bool) $base64 === false) {
header('Content-type: text/html');
returnData('string', ['type' => 'string', 'data' => '<img src="data:image/jpeg;base64,'.$graph_html.'">']);
} else {