diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bff2cdee13..be7ef53d26 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2012-10-25 Sergio Martin + + * include/functions_visual_map.php + operation/visual_console/render_view.php + operation/gis_maps/render_view.php + operation/search_maps.php: Fixed some ACL Enterprise bugs + merged from 4.0.2 + 2012-10-25 Miguel de Dios * include/functions_networkmap.php: updated the links and tooltips diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 0584e9b476..40b09aaf87 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -920,7 +920,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line } elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map - echo ''; + echo ''; } else { @@ -1022,7 +1022,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line } elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map - echo ''; + echo ''; $endTagA = true; } } @@ -1053,7 +1053,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line } elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map - echo ''; + echo ''; $endTagA = true; } elseif (preg_match('/^(http:\/\/)((.)+)$/i', $layout_data['label'])){ @@ -1139,7 +1139,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map - echo ''; + echo ''; $endTagA = true; } } @@ -1249,7 +1249,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map - echo ''; + echo ''; $endTagA = true; } @@ -1331,7 +1331,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line } } else { - echo ''; + echo ''; } } diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index aad384a35e..62fdfe83a7 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -87,11 +87,11 @@ $layers = gis_get_layers($idMap); $buttons = array(); if ($config["pure"] == 0) { - $buttons[] = '' . + $buttons[] = '' . html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $buttons[] = '' . + $buttons[] = '' . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . ""; } diff --git a/pandora_console/operation/search_maps.php b/pandora_console/operation/search_maps.php index 574355c5d7..b91058b10a 100755 --- a/pandora_console/operation/search_maps.php +++ b/pandora_console/operation/search_maps.php @@ -72,7 +72,7 @@ else { $table->data = array (); foreach ($maps as $map) { array_push($table->data, array( - "" . $map['name'] . "", ui_print_group_icon ($map["id_group"], true), $map['count'] diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index d2710fbba0..c14b5e30e5 100644 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -122,7 +122,7 @@ if ($config['pure'] && $config["refr"] != 0) { echo '
 
'; -echo '
'; +echo ''; html_print_input_hidden ('pure', $config["pure"]); html_print_input_hidden ('id', $id_layout); html_print_table ($table);