diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 501baef6a4..72f91514db 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-05-31 Raúl Mateos + + * operation/agentes/estado_agente.php, operation/agentes/exportdata.php, + operation/agentes/status_monitor.php: Added icon to search button. + 2010-05-31 Ramon Novoa * include/fgraph.php: Fixed some min and max calculation issues related diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index d9fffd3788..893bac9544 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_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 @@ -91,7 +91,7 @@ print_input_text ("search", $search, '', 15); echo ''; -print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub")); +print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search")); echo ' '; @@ -128,7 +128,7 @@ if (! empty ($agent_names)) { array ('id_agente', 'id_grupo', 'id_os', - 'ultimo_contacto', + 'ultimo_contacto', 'intervalo'));} if (empty ($agents)) { @@ -219,19 +219,19 @@ foreach ($agents as $agent) { $data[6] = $agent_info["alert_img"]; - $last_time = strtotime ($agent["ultimo_contacto"]); + $last_time = strtotime ($agent["ultimo_contacto"]); $now = time (); $diferencia = $now - $last_time; $time = print_timestamp ($last_time, true); $style = ''; if ($diferencia > ($agent["intervalo"] * 2)) - $data[7] = ''.$time.''; - else - $data[7] = $time; + $data[7] = ''.$time.''; + else + $data[7] = $time; - // This old code was returning "never" on agents without modules, BAD !! - // And does not print outdated agents in red. WRONG !!!! - // $data[7] = print_timestamp ($agent_info["last_contact"], true); + // This old code was returning "never" on agents without modules, BAD !! + // And does not print outdated agents in red. WRONG !!!! + // $data[7] = print_timestamp ($agent_info["last_contact"], true); array_push ($table->data, $data); } diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index 125b8f2628..4d85f15552 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.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 @@ -68,9 +68,6 @@ require_javascript_file ('calendar'); // Header print_page_header (__("Export data"), "images/bricks.png"); - -echo "

".__('Pandora agents')." » ".__('Export data')."

"; - $group = get_parameter_post ('group', 0); //$agent = get_parameter_post ('agent', 0); $agentName = get_parameter_post ('agent', 0); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 4dfcb335cf..b47e8de538 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -3,7 +3,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 @@ -79,7 +79,7 @@ echo ''; print_input_text ("ag_freestring", $ag_freestring, '', 15,30, false); echo ''; -print_submit_button (__('Show'), "uptbutton", false, 'class="sub"'); +print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"'); echo ""; echo ""; @@ -93,7 +93,7 @@ $sql = " FROM tagente, tagente_modulo, tagente_estado // Agent group selector if ($ag_group > 0 && give_acl ($config["id_user"], $ag_group, "AR")) { - $sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group); + $sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group); } else { // User has explicit permission on group 1 ? $sql .= " AND tagente.id_grupo IN (".implode (",", array_keys (get_user_groups ())).")"; @@ -214,7 +214,7 @@ foreach ($result as $row) { $data = array (); $data[1] = ''; - $data[1] .= substr ($row["agent_name"], 0, 25); + $data[1] .= substr ($row["agent_name"], 0, 25); $data[1] .= ''; $data[2] = '';