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

2011-09-01 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_groups.php: fixed when the group haven't a icon.
	
	* operation/menu.php: applied the safe_out before the print a piece the
	name of map in submenu.
	 
	* operation/gis_maps/render_view.php: fixed the name of agents with white
	spaces.
	
	Fixes: #3398436



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4874 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-09-01 13:09:17 +00:00
parent c0c347ae9a
commit d9e0592229
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2011-09-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php: fixed when the group haven't a icon.
* operation/menu.php: applied the safe_out before the print a piece the
name of map in submenu.
* operation/gis_maps/render_view.php: fixed the name of agents with white
spaces.
Fixes: #3398436
2011-09-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-09-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/groups_small/without_group.bad.png * images/groups_small/without_group.bad.png

8
pandora_console/include/functions_groups.php
View File

@ -368,7 +368,13 @@ function groups_get_icon ($id_group) {
return 'world'; return 'world';
} }
else { else {
return (string) db_get_value ('icon', 'tgrupo', 'id_grupo', (int) $id_group); $icon = (string) db_get_value ('icon', 'tgrupo', 'id_grupo', (int) $id_group);
if ($icon == '') {
$icon = 'without_group';
}
return $icon;
} }
} }

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

@ -167,7 +167,7 @@ if ($layers != false) {
$status = agents_get_status($idAgent); $status = agents_get_status($idAgent);
$parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent); $parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent);
gis_add_agent_point($layer['layer_name'], $agentName, $coords['stored_latitude'], gis_add_agent_point($layer['layer_name'], io_safe_output($agentName), $coords['stored_latitude'],
$coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info', $parent); $coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info', $parent);
} }
} }

4
pandora_console/operation/menu.php
View File

@ -82,8 +82,8 @@ if (check_acl ($config['id_user'], 0, "AR")) {
if (! check_acl ($config["id_user"], $gisMap["group_id"], "IR")) { if (! check_acl ($config["id_user"], $gisMap["group_id"], "IR")) {
continue; continue;
} }
$sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["text"] = mb_substr ($gisMap["map_name"], 0, 15); $sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["text"] = mb_substr (io_safe_output($gisMap["map_name"]), 0, 15);
$sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["title"] = $gisMap["map_name"]; $sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["title"] = io_safe_output($gisMap["map_name"]);
$sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["refr"] = 0; $sub["operation/gis_maps/render_view&amp;map_id=".$gisMap["id_tgis_map"]]["refr"] = 0;
} }