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

Fixed problems with url in public console. Tiquet: #3556

This commit is contained in:
m-lopez-f 2016-04-13 18:24:07 +02:00
parent 2f9f932171
commit 59fdb8d297
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_visual_map.php
View File

@ -776,9 +776,14 @@ function visual_map_print_item($mode = "read", $layoutData,
true, true, true, 1, false, $graph_javascript); true, true, true, 1, false, $graph_javascript);
} }
else { else {
if ($isExternalLink)
$homeurl = $config['homeurl'];
else
$homeurl = '';
$img = grafico_modulo_sparse($id_module, $period, 0, $width, $img = grafico_modulo_sparse($id_module, $period, 0, $width,
$height, '', null, false, 1, false, 0, '', 0, 0, $height, '', null, false, 1, false, 0, '', 0, 0,
true, true, '', 1, false, '', false, false, true, true, true, $homeurl, 1, false, '', false, false, true,
$layoutData['image'], null, false, $graph_javascript); $layoutData['image'], null, false, $graph_javascript);
} }

3
pandora_console/include/graphs/fgraph.php
View File

@ -46,6 +46,7 @@ if (!empty($graph_type)) {
include_once($homeurl . 'include/graphs/functions_gd.php'); include_once($homeurl . 'include/graphs/functions_gd.php');
include_once($homeurl . 'include/graphs/functions_utils.php'); include_once($homeurl . 'include/graphs/functions_utils.php');
include_once($homeurl . 'include/graphs/functions_d3.php'); include_once($homeurl . 'include/graphs/functions_d3.php');
include_once($homeurl . 'include/graphs/functions_flot.php');
} }
// Clean the output buffer and turn off output buffering // Clean the output buffer and turn off output buffering
@ -541,6 +542,8 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color,
$unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white', $unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white',
$dashboard = false, $vconsole = false) { $dashboard = false, $vconsole = false) {
include_once("functions_flot.php");
setup_watermark($water_mark, $water_mark_file, $water_mark_url); setup_watermark($water_mark, $water_mark_file, $water_mark_url);
if (empty($chart_data)) { if (empty($chart_data)) {