From 272be1618582319f3a92339a6319c66d0ca483d4 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Mon, 2 Jul 2007 09:11:44 +0000
Subject: [PATCH] 2007-07-02  Raul Mateos  <raulofpandora@gmail.com> 	*
 operation/reporting/reporting.php: Reverting change. 	* operation/menu.php:
 Reverting change.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  6 ++
 pandora_console/operation/menu.php            |  7 ++-
 .../operation/reporting/reporting.php         | 56 -------------------
 3 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 pandora_console/operation/reporting/reporting.php

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c93d7092a9..25f6ce249d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-02  Raul Mateos  <raulofpandora@gmail.com>
+
+	* operation/reporting/reporting.php: Reverting change.
+	
+	* operation/menu.php: Reverting change.	
+
 2007-06-29  Raul Mateos  <raulofpandora@gmail.com>
 
 	* images/lupa.png: better image
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 8a1ec4ad37..04f2e8e899 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -80,6 +80,7 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
 			echo "<div class='arrow'>";
 		}
 		echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/exportdata' class='mn'>".$lang_label["export_data"]."</a></li></ul></div>";
+
 	}
 
 	// Visual console
@@ -106,9 +107,9 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
 			echo "<ul class='mn'><li><a href='index.php?sec=visualc&sec2=operation/visual_console/render_view&id=".$row["id"]."' class='mn'>". substr($row["name"],0,15). "</a></li></ul></div>";
 		}
 	}
+	
 
-
-// Server view
+	// Server view
 	if ( isset($_GET["sec2"]) && $_GET["sec2"] == "operation/servers/view_server") {
 		echo '<div id="op2s">';
 	} else {
@@ -244,7 +245,7 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
 	} else {
 		echo '<li class="bb0">';
 	}
-	echo '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting" class="mn">'. $lang_label["reporting"].'</a></li></ul></div>';
+	echo '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer" class="mn">'. $lang_label["reporting"].'</a></li></ul></div>';
 
 	// Custom reporting
 	if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){
diff --git a/pandora_console/operation/reporting/reporting.php b/pandora_console/operation/reporting/reporting.php
deleted file mode 100644
index af9361481a..0000000000
--- a/pandora_console/operation/reporting/reporting.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?PHP
-
-// Pandora FMS - the Free monitoring system
-// ========================================
-// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com
-// Main PHP/SQL code development and project architecture and management
-// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es
-//
-// 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; 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.
-
-// Login check
-$id_usuario=$_SESSION["id_usuario"];
-global $REMOTE_ADDR;
-
-if (comprueba_login() != 0) {
-	audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access reporting");
-	include ("general/noaccess.php");
-	exit;
-}
-
-$sql1="SELECT COUNT(id_report) FROM treport";
-$res1=mysql_query($sql1);
-$row1 = mysql_fetch_array ($res1);
-$sql2="SELECT COUNT(id_graph) FROM tgraph";
-$res2=mysql_query($sql2);
-$row2 = mysql_fetch_array ($res2);
-
-echo "<h2>".$lang_label["reporting"]." &gt; ";
-echo $lang_label["summary"]."</h2>";
-
-
-if ($row1[0] == 0 && $row2[0] == 0) {
-	echo "<div class='nf'>".$lang_label["no_reporting_def"]."</div>";
-} else {
-	echo "
-	<table width='300' cellpadding='4' cellpadding='4' class='databox'>
-	<tr>
-	<th>".$lang_label["custom_reporting"]."</th>
-	<th>".$lang_label["custom_graphs"]."</th>
-	</tr>
-	<td>".$row1[0]."</td>
-	<td>".$row2[0]."</td>
-	</tr>
-	</table>";
-}
-
-?>