From ea09d63bdbb3e538c4793ee7464536ab5addf702 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Tue, 22 Jul 2008 16:21:05 +0000
Subject: [PATCH] 2008-07-22  Sancho Lerena <slerena@gmail.com>

	* pandoradb_data.sql: Some changes for types not implemented in 2.0

	* module_manager_editor.php: Added help, more space in textareas for
	tcp recv/send. Better layout.

	* help.png: Smaller icon.

	* view_server.php: Fixed problem with lastupdate render. This was using
	and incorrect function to render data



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@968 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                       |  12 ++++++++++++
 .../agentes/module_manager_editor_network.php   |  12 +++++++-----
 pandora_console/images/help.png                 | Bin 932 -> 517 bytes
 .../operation/servers/view_server.php           |   5 ++---
 pandora_console/pandoradb_data.sql              |   9 ++++++---
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 810b512d6b..7d653a8421 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-22  Sancho Lerena <slerena@gmail.com>
+
+	* pandoradb_data.sql: Some changes for types not implemented in 2.0
+
+	* module_manager_editor.php: Added help, more space in textareas for
+	tcp recv/send. Better layout.
+
+	* help.png: Smaller icon.
+
+	* view_server.php: Fixed problem with lastupdate render. This was using
+	and incorrect function to render data. 
+
 2008-07-21  Evi Vanoost <vanooste@rcbi.rochester.edu>
 
 	* include/functions_reporting.php: Last commit forgot a semicolon. Fixed.
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 3ac2386331..050ac81eb5 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -1,5 +1,5 @@
 <?PHP
-// Pandora FMS - the Free Monitoring System
+// Pandora FMS - the Flexible Monitoring System
 // ========================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
 // Copyright (c) 2008 Jorge Gonzalez <jorge.gonzalez@artica.es>
@@ -245,10 +245,12 @@ echo '</tr>';
 
 // tcp send / rcv value
 echo '<tr>';
-echo '<td class="datos2">'.lang_string ("tcp_send")."</td>";
-echo '<td class="datos2"><textarea cols=20 style="height:40px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
-echo '<td class="datos2">'.lang_string ("tcp_rcv")."</td>";
-echo '<td class="datos2"><textarea cols=20 style="height:40px;" name="form_tcp_rcv">'.$form_tcp_rcv.'</textarea>';
+echo '<td class="datos2" valign="top">'.lang_string ("tcp_send");
+pandora_help ("tcp_send");
+echo "</td>";
+echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
+echo '<td class="datos2" valign="top">'.lang_string ("tcp_rcv")."</td>";
+echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_rcv">'.$form_tcp_rcv.'</textarea>';
 echo '</tr>';
 
 // Description
diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png
index f25fc3fbf106af60de59581bf2e6fba58d489bf8..3d567630a08167c6a404c86b9fe10d0f1e08c5ee 100644
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00001b5ch_0Itp)
z=>Px#24YJ`L;!XGb^vx}%WnGs000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOM|
z4;~)S`K2%b00D(bL_t&-(*?mzPugGr2k`&%($WXoLX~!A-3FcPB_T08j-%1j4!i8Y
z2blXT`w(UyfMkb#02hy(jEM)$Fi}`!Q7F>VSEMid{Yd-McT!iCrfunm4OR3diS+<r
zljTD%NCwl{>ckIImp3%g?7ZCm_P%W%8M<g2dX;2(fmM`#_QQ0qs?410zwR-&E&cGF
zV}1>yb*lu(o0f^Xs$ev6Nt9--ZfEBxS#NG>Llb=hIA@nrdU1V^U#C}y(hS|s4rX3L
zbxpLJhT7+x(O#515kFod%?f~WIJSX5;|1cU9E@`!ORUEMfHMZ6$Ph{eUk<u>c#QG;
zd;(dnKotrYrJz|}47FONG`Ca;MMj)%aC`3~FDa~T6_P~DyeNm<3z9)zlzSiEK5tFk
zklI!qim2e(JjN?aEf&kwWWEdstmf=L03f!h?Y@4o)zE8#a7Iy;Xu0%)@%h!=kDI&2
zPwoYYJDSXolXNp~8nyn#=-)?1DT=Zj&L6|UbmpJ<LF)boOaP__xjH%O00000NkvXX
Hu0mjfmWSM!

literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$THc3Q5R5*=o
zlUr<5WfX<K^Z(~sQ5wL8PNDQR?SM|HQ-TFeQ!Yj=`l6zS#Dtg_6DtNuOeaB%X`-zc
zB=JEFi4oHH;DZUEM<arc)u07w8Cu(dW2a)Bp)F8*nQ5nX&hJA@1Hql_mz}*=)?Qgl
zQ%Z4T6>n<^0M7t*KyZHC1w??>xEt=fabLR*P`s^00F8@s%vX0ly3W2Q;1iYQ`2d{1
zn56SU!aH>A*UV&krU`gE?uNYufcfLL`>KjUEiXOnoQe)`qCG}W|1bb+O7eK1#?QvJ
zs|dgU_0&(D106tZ+zosBJd?&v>q<j!?s~}Cv;Rx3jiuT9+-55M`J|_2_@N_CtJ}%(
zUt+ww=Mm?X18((?9q~q>nWFmUKydqeslSKE)YIWlRZ)Gjda>n*%4R*)(?6s}$J0tF
zrB0rXshXW1sfM?{P>GRo72Li*T~yy3kh%V?FTe2QhE1d6Y3<Olvj7-|&S%HZbJ#sc
zd-q>FzU6LKF3;uj?|T^;O;NgH2_-9*%2UxlCj?MeRpHZ4w8sFjOr1-Y$4FjHVOs`O
z6+Qs2{*%TqbaEVv&fkX!tu7E!h&mkz2FsQcy_m!>B&KO#Sq7GA5DFBqd&fqUQXD+m
zfn!?;p^>;U$?D=fJf(uyMMMY<L)S5lxwcG$z0cNS>XO4>Md`aVN{(Y9gut;(G&D3o
z09{?N%Y*_27>1l<VdyNr-DV&;#+lv(ZP7s-+r+UgavYQL!ezt;uOX!95<ukKg@m_d
zeHpqg(RGPo=x9RlbN3*pdy_~hv29}kq|%>9_a8%EHtR(M(E9O_Gnox*SF!%CmFQBU
zOF`};huu%zOT%N;<TxglWn$YVYl`or%$Li7)<{Mv)hgm{xNjnrY1;R}H&d@aznM_L
zhm-;-wFSQ$^ST5Im+(YwDX)F_?es({(-e2ZeK%QoYmLA9jfMy9Xl$5hY?#EANo;%W
z=gQJ$l;kg_>EOv}x2@;w%)hg>aX0MU5~e$Dv-j=Valc(v;nT_sm!fGJ@x&;<^^bV(
zeDYmpd~&)e>v=ba>Hp#^rKnR%1p%a#U9+><h*Ij7IR6J`_e_+c+lpZT0000<MNUMn
GLSTaB)4`Ph

diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index 592090d18c..5ad3cf3ad4 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -43,7 +43,7 @@ $servers = get_db_all_rows_in_table ('tserver');
 if (sizeof ($servers) == 0)
 	return;
 
-$table->width = '90%';
+$table->width = '98%';
 $table->size = array ();
 $table->size[6] = '60';
 $table->align = array ();
@@ -64,7 +64,6 @@ $table->data = array ();
 foreach ($servers as $server) {
 	$data = array ();
 	$serverinfo = server_status ($server['id_server']);
-	
 	$data[0] = $server['name'];
 	if ($server['status'] == 0){
 		$data[1] = '<img src="images/pixel_red.png" width="20" height="20">';
@@ -114,7 +113,7 @@ foreach ($servers as $server) {
 		$data[6] .= ' <img src="images/binary.png" title="'.lang_string ('checksum').'">';
 	}
 	$data[7] = $server['version'];
-	$data[8] = human_date_relative ($server['keepalive'])."</td>";
+	$data[8] = human_time_comparation ($server['keepalive']) . "</td>";
 	
 	array_push ($table->data, $data);
 }
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 22614a928b..9c88347128 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -180,13 +180,16 @@ INSERT INTO `ttipo_modulo` VALUES
 (17,'remote_snmp_string',5,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.png'),
 (18,'remote_snmp_proc',4,'Remote SNMP network agent, boolean data','mod_snmp_proc.png'), 
 
-(19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'), 
-(20,'image_png',9,'Image PNG data', 'mod_image_png.png'), 
 (21,'async_proc', 7, 'Asyncronous proc data', 'mod_async_proc.png'), 
 (22,'async_data', 6, 'Asyncronous numeric data', 'mod_async_data.png'), 
 (23,'async_string', 8, 'Asyncronous string data', 'mod_async_string.png'),
-(24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png'),  
 (100,'keep_alive',-1,'KeepAlive','mod_keepalive.png');
+/*
+Not implemented yet
+(19,'image_jpg',9,'Image JPG data', 'mod_image_jpg.png'), 
+(20,'image_png',9,'Image PNG data', 'mod_image_png.png'), 
+(24,'async_inc', 6, 'Asyncronous incremental data', 'mod_async_inc.png'),  
+*/
 
 /* Categoria field is used to segregate several types (plugin, agents, network) on their data
   types, could be used or could be avoided and use directly primary key (id_tipo) */