From 103639ff45d57b99120b02b7835baca64697233a Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Mon, 9 Oct 2006 15:22:28 +0000
Subject: [PATCH] 2006-10-09 Raul Mateos  <raulofpandora@gmail.com> 	*
 operation/agentes/estado_alertas.php: Add code for showing 'Never' 	if
 never an alert has been triggered. 	*
 operation/agentes/estado_alertas.php, estado_agente.php 	,
 status_monitor.php: Changed select size. 	*
 operation/incidents/incident_search.php: Changed select size. 	*
 operation/messages/message.php: Changed select size. 	*
 godmode/usuarios/configurar_usuarios.php: Changed select size. 	*
 godmode/setup/setup.php: Changed select size.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     | 20 +++++++++++++++++--
 pandora_console/godmode/setup/setup.php       |  8 ++++----
 .../godmode/usuarios/configurar_usuarios.php  | 20 +++++++++----------
 .../operation/agentes/estado_agente.php       |  2 +-
 .../operation/agentes/estado_alertas.php      | 19 +++++++++++++-----
 .../operation/agentes/status_monitor.php      |  2 +-
 .../operation/incidents/incident_search.php   |  5 ++---
 .../operation/messages/message.php            |  4 ++--
 8 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b62052e84a..136c4edc07 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,7 +1,23 @@
+2006-10-09 Raul Mateos  <raulofpandora@gmail.com>
+
+	* operation/agentes/estado_alertas.php: Add code for showing 'Never'
+	if never an alert has been triggered.
+	
+	* operation/agentes/estado_alertas.php, estado_agente.php
+	, status_monitor.php: Changed select size.
+	
+	* operation/incidents/incident_search.php: Changed select size.
+	
+	* operation/messages/message.php: Changed select size.
+	
+	* godmode/usuarios/configurar_usuarios.php: Changed select size.
+	
+	* godmode/setup/setup.php: Changed select size.
+
 2006-10-08 Sancho Lerena <slerena@artica.es>
 
-        * incident_detail.php: Fixed DOS newlines to UNIX newlines. Fixed
-          help code. Fixed Background color for field "Source".
+	* incident_detail.php: Fixed DOS newlines to UNIX newlines. Fixed
+	  help code. Fixed Background color for field "Source".
  
 2006-10-04 Raul Mateos  <raulofpandora@gmail.com>
 
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index a2e0bfdb03..47a5ea9554 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -47,7 +47,7 @@ if (comprueba_login() == 0)
 	echo "<form name='setup' method='POST' action='index.php?sec=gsetup&amp;sec2=godmode/setup/setup&update=1'>";
 	echo '<table width="500" cellpadding="3" cellspacing="3">';
 	echo '<tr><td class="lb" rowspan="9" width="5"></td><td class="datos">'.$lang_label["language_code"];
-	echo '<td class="datos"><select name="language_code" onChange="javascript:this.form.submit();">';
+	echo '<td class="datos"><select name="language_code" onChange="javascript:this.form.submit();" class="w180">';
 	
 	$sql="SELECT * FROM tlanguage";
 	$result=mysql_query($sql);
@@ -79,7 +79,7 @@ if (comprueba_login() == 0)
 	echo '<td class="datos2"><input type="text" name="step_compact" size=5 value="'.$config_step_compact.'">';
 
 	echo '<tr><td class="datos">'.$lang_label["graph_order"];
-	echo '<td class="datos"><select name="graph_order" style="width: 110px;">';
+	echo '<td class="datos"><select name="graph_order" class="w120">';
 	if ($config_graph_order==0) {
 		echo '<option value="0">'.$lang_label["left_right"].'</option>';
 		echo '<option value="1">'.$lang_label["right_left"].'</option>';
@@ -90,7 +90,7 @@ if (comprueba_login() == 0)
 	}
 	
 	echo '<tr><td class="datos2">'.$lang_label["truetype"];
-	echo '<td class="datos2"><select name="truetype" style="width: 110px;">';
+	echo '<td class="datos2"><select name="truetype" class="w120">';
 	if ($config_truetype==1) {
 		echo '<option value="1">'.$lang_label["active"].'</option>';
 		echo '<option value="0">'.$lang_label["disabled"].'</option>';
@@ -102,7 +102,7 @@ if (comprueba_login() == 0)
 
 	echo '<tr><td class="datos">'.$lang_label["background_image"];
 	echo '<td class="datos">';
-	echo '<select name="bgimage">';
+	echo '<select name="bgimage" class="w155">';
 	if ($config_bgimage!=""){
 		echo '<option>'.$config_bgimage;
 	}
diff --git a/pandora_console/godmode/usuarios/configurar_usuarios.php b/pandora_console/godmode/usuarios/configurar_usuarios.php
index a7978a632d..6fc9cd68e3 100644
--- a/pandora_console/godmode/usuarios/configurar_usuarios.php
+++ b/pandora_console/godmode/usuarios/configurar_usuarios.php
@@ -38,10 +38,10 @@ if (comprueba_login() == 0)
 		$resq1=mysql_query($query_del2);
 	}
 		
-	if (isset($_GET["id_usuario_mio"])){ // se ha modificado algun parametro de agente
+	if (isset($_GET["id_usuario_mio"])){ // if any parameter changed
 		$modo="edicion";
 		$id_usuario_mio = entrada_limpia($_GET["id_usuario_mio"]);
-		// Leemos los datos del usuario para mostrarlos en el formulario
+		// Read user data to include in form
 		$query1="SELECT * FROM tusuario WHERE id_usuario = '".$id_usuario_mio."'";
 		$resq1=mysql_query($query1);
 		$rowdup=mysql_fetch_array($resq1);
@@ -61,9 +61,9 @@ if (comprueba_login() == 0)
 		$nombre_real=$rowdup["nombre_real"];
 	}
 	
-	// Modificacion de un usuario
+	// Edit user
 	if (isset ($_POST["edicion"])){		
-		// Se realiza la modificación
+		// We do it
 		if (isset ($_POST["pass1"])){
 			$nombre = entrada_limpia($_POST["nombre"]);
 			$nombre_real=entrada_limpia($_POST["nombre_real"]);
@@ -88,7 +88,7 @@ if (comprueba_login() == 0)
 				$sql = "UPDATE tusuario SET nombre_real ='".$nombre_real."', id_usuario ='".$nombre."', telefono ='".$telefono."', direccion ='".$direccion." ', nivel = '".$nivel."', comentarios = '".$comentarios."' WHERE id_usuario = '".$nombre_viejo."'";
 			$resq2=mysql_query($sql);
 
-			// Añadimos grupo
+			// Add group
 			if (isset($_POST["grupo"]))
 				if ($_POST["grupo"] <> ""){
 					$grupo = $_POST["grupo"];
@@ -190,12 +190,12 @@ if (comprueba_login() == 0)
 	<tr><td class="datos" colspan="2"><textarea name="comentarios" cols="60" rows="4"><?php echo $comentarios ?></textarea>
 	
 	<?php
-	if ($modo == "edicion") { // Solo se visualizan los grupos para usuarios existentes.
-		// Desplegable para el grupo 
+	if ($modo == "edicion") { // Only show groups for existing users
+		// Combo for group
 		echo '<input type="hidden" name="edicion" value="1">';
 		echo '<input type="hidden" name="id_usuario_antiguo" value="'.$id_usuario_mio.'">';
 		
-		echo '<tr><td class="datos2">'.$lang_label["group_avail"].'<td class="datos2"><select name="grupo">';
+		echo '<tr><td class="datos2">'.$lang_label["group_avail"].'<td class="datos2"><select name="grupo" class="w155">';
 		echo "<option value=''>".$lang_label["none"];
 		$sql1='SELECT * FROM tgrupo ORDER BY nombre';
 		$result=mysql_query($sql1);
@@ -205,7 +205,7 @@ if (comprueba_login() == 0)
 		echo '</select>';
 		
 		echo "<tr><td class='datos'>".$lang_label["profiles"];
-		echo "<td class='datos'><select name='perfil'>";
+		echo "<td class='datos'><select name='perfil' class='w155'>";
 		$sql1='SELECT * FROM tperfil ORDER BY name';
 		$result=mysql_query($sql1);
 		while ($row=mysql_fetch_array($result)){
@@ -254,7 +254,7 @@ if (comprueba_login() == 0)
 	</td></tr></table>
 
 <?php
-} // fin comprobacion seguridad pagina
+} // end security check
 else {
 		audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access User Management");
 		require ("general/noaccess.php");
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 183bcef82d..3c4a8fe31b 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -48,7 +48,7 @@ if (comprueba_login() == 0) {
 	}
 
 	echo "<table border='0'><tr><td valign='middle'>";
-	echo "<select name='ag_group' onChange='javascript:this.form.submit();'>";
+	echo "<select name='ag_group' onChange='javascript:this.form.submit();' class='w130'>";
 
 	if ( $ag_group > 1 ){
 		echo "<option value='".$ag_group."'>".dame_nombre_grupo($ag_group);
diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php
index 5f352db9ba..d5d883af8d 100644
--- a/pandora_console/operation/agentes/estado_alertas.php
+++ b/pandora_console/operation/agentes/estado_alertas.php
@@ -45,7 +45,12 @@ if (comprueba_login() == 0) {
 				echo "<td class='".$tdcolor."'>".$data["descripcion"];
 				echo "<td class='".$tdcolor."'>".$data["dis_max"]."/".$data["dis_min"];
 				echo "<td class='".$tdcolor."'>".$data["time_threshold"];
-				echo "<td class='".$tdcolor."f9'>".$data["last_fired"];
+				if ($data["last_fired"] == "0000-00-00 00:00:00") {
+					echo "<td class='".$tdcolor."f9'>".$lang_label["never"];
+				}
+				else {
+					echo "<td class='".$tdcolor."f9'>".$data["last_fired"];
+				}
 				echo "<td class='".$tdcolor."'>".$data["times_fired"];
 				if ($data["times_fired"] <> 0)
 					echo "<td class='".$tdcolor."' align='center'><img src='images/dot_red.gif'>";
@@ -78,7 +83,7 @@ if (comprueba_login() == 0) {
 			echo "<form method='post' action='index.php?sec=estado&sec2=operation/agentes/estado_alertas&refr=60'>";
 		}
 		echo "<table border='0'><tr><td valign='middle'>";
-		echo "<select name='ag_group' onChange='javascript:this.form.submit();'>";
+		echo "<select name='ag_group' onChange='javascript:this.form.submit();' class='w130'>";
 	
 		if ( $ag_group > 1 ){
 			echo "<option value='".$ag_group."'>".dame_nombre_grupo($ag_group);
@@ -102,9 +107,9 @@ if (comprueba_login() == 0) {
 		// Show only selected groups	
 	
 		if ($ag_group > 1)
-			$sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' order by nombre';
+			$sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' ORDER BY nombre';
 		else 
-			$sql='SELECT * FROM tagente order by id_grupo, nombre';
+			$sql='SELECT * FROM tagente ORDER BY id_grupo, nombre';
 
 		$result=mysql_query($sql);
 		if (mysql_num_rows($result)){
@@ -131,7 +136,11 @@ if (comprueba_login() == 0) {
 							$string=$string."<tr><td class='".$tdcolor."'><a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."'><b>".$nombre_agente."</b>";
 							$string=$string."<td class='".$tdcolor."'>".dame_nombre_alerta($data["id_alerta"]);
 							$string=$string."<td class='".$tdcolor."'>".$data["descripcion"];
-							$string=$string."<td class='".$tdcolor."'>".$data["last_fired"];
+							if ($data["last_fired"] == "0000-00-00 00:00:00") {
+							$string=$string."<td class='".$tdcolor."'>".$lang_label["never"];
+							}
+							else {
+							$string=$string."<td class='".$tdcolor."'>".$data["last_fired"];}
 							$string=$string."<td class='".$tdcolor."'>".$data["times_fired"];
 							if ($data["times_fired"] <> 0)
 								$string=$string."<td class='".$tdcolor."' align='center'><img src='images/dot_red.gif'>";
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 1b3f9a3c1a..1a6289b1cf 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -52,7 +52,7 @@ if (comprueba_login() == 0) {
 	}
 	echo "<table border='0' cellspacing=3 cellpadding=3><tr><td valign='middle'>".$lang_label["group_name"];
 	echo "<td valign='middle'>";
-	echo "<select name='ag_group' onChange='javascript:this.form.submit();'>";
+	echo "<select name='ag_group' onChange='javascript:this.form.submit();' class='w130'>";
 
 	if ( $ag_group > 1 ){
 		echo "<option value='".$ag_group."'>".dame_nombre_grupo($ag_group);
diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php
index a755ae5809..6b8a563965 100644
--- a/pandora_console/operation/incidents/incident_search.php
+++ b/pandora_console/operation/incidents/incident_search.php
@@ -22,7 +22,6 @@ require("include/config.php");
 
 if (comprueba_login() == 0) {
 
-
 echo "<h2>".$lang_label["incident_manag"]."</h2>";
 echo "<h3>".$lang_label["find_crit"]." <a href='help/".$help_code."/chap4.php#43' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 echo "<div style='width:645'>";
@@ -35,7 +34,7 @@ echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' ali
 <tr>
 <td class="datos"><?php echo $lang_label["user"] ?>
 <td class="datos">
-<select name="usuario">
+<select name="usuario" class="w120">
 	<option value=""><?php echo $lang_label["all"] ?>
 	<?php 
 	$sql1='SELECT * FROM tusuario ORDER BY id_usuario';
@@ -58,5 +57,5 @@ echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' ali
 </div>
 <?php 
 
-} // fin pagina
+} // end page
 ?>
\ No newline at end of file
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index 7bb8f02c4a..c59c321924 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -90,7 +90,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 			echo '<b>'.$_POST["u_destino"].'</b><input type="hidden" name="u_destino" value='.$_POST["u_destino"].'>';
 			}
 		else{
-			echo '<select name="u_destino" class="w100">';
+			echo '<select name="u_destino" class="w120">';
 				while ($row=mysql_fetch_array($resultado))
 				{echo "<option value='".$row["id_usuario"]."'>".$row["id_usuario"]."</option>";} 
 			echo '</select>';
@@ -120,7 +120,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 		<table>
 		<tr><td class="datos">'.$lang_label["m_from"].':</td><td class="datos"><b>'.$iduser.'</b></td></tr>
 		<tr><td class="datos2">'.$lang_label["m_to"].':</td><td class="datos2">';
-			echo '<select name="g_destino" class="w100">';
+			echo '<select name="g_destino" class="w130">';
 				while ($row3=mysql_fetch_array($resultado3))
 				#if ($row3["id_grupo"] != 1){
 					{echo "<option value='".$row3["id_grupo"]."'>".$row3["nombre"]."</option>";}