From ee4e38351e1f84dac191b6f844f44fd711a9702b Mon Sep 17 00:00:00 2001
From: esanchezm <noreply@pandorafms.org>
Date: Wed, 7 Jan 2009 10:49:42 +0000
Subject: [PATCH] 2009-01-07  Esteban Sanchez  <estebans@artica.es>

	* godmode/agentes/modificar_agente.php: Old functions replace with new
	ones. Removed one indentation level when there's no access rights.

	* include/functions_ui.php: Wrong variable was being used in
	print_group_icon() to store the output and an incosistent behaviour
	was happening.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  9 ++
 .../godmode/agentes/modificar_agente.php      | 93 ++++++++++---------
 pandora_console/include/functions_ui.php      | 12 +--
 3 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ebbb088c29..144e518c54 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-07  Esteban Sanchez  <estebans@artica.es>
+
+	* godmode/agentes/modificar_agente.php: Old functions replace with new
+	ones. Removed one indentation level when there's no access rights.
+	
+	* include/functions_ui.php: Wrong variable was being used in
+	print_group_icon() to store the output and an incosistent behaviour
+	was happening.
+
 2009-01-07  Esteban Sanchez  <estebans@artica.es>
 
 	* include/functions_ui.php: Added to repository. Functions that prints
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index e1eec37af5..f16bca0cd4 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -234,46 +234,49 @@ if (mysql_num_rows($result)){
 			$tdcolor = "datos2";
 			$color = 1;
 		}
-		if (give_acl($config["id_user"], $id_grupo, "AW")==1){
-			// Agent name
-			echo "<tr><td class='$tdcolor'>";
-			if ($row["disabled"] == 1){
-				echo "<i>";
-			}
-			echo "<b><a href='index.php?sec=gagente&
-			sec2=godmode/agentes/configurar_agente&tab=main&
-			id_agente=".$row["id_agente"]."'>".substr(strtoupper($row["nombre"]),0,20)."</a></b>";
-			if ($row["disabled"] == 1){
-                                echo "<i>";
-                        }
-			echo "</td>";
-
-			echo "<td align='center' class='$tdcolor'>";
-			// Has remote configuration ?
-			$agent_md5 = md5($row["nombre"], FALSE);
-			if (file_exists($config["remote_config"] . "/" . $agent_md5 . ".md5")){
-
-				echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$row["id_agente"]."&disk_conf=" . $agent_md5 . "'>";
-				echo "<img src='images/application_edit.png' border='0' align='middle' title='".__('Edit remote config')."'>";
-				echo "</A>";
-			}
-			echo "</td>";
-
-
-			// Operating System icon
-			echo "<td class='$tdcolor' align='center'>";
-			print_os_icon ($row["id_os"], false);
-			echo "</td>";
-			// Group icon and name
-			echo "<td class='$tdcolor' align='center'>".print_group_icon ($id_grupo, true)."</td>";
-			// Description
-			echo "<td class='".$tdcolor."f9'>".$row["comentarios"]."</td>";
-			// Action
-			echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
-			borrar_agente=".$row["id_agente"]."'";
-			echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-			echo "<img border='0' src='images/cross.png'></a></td>";
+		if (! give_acl($config["id_user"], $id_grupo, "AW"))
+			continue;
+	
+		// Agent name
+		echo "<tr class='$tdcolor' >";
+		echo "<td>";
+		if ($row["disabled"] == 1){
+			echo "<i>";
 		}
+		echo "<b><a href='index.php?sec=gagente&
+		sec2=godmode/agentes/configurar_agente&tab=main&
+		id_agente=".$row["id_agente"]."'>".substr(strtoupper($row["nombre"]),0,20)."</a></b>";
+		if ($row["disabled"] == 1){
+			echo "<i>";
+		}
+		echo "</td>";
+
+		echo "<td align='center'>";
+		// Has remote configuration ?
+		$agent_md5 = md5 ($row["nombre"], false);
+		if (file_exists ($config["remote_config"]."/".$agent_md5.".md5")) {
+
+			echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$row["id_agente"]."&disk_conf=" . $agent_md5 . "'>";
+			echo "<img src='images/application_edit.png' border='0' align='middle' title='".__('Edit remote config')."'>";
+			echo "</A>";
+		}
+		echo "</td>";
+		
+		// Operating System icon
+		echo "<td align='center'>";
+		print_os_icon ($row["id_os"], false);
+		echo "</td>";
+		// Group icon and name
+		echo "<td>";
+		print_group_icon ($id_grupo);
+		echo "&nbsp; ".get_group_name ($id_grupo)."</td>";
+		// Description
+		echo "<td class='".$tdcolor."f9'>".$row["comentarios"]."</td>";
+		// Action
+		echo "<td align='center'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
+		borrar_agente=".$row["id_agente"]."'";
+		echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
+		echo "<img src='images/cross.png'></a></td>";
 	}
 	echo "</table>";
 	echo "<table width='750'><tr><td align='right'>";
@@ -282,10 +285,10 @@ if (mysql_num_rows($result)){
 	echo "&nbsp;</td></tr><tr><td>";
 }
 
-	// Create agent button
-	echo "<form method='post' action='index.php?sec=gagente&
-	sec2=godmode/agentes/configurar_agente&create_agent=1'>";
-	echo "<input type='submit' class='sub next' name='crt'
-	value='".__('Create agent')."'>";
-	echo "</form></td></tr></table>";
+// Create agent button
+echo "<form method='post' action='index.php?sec=gagente&
+sec2=godmode/agentes/configurar_agente&create_agent=1'>";
+echo "<input type='submit' class='sub next' name='crt'
+value='".__('Create agent')."'>";
+echo "</form></td></tr></table>";
 ?>
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 783312f859..8292e133f7 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 /** 
- * Evaluates a result using empty () and then prints an error message or a
+ * Evaluates a result using empty() and then prints an error message or a
  * success message
  * 
  * @param mixed $result the results to evaluate. 0, NULL, false, '' or array()
@@ -155,14 +155,14 @@ function print_group_icon ($id_group, $return = false, $path = "groups_small") {
 		return "-";
 	}
 	
-	$return = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$id_group.'">';
-	$return .= '<img class="bot" src="images/'.$path.'/'.$icon.'.png" alt="'.get_group_name ($id_group).'" title="'.get_group_name ($id_group).'" />';
-	$return .= '</a>';
+	$output = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$id_group.'">';
+	$output .= '<img class="bot" src="images/'.$path.'/'.$icon.'.png" alt="'.get_group_name ($id_group).'" title="'.get_group_name ($id_group).'" />';
+	$output .= '</a>';
 	
 	if ($return)
-		return $return;
+		return $output;
 	
-	echo $return;
+	echo $output;
 }
 
 /**