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

2012-10-25 Sergio Martin <sergio.martin@artica.es> 

* 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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7091 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-10-25 12:38:08 +00:00
parent fb67781f9e
commit c5335c525d
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-10-25 Sergio Martin <sergio.martin@artica.es>
* 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 <miguel.dedios@artica.es>
* include/functions_networkmap.php: updated the links and tooltips

12
pandora_console/include/functions_visual_map.php
View File

@ -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 '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
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"].'">';
}
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 '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
echo '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
$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 '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
echo '<a style="' . ($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '') . '" href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
$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 '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
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"].'">';
$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 '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
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"].'">';
$endTagA = true;
}
@ -1331,7 +1331,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
}
}
else {
echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data['id_layout_linked'].'">';
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'].'">';
}
}

4
pandora_console/operation/gis_maps/render_view.php
View File

@ -87,11 +87,11 @@ $layers = gis_get_layers($idMap);
$buttons = array();
if ($config["pure"] == 0) {
$buttons[] = '<a href="index.php?sec=visualc&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'&amp;pure=1">' .
$buttons[] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'&amp;pure=1">' .
html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . "</a>";
}
else {
$buttons[] = '<a href="index.php?sec=visualc&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'">' .
$buttons[] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'">' .
html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . "</a>";
}

2
pandora_console/operation/search_maps.php
View File

@ -72,7 +72,7 @@ else {
$table->data = array ();
foreach ($maps as $map) {
array_push($table->data, array(
"<a href='?sec=visualc&sec2=operation/visual_console/render_view&id=" .
"<a href='?sec=reporting&sec2=operation/visual_console/render_view&id=" .
$map['id'] . "'>" . $map['name'] . "</a>",
ui_print_group_icon ($map["id_group"], true),
$map['count']

2
pandora_console/operation/visual_console/render_view.php
View File

@ -122,7 +122,7 @@ if ($config['pure'] && $config["refr"] != 0) {
echo '<div style="height:30px">&nbsp;</div>';
echo '<form method="post" action="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view">';
echo '<form method="post" action="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view">';
html_print_input_hidden ('pure', $config["pure"]);
html_print_input_hidden ('id', $id_layout);
html_print_table ($table);