From 3a3aa5834e8c4b2af2f7f77b2d21983de3561a8d Mon Sep 17 00:00:00 2001 From: raulmateos Date: Wed, 2 Jun 2010 17:30:11 +0000 Subject: [PATCH] 2010-06-02 Raul Mateos * operation/agentes/sla_view.php, operation/agentes/datos_agente.php, operation/agentes/estado_ultimopaquete.php: Updated header. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2850 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++++ .../operation/agentes/datos_agente.php | 4 ++-- .../agentes/estado_ultimopaquete.php | 23 +++++++++---------- .../operation/agentes/sla_view.php | 1 - 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6c60bbafa4..c63de545c3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-06-02 Raúl Mateos + + * operation/agentes/sla_view.php, operation/agentes/datos_agente.php, + operation/agentes/estado_ultimopaquete.php: Updated header. + 2010-06-02 Sergio Martin * include/auth/ldap.php diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index 698bd922f5..edeb6e1cd6 100644 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.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 @@ -103,7 +103,7 @@ if ($result === false) { $header_title = __('Received data from')." ".get_agentmodule_agent_name ($module_id)." / ".get_agentmodule_name ($module_id). " - " . human_time_description ($period); -echo "

".$header_title. "

"; +echo "

".$header_title. "

"; // $index = 0; diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 094bfcda30..b80bde320b 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.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 @@ -43,10 +43,9 @@ $label_group = 0; $last_label = ""; // Title -echo "

".__('Pandora agents')." » "; -echo __('Display of last data modules received by agent'); +echo "

".__('Display of last data modules received by agent'); echo " "; -echo "

"; +echo ""; $modules = get_db_all_rows_filter ('tagente_modulo, tagente_estado', array ('tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo', @@ -85,7 +84,7 @@ foreach ($modules as $module) { } if ($module["id_module_group"] != $last_modulegroup ){ - // Render module group names (fixed code) + // Render module group names (fixed code) $nombre_grupomodulo = get_modulegroup_name ($module["id_module_group"]); $last_modulegroup = $module["id_module_group"]; echo " @@ -175,8 +174,8 @@ foreach ($modules as $module) { echo ""; echo substr(safe_output($module["datos"]),0,42); } + echo ""; } - $handle = "stat".$nombre_tipo_modulo."_".$module["id_agente_modulo"]; $url = 'include/procesos.php?agente='.$module["id_agente_modulo"]; @@ -199,15 +198,15 @@ foreach ($modules as $module) { if ($module['history_data'] == 1){ - // RAW Table data - echo ""; - echo "  "; - echo "  "; - echo ""; + // RAW Table data + echo ""; + echo "  "; + echo "  "; + echo ""; } else { echo ""; } - + echo ""; if ($module["utimestamp"] == 0){ echo __('Never'); diff --git a/pandora_console/operation/agentes/sla_view.php b/pandora_console/operation/agentes/sla_view.php index 26965f2472..d46dce8135 100644 --- a/pandora_console/operation/agentes/sla_view.php +++ b/pandora_console/operation/agentes/sla_view.php @@ -28,7 +28,6 @@ if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'], exit; } -echo "

".__('Pandora agents'). " » ".__('SLA view')."

"; $id_agent = get_parameter ("id_agente", 0); $interval = get_agent_interval ($id_agent); $modules = get_agent_modules ($id_agent, '*',