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

2013-10-08 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_visual_map.php,
	include/Image/image_functions.php: fixed the show visualmap widget
	in dashboard.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8872 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-08 15:36:42 +00:00
parent 82b77f1921
commit 67c51714ae
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,
include/Image/image_functions.php: fixed the show visualmap widget
in dashboard.
2013-10-08 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/pandora.css: add the style for the dialogs in

2
pandora_console/include/Image/image_functions.php
View File

@ -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);
}

12
pandora_console/include/functions_visual_map.php
View File

@ -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"];