From 70dc4efd08fa55271bceaf58ad9385108a6fbbc9 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 22 Nov 2013 09:56:40 +0000 Subject: [PATCH] 2013-11-22 Miguel de Dios * operation/gis_maps/ajax.php: fixed the get size of icons for the public gis map. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9114 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/operation/gis_maps/ajax.php | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0491381178..8552a462eb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-11-22 Miguel de Dios + + * operation/gis_maps/ajax.php: fixed the get size of icons for + the public gis map. + 2013-11-21 Sergio Martin * include/functions_events.php: Fix the combo of user to assign an diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php index 58277dece0..c59e5023c3 100644 --- a/pandora_console/operation/gis_maps/ajax.php +++ b/pandora_console/operation/gis_maps/ajax.php @@ -182,7 +182,12 @@ switch ($opt) { $row['nombre'] = ''; $icon = gis_get_agent_icon_map($row['tagente_id_agente'], true, $status); - $icon_size = getimagesize($icon); + if ($icon[0] !== '/') { + $icon_size = getimagesize($config['homedir'] . "/" . $icon); + } + else { + $icon_size = getimagesize($config['homedir'] . $icon); + } $icon_width = $icon_size[0]; $icon_height = $icon_size[1];