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 + + * 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 * 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 @@ @@ -245,10 +245,12 @@ echo ''; // tcp send / rcv value echo ''; -echo ''.lang_string ("tcp_send").""; -echo ''; -echo ''.lang_string ("tcp_rcv").""; -echo ''; +echo ''.lang_string ("tcp_send"); +pandora_help ("tcp_send"); +echo ""; +echo ''; +echo ''.lang_string ("tcp_rcv").""; +echo ''; echo ''; // Description diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png index f25fc3fbf1..3d567630a0 100644 Binary files a/pandora_console/images/help.png and b/pandora_console/images/help.png differ 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] = ''; @@ -114,7 +113,7 @@ foreach ($servers as $server) { $data[6] .= ' '; } $data[7] = $server['version']; - $data[8] = human_date_relative ($server['keepalive']).""; + $data[8] = human_time_comparation ($server['keepalive']) . ""; 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) */