From 2217669e2c9366dfb5a814fee5122cb4695c39f8 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 17 Feb 2011 23:50:57 +0000 Subject: [PATCH] 2011-02-18 Sancho Lerena * operation/agentes/gis_view.php: Fixed ACL Problems in operation view (Was looking for PM instead AR!). Fixed search by date in data view for GIS data. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3914 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/operation/agentes/gis_view.php | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9e9569f150..a5d6efc51c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-02-18 Sancho Lerena + + Merged bugfix from trunk. + + * operation/agentes/gis_view.php: Fixed ACL Problems in operation + view (Was looking for PM instead AR!). Fixed search by date in data + view for GIS data. + + 2011-02-17 Juan Manuel Ramon * include/functions_reports.php diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php index 5d74511759..2d0b5edb54 100644 --- a/pandora_console/operation/agentes/gis_view.php +++ b/pandora_console/operation/agentes/gis_view.php @@ -2,7 +2,7 @@ /** * Pandora FMS- http://pandorafms.com * ================================================== - * Copyright (c) 2005-2010 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2011 Artica Soluciones Tecnologicas * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,10 +18,10 @@ global $config; check_login (); -if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) { - pandora_audit("ACL Violation", "Trying to access Visual Setup Management"); - require ("general/noaccess.php"); - return; +if (! give_acl ($config['id_user'], 0, "AR") && ! is_user_admin ($config['id_user'])) { + pandora_audit("ACL Violation", "Trying to access GIS Agent view"); + require ("general/noaccess.php"); + return; } require_once ('include/functions_gis.php'); @@ -87,12 +87,12 @@ echo ""; echo "

" . __("Positional data from the last") . " " . human_time_description ($period) ."

"; /* Get the total number of Elements for the pagination */ -$sqlCount = sprintf ("SELECT COUNT(*) FROM tgis_data_history WHERE tagente_id_agente = %d AND end_timestamp > %d ORDER BY end_timestamp DESC", $agentId, get_system_time () - $period); +$sqlCount = sprintf ("SELECT COUNT(*) FROM tgis_data_history WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d) ORDER BY end_timestamp DESC", $agentId, get_system_time () - $period); $countData = get_db_value_sql($sqlCount); /* Get the elements to present in this page */ $sql = sprintf ("SELECT longitude, latitude, altitude, start_timestamp, end_timestamp, description, number_of_packages, manual_placement FROM tgis_data_history - WHERE tagente_id_agente = %d AND end_timestamp > %d + WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d) ORDER BY end_timestamp DESC LIMIT %d OFFSET %d", $agentId, get_system_time () - $period, $config['block_size'], get_parameter ('offset'));