From f519b5ec7e51f5b00f1697cbd594035739920608 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Tue, 25 May 2010 21:29:14 +0000
Subject: [PATCH] 2010-05-25 Raul Mateos <raulofpandora@gmail.com>

	* operation/menu.php, operation/snmpconsole/snmp_view: Updated year.
	Clean Code.
	* godmode/agentes/agent_conf_gis.php: Improved usability.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2800 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  7 +++++
 .../godmode/agentes/agent_conf_gis.php        |  9 +++---
 pandora_console/operation/menu.php            |  2 +-
 .../operation/snmpconsole/snmp_view.php       | 28 +++++++++----------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 44cd52fed4..8b349fb958 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-25 Raúl Mateos <raulofpandora@gmail.com>
+
+	* operation/menu.php, operation/snmpconsole/snmp_view: Updated year.
+	Clean Code.
+
+	* godmode/agentes/agent_conf_gis.php: Improved usability.
+
 2010-05-25 Raúl Mateos <raulofpandora@gmail.com>
 
 	* extensions/update_manager/lib/*.php: Updated year, clean code.
diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php
index ce0336bfae..af537f575c 100644
--- a/pandora_console/godmode/agentes/agent_conf_gis.php
+++ b/pandora_console/godmode/agentes/agent_conf_gis.php
@@ -30,7 +30,7 @@ $updateGisData = get_db_value('update_gis_data','tagente', 'id_agente', $id_agen
 $agent_name = get_agent_name($id_agente);
 
 /* Map with the current position */
-echo "<div id=\"" . $agent_name . "_agent_map\"  style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
+echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
 
 if (!getAgentMap($id_agente, "500px", "98%", false)) {
 	echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
@@ -45,9 +45,8 @@ echo "<h4>" . __("Warning: When you change the position the agent automatily ena
 $table->width = '60%';
 $table->data = array();
 
-$table->colspan[0][0] = 2;
-
-$table->data[0][0] = __('Agent position:');
+$table->head[0] =__('Agent position');
+$table->head_colspan[0] = 2;
 
 $table->data[1][0] = __('Longitude: ');
 $table->data[1][1] = print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '',
@@ -71,7 +70,7 @@ print_input_hidden('update_gis', 1);
 print_table($table);
 
 echo '<div class="action-buttons" style="clear: left; width: ' . $table->width . '; float: left;">';
-print_submit_button (__('Update'), '', false, 'class="sub update"');
+print_submit_button (__('Update'), '', false, 'class="sub upd"');
 echo '</div>';
 echo "</form>";
 ?>
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 5888846ef2..083ae2a3a1 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 
 // This program is free software; you can redistribute it and/or
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index daeb8fb2df..11f779043f 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 
 // This program is free software; you can redistribute it and/or
@@ -92,7 +92,7 @@ if (isset ($_POST["updatebt"])) {
 		foreach ($trap_ids as $id_trap) {
 			$sql = sprintf ("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config["id_user"], $id_trap);
 			process_sql ($sql);
-                }
+		}
 	} else {
 		audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation",
 			"Trying to mass-delete SNMP Trap ID");
@@ -100,14 +100,14 @@ if (isset ($_POST["updatebt"])) {
 }
 
 if ($config["pure"]) {
-	$link =  '<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/normalscreen.png" title="'.__('Normal screen').'" /></a>';
+	$link = '<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/normalscreen.png" title="'.__('Normal screen').'" /></a>';
 } else {
 	// Fullscreen
-	$link =  '<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/fullscreen.png" title="'.__('Full screen').'"/></a>';
+	$link = '<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/fullscreen.png" title="'.__('Full screen').'"/></a>';
 }
 
 // Header
-print_page_header (__("SNMP console"), "images/computer_error.png", false, "", false,  $link);
+print_page_header (__("SNMP Console"), "images/computer_error.png", false, "", false, $link);
 
 
 $sql = sprintf ("SELECT * FROM ttrap ORDER BY timestamp DESC LIMIT %d,%d",$offset,$config['block_size']);
@@ -320,8 +320,8 @@ if ($traps !== false) {
 	//	}
 	//
 	//	if ($search_string != '' && ereg ($search_string, $trap["value"]) == 0 && 
-	//	    ereg ($search_string, $trap["value_custom"]) == 0) {
-	//	    continue;
+	//		ereg ($search_string, $trap["value_custom"]) == 0) {
+	//		continue;
 	//	}
 	
 		//Status
@@ -438,13 +438,13 @@ echo '<img src="images/pixel_red.png" width="20" height="20" /> - ' . __('Not va
 echo '</div>';
 echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">';
 echo '<h3>' . __('Alert') . '</h3>';
-echo '<img src="images/pixel_yellow.png" width="20" height="20" /> - '  .__('Fired');
+echo '<img src="images/pixel_yellow.png" width="20" height="20" /> - ' .__('Fired');
 echo '<br />';
 echo '<img src="images/pixel_gray.png" width="20" height="20" /> - ' . __('Not fired');
 echo '</div>';
 echo '<div style="float:left; padding-left:30px; line-height: 19px; vertical-align: top; width:120px;">';
 echo '<h3>' . __('Action') . '</h3>';
-echo '<img src="images/ok.png" width="18" height="18" /> - '  .__('Validate');
+echo '<img src="images/ok.png" width="18" height="18" /> - ' .__('Validate');
 echo '<br />';
 echo '<img src="images/cross.png" width="18" height="18" /> - ' . __('Delete');
 echo '</div>';
@@ -461,11 +461,11 @@ echo '<div style="clear:both;">&nbsp;</div>';
 <script language="JavaScript" type="text/javascript">
 <!--
 function CheckAll() {
-        for (var i = 0; i < document.eventtable.elements.length; i++) {
-                var e = document.eventtable.elements[i];
-                if (e.type == 'checkbox' && e.name != 'allbox')
-                        e.checked = !e.checked;
-        }
+	for (var i = 0; i < document.eventtable.elements.length; i++) {
+		var e = document.eventtable.elements[i];
+		if (e.type == 'checkbox' && e.name != 'allbox')
+			e.checked = !e.checked;
+	}
 }
 
 function toggleDiv (divid){