diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1008da9a8f..424f1e17fd 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-10-08 Miguel de Dios + + * include/functions_visual_map.php, + include/Image/image_functions.php: fixed the show visualmap widget + in dashboard. + 2013-10-08 Miguel de Dios * include/styles/pandora.css: add the style for the dialogs in diff --git a/pandora_console/include/Image/image_functions.php b/pandora_console/include/Image/image_functions.php index 8974fa6d41..85f8d65825 100644 --- a/pandora_console/include/Image/image_functions.php +++ b/pandora_console/include/Image/image_functions.php @@ -43,7 +43,7 @@ if (isset($_GET['getFile'])) { createthumb( $_SERVER['DOCUMENT_ROOT'] . $file, $fileTemp,$newWidth,$newHeight); } } - else createthumb( $_SERVER['DOCUMENT_ROOT'] . $file, $fileTemp,$newWidth,$newHeight); + else createthumb($file, $fileTemp,$newWidth,$newHeight); getFile($fileName, $fileTemp); unlink($fileTemp); } diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index c6ce998ccc..ada93de419 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -903,8 +903,16 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line $proportion = $width / $layout["width"]; $mapHeight = $proportion * $layout["height"]; } - $backgroundImage = '/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size=' . $mapWidth . 'x' . $mapHeight . '&file=' . - $config['homeurl'] . 'images/console/background/'.io_safe_input ($layout["background"]); + + if (defined('METACONSOLE')) { + $backgroundImage = '/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size=' . $mapWidth . 'x' . $mapHeight . '&file=' . + $config['homeurl'] . 'images/console/background/'.io_safe_input ($layout["background"]); + } + else { + html_debug_print($config, true); + $backgroundImage = '/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size=' . $mapWidth . 'x' . $mapHeight . '&file=' . + $config['homedir'] . '/images/console/background/'.io_safe_input ($layout["background"]); + } } else { $mapWidth = $layout["width"];