From 7c9e6faea6200a55aacfebe0fad3cdfb309a07b6 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Wed, 18 Apr 2007 16:48:38 +0000
Subject: [PATCH] 2007-04-18  Sancho Lerena  <slerena@artica.es>

     * Several small fixes coming from our demo (beholder)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/godmode/servers/manage_recontask.php      | 4 ++--
 pandora_console/godmode/servers/manage_recontask_form.php | 3 +--
 pandora_console/operation/servers/view_server.php         | 6 +++---
 pandora_console/operation/servers/view_server_detail.php  | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php
index ce1e5142e2..6864672842 100644
--- a/pandora_console/godmode/servers/manage_recontask.php
+++ b/pandora_console/godmode/servers/manage_recontask.php
@@ -109,7 +109,7 @@ while ($row=mysql_fetch_array($result)){
 	$name = $row["name"];
 	$network = $row["subnet"];
 	$description = $row["description"];
-	$id_server = $row["server"];
+//	$id_server = $row["server"];
 	$type = $row["type"];
 	$id_network_server = $row["id_network_server"];
 	$interval = $row["interval_sweep"];
@@ -176,4 +176,4 @@ echo "<input type='submit' class='sub next' name='crt'
 value='".$lang_label["create"]."'>";
 echo "</form></table>";
 
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 7a1b12715f..a96b57b4d2 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -33,7 +33,6 @@ if (isset($_GET["update"])){ // Edit mode
 	$name = $row["name"];
 	$network = $row["subnet"];
 	$description = $row["description"];
-	$id_server = $row["server"];
 	$type = $row["type"];
 	$id_network_server = $row["id_network_server"];
 	$interval = $row["interval_sweep"];
@@ -184,4 +183,4 @@ else
 echo "</form>";
 echo "</table>";
 
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index 6516080652..ee8982c8c0 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -101,7 +101,7 @@ if (comprueba_login() == 0) {
 					}
 				} else {
 					// Get total modules defined for this server (data modules)
-					$sql2 = "SELECT COUNT(processed_by_server) FROM tagente_estado WHERE processed_by_server = '$name'";
+					$sql2 = "SELECT COUNT(running_by) FROM tagente_estado WHERE running_by = $id_server";
 					$result2=mysql_query($sql2);
 					$row2=mysql_fetch_array($result2);
 					$modules_server = $row2[0];
@@ -196,7 +196,7 @@ if (comprueba_login() == 0) {
 				$maxlag=0;
 				while ($row1=mysql_fetch_array($result1)){
 					if (($row1["utimestamp"] + $row1["interval_sweep"]) < $nowtime)
-						$maxlag2 =  $nowtime - ($row1["utimestamp"] + $row1["interval"]);
+						$maxlag2 =  $nowtime - ($row1["utimestamp"] + $row1["interval_sweep"]);
 						if ($maxlag2 > $maxlag)
 							$maxlag = $maxlag2;
 				}
@@ -261,4 +261,4 @@ if (comprueba_login() == 0) {
 	echo "<img src='images/chart_organisation.png'><td>".$lang_label["recon_server"];
 	echo "</table>";
 }
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php
index 1b3e60a309..2acab184ca 100644
--- a/pandora_console/operation/servers/view_server_detail.php
+++ b/pandora_console/operation/servers/view_server_detail.php
@@ -126,7 +126,7 @@ if ((comprueba_login() == 0) AND (give_acl($id_user, 0, "AR")==1) ) {
 
 				echo "<td class='$tdcolor'>";
 				if (give_acl($id_user, 0, "PM")==1){
-					echo "<a  href='http://pandora.localhost/index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update=$id_rt'>";
+					echo "<a  href='index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&update=$id_rt'>";
 					echo "<img src='../images/wrench_orange.png'></A>";
 				}	
 			}
@@ -134,4 +134,4 @@ if ((comprueba_login() == 0) AND (give_acl($id_user, 0, "AR")==1) ) {
 		}
 	}
 }
-?>
\ No newline at end of file
+?>