From fb101c29a4ba5f37892cd996edca0e439e2f17fc Mon Sep 17 00:00:00 2001
From: Esteban Sanchez <esteban.sanchez@gmail.com>
Date: Wed, 27 May 2009 14:12:40 +0000
Subject: [PATCH] 2009-05-27  Esteban Sanchez  <estebans@artica.es>

	* godmode/agentes/configurar_agente.php: Style correction.

	* operation/snmpconsole/snmp_view.php: Fixed creation link when
	the agent is not found by address. Fixes #2777409

	* godmode/agentes/agent_manager.php: Use address as name on creation
	when it's given.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                          | 10 ++++++++++
 pandora_console/godmode/agentes/agent_manager.php  |  5 +++++
 .../godmode/agentes/configurar_agente.php          |  1 -
 .../operation/snmpconsole/snmp_view.php            | 14 +++++++-------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 64b3d987c2..2cacc673d9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-27  Esteban Sanchez  <estebans@artica.es>
+
+	* godmode/agentes/configurar_agente.php: Style correction.
+
+	* operation/snmpconsole/snmp_view.php: Fixed creation link when
+	the agent is not found by address. Fixes #2777409
+
+	* godmode/agentes/agent_manager.php: Use address as name on creation
+	when it's given.
+
 2009-05-27  Esteban Sanchez  <estebans@artica.es>
 
 	* general/header.php: Added code to ignored parameters. Fixes #2779381
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 90670ab503..54270700d1 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -29,6 +29,11 @@ if (! isset ($id_agente) && ! $new_agent) {
 	return;
 }
 
+if ($new_agent) {
+	if (! empty ($direccion_agente) && empty ($nombre_agente))
+		$nombre_agente = $direccion_agente;
+}
+
 echo "<h2>".__('Agent configuration')." &raquo; ";
 
 if ($id_agente) {
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 3ee8e6a492..d8902b3e2b 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -184,7 +184,6 @@ if ($create_agent) {
 $img_style = array ("class" => "top", "width" => 16);
 
 if ($id_agente) {
-
 	echo '<div id="menu_tab_frame"><div id="menu_tab_left"><ul class="mn">';
 	echo '<li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'">';
 	print_image ("images/setup.png", false, $img_style);
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 90260cb8ce..93b87fa643 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -167,12 +167,12 @@ $table->data[1][3] = print_input_text ('search_string', $search_string, '', 25,
 
 // Block size for pagination select
 $table->data[2][0] = '<strong>'.__('Block size for pagination').'</strong>';
-$lpagination[25]=25;
-$lpagination[50]=50;
-$lpagination[100]=100;
-$lpagination[200]=200;
-$lpagination[500]=500;
-$table->data[2][1] = print_select ($lpagination, "pagination", $pagination, 'this.form.submit();', __('Default'), $config["block_size"], true);
+$paginations[25] = 25;
+$paginations[50] = 50;
+$paginations[100] = 100;
+$paginations[200] = 200;
+$paginations[500] = 500;
+$table->data[2][1] = print_select ($paginations, "pagination", $pagination, 'this.form.submit();', __('Default'), $config["block_size"], true);
 
 // Severity select
 $table->data[2][2] = '<strong>'.__('Severity').'</strong>';
@@ -286,7 +286,7 @@ foreach ($traps as $trap) {
 		$data[1] = $trap["source"];
 		if (give_acl ($config["id_user"], 0, "AW")) {
 			//We have rights to create agents
-			$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&create_agent=1&direccion='.$data[1].'" title="'.__('Create agent').'">'.$data[1].'</a>';	
+			$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&new_agent=1&direccion='.$data[1].'" title="'.__('Create agent').'">'.$data[1].'</a>';	
 		}
 	} else {
 		//Agent found