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

2014-03-13 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_visual_map.php: fixed the link of other visual
	map when it is in a public visual console.
	
	Incident: #658




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-13 12:09:06 +00:00
parent 58f7f3836c
commit 988156c101
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the link of other visual
map when it is in a public visual console.
Incident: #658
2014-03-13 Miguel de Dios <miguel.dedios@artica.es> 2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
* general/shortcut_bar.php, include/functions_ui.php: fixed the * general/shortcut_bar.php, include/functions_ui.php: fixed the

6
pandora_console/include/functions_visual_map.php
View File

@ -964,8 +964,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
text-align:center; text-align:center;
z-index: 0; z-index: 0;
position:relative; position:relative;
width:'.$mapWidth.'px; width:' . $mapWidth . 'px;
height:'.$mapHeight.'px;">'; height:' . $mapHeight . 'px;">';
echo "<img src='" . echo "<img src='" .
ui_get_full_url($backgroundImage) . "' width='100%' height='100%' />"; ui_get_full_url($backgroundImage) . "' width='100%' height='100%' />";
@ -1151,7 +1151,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
elseif ($layout_data['id_layout_linked'] > 0) { elseif ($layout_data['id_layout_linked'] > 0) {
// Link to a map // Link to a map
if (empty($layout_data['id_metaconsole'])) { if (empty($layout_data['id_metaconsole'])) {
echo '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">'; echo '<a href="' . $config['homeurl'] . 'index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
} }
else { else {
$pure = get_parameter('pure', 0); $pure = get_parameter('pure', 0);