From ab43a55634ea4824c1c8a1edbbf27b5996110a4c Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Fri, 14 Jul 2006 10:08:08 +0000
Subject: [PATCH] 2006-07-13 Sancho Lerena <sancho.lerena@artica.es>

        * estado_grupo.php. Fix bug viewing groups, agent intervar was not read and
	misused, resulting in a bad result of module down total sum.

        * Some headers changed to show the "official" GPL Header info

	* godmode/setup/setup.php: Fixed small bug showing filelist.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/CHANGELOG                          |  9 +++++++++
 pandora_console/godmode/setup/setup.php            |  2 +-
 pandora_console/include/config.php                 |  2 +-
 pandora_console/operation/agentes/estado_grupo.php | 14 ++++++++------
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pandora_console/CHANGELOG b/pandora_console/CHANGELOG
index 21c49b7ce2..cc57af9399 100644
--- a/pandora_console/CHANGELOG
+++ b/pandora_console/CHANGELOG
@@ -1,3 +1,12 @@
+2006-07-13 Sancho Lerena <sancho.lerena@artica.es>
+
+        * estado_grupo.php. Fix bug viewing groups, agent intervar was not read and 
+	misused, resulting in a bad result of module down total sum.
+
+        * Some headers changed to show the "official" GPL Header info
+
+	* godmode/setup/setup.php: Fixed small bug showing filelist.
+
 2006-07-12  Raul Mateos  <raulofpandora@gmail.com>
 
 	* datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help.
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 7949ec5fbd..cb230aa2d7 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -109,7 +109,7 @@ if (comprueba_login() == 0)
 	
 	$ficheros = list_files('images/backgrounds/', "background",1, 0);
 	$a=0;
-	while ($ficheros[$a]){
+	while (isset($ficheros[$a])){
 		echo "<option>".$ficheros[$a];
 		$a++;
 	}
diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php
index a24ef52e9e..40c112f627 100644
--- a/pandora_console/include/config.php
+++ b/pandora_console/include/config.php
@@ -31,7 +31,7 @@ $dbpassword="pandora";	// Password
 $dbhost="localhost";	// MySQL Host
 $dbtype="mysql"; 	// Type of Database, now only "mysql" its supported
 $attachment_store="/var/www/pandora_console";	//This is directory where placed "attachment" directory, to upload files stores. This MUST be writtable by wwwserver user, and should be in pandora root. Please append "/" to the end :-)
-$config_fontpath = "FreeSans.ttf";
+$config_fontpath = "../reporting/FreeSans.ttf";
 
 
 // Read rest of config from DB
diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php
index 5f9290aac0..e7eb5d9e21 100644
--- a/pandora_console/operation/agentes/estado_grupo.php
+++ b/pandora_console/operation/agentes/estado_grupo.php
@@ -1,7 +1,7 @@
 <?php
 
-// Pandora - the Free monitoring system
-// ====================================
+// Pandora - the Free Distributed Monitoring System
+// ================================================
 // Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
 // Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
 // Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
@@ -66,7 +66,8 @@ if (comprueba_login() == 0)
 		if ($result1=mysql_query($sql1)){
 			while ($row1 = mysql_fetch_array($result1)){
 				$existen_agentes =1;
-				$id_agente=$row1["id_agente"];
+				$intervalo = $row1["intervalo"];
+				$id_agente=$row1["id_agente"]; // Bugsolved 0607113 <slerena@gmail.com>
 				// Check for recent alerts
 				if (check_alert_fired($id_agente) == 1){
 					$grupo[$array_index]["alerts"]++;
@@ -84,10 +85,11 @@ if (comprueba_login() == 0)
 					$result4=mysql_query($sql4);
 					if ($row4 = mysql_fetch_array($result4)){
 						$module_interval = $row4["module_interval"];
-						if ($module_interval !=0)
+						if ($module_interval > 0)
 							$intervalo_comp = $module_interval;
-						else
+						else {
 							$intervalo_comp = $intervalo;
+						}
 					}
 					$ultimo_contacto_modulo = $row3["timestamp"];
 					# Defines if module is down (interval x 2 > time last contact)
@@ -173,4 +175,4 @@ else {
 	audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Agent view (Grouped)");
 	require ("general/noaccess.php");
 }
-?>
\ No newline at end of file
+?>