From f493719afd469e7ee248b17b4ec941dbc2fe2785 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Tue, 14 Oct 2008 15:19:40 +0000
Subject: [PATCH] 2008-10-14 Sancho Lerena <slerena@artica.es>
* include/config_process.php, index.php: Updated version.
* include/functions_db.php: Small fix in a foreach() warning.
* operation/agentes/estadisticas.php: Old, unused code removed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1153 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 8 ++++
pandora_console/include/config_process.php | 2 +-
pandora_console/include/functions_db.php | 2 +-
pandora_console/index.php | 2 +-
.../operation/agentes/estadisticas.php | 39 -------------------
5 files changed, 11 insertions(+), 42 deletions(-)
delete mode 100644 pandora_console/operation/agentes/estadisticas.php
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index deab5abf6f..40198bf45c 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-14 Sancho Lerena <slerena@artica.es>
+
+ * include/config_process.php, index.php: Updated version.
+
+ * include/functions_db.php: Small fix in a foreach() warning.
+
+ * operation/agentes/estadisticas.php: Old, unused code removed.
+
2008-10-14 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/functions_db.php: Style changes and language updates and a
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 78f0e7e945..13069076ff 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -18,7 +18,7 @@
//Pandora Version
if (!isset ($build_version))
- $build_version="PC081010";
+ $build_version="PC081014";
if (!isset ($pandora_version))
$pandora_version="v2.0";
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 62a8131fb0..52936ef6e1 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -2232,7 +2232,7 @@ function delete_agent ($id_agents) {
//IP address
$sql = sprintf ("SELECT id_ag FROM taddress_agent, taddress WHERE taddress_agent.id_a = taddress.id_a AND id_agent = %d", $id_agent);
$result = get_db_all_rows_sql ($sql);
-
+ if ($result)
foreach ($result as $row) {
temp_sql_delete ("taddress_agent", "id_ag", $row["id_ag"]);
}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 3bb839f257..de4e190782 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -20,7 +20,7 @@
// Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/
// Pandora FMS uses Pear Image::Graph code
-$build_version="PC081010";
+$build_version="PC081014";
$pandora_version="v2.0";
global $build_version;
global $pandora_version;
diff --git a/pandora_console/operation/agentes/estadisticas.php b/pandora_console/operation/agentes/estadisticas.php
deleted file mode 100644
index dd2769c089..0000000000
--- a/pandora_console/operation/agentes/estadisticas.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-// Pandora FMS - the Flexible Monitoring System
-// ============================================
-// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es
-// Please see http://pandora.sourceforge.net for full contribution list
-
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-// Load global vars
-require("include/config.php");
-
-check_login ();
-
-if (! give_acl ($config['id_user'], 0, "AR")) {
- audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation",
- "Trying to access Agent estatistics");
- require ("general/noaccess.php");
- return;
-}
-echo "<h2>".__('Pandora Agents')." > ";
-echo __('Database Statistics per Agent')."</h2>";
-echo "<table border=0>";
-echo "<tr><td><img src='reporting/fgraph.php?tipo=db_agente_modulo'><br>";
-echo "<tr><td><br>";
-echo "<tr><td><img src='reporting/fgraph.php?tipo=db_agente_paquetes'><br>";
-echo "</table>";
-?>