From 55a163cd6f1a880d07f620e01cc916620d69e2b9 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Fri, 22 Oct 2010 13:01:25 +0000 Subject: [PATCH] 2010-10-22 Raul Mateos * godmode/db/db_refine.php, godmode/agentes/manage_config_remote.php, godmode/admin_access_logs.php, godmode/snmpconsole/snmp_filters.php, godmode/snmpconsole/snmp_alert.php: Updated year, close html tags, put pixel in tables, center some icons, small cosmetics changes. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 19 ++++++---- pandora_console/godmode/admin_access_logs.php | 38 ++++++++----------- .../godmode/agentes/manage_config_remote.php | 8 ++-- pandora_console/godmode/db/db_refine.php | 24 ++++++++---- .../godmode/snmpconsole/snmp_alert.php | 8 ++-- .../godmode/snmpconsole/snmp_filters.php | 6 +-- 6 files changed, 55 insertions(+), 48 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 79cabfc79b..fd3676a9ae 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-10-22 Raúl Mateos + + * godmode/db/db_refine.php, godmode/agentes/manage_config_remote.php, + godmode/admin_access_logs.php, godmode/snmpconsole/snmp_filters.php, + godmode/snmpconsole/snmp_alert.php: Updated year, close html tags, put pixel + in tables, center some icons, small cosmetics changes. + 2010-10-22 Junichi Satoh * godmode/massive/massive_standby_alerts.php: Improved template @@ -193,8 +200,6 @@ Pending tasks: #3083123 - - * include/functions_modules.php: cleaned source code style in function "update_agent_module". @@ -288,12 +293,12 @@ 2010-10-11 Sancho Lerena - * include/functions_reporting.php: Fixed problem with SQL custom reports - because the SQL html encoding. Added a SQL check for secure user-input - SQL code. + * include/functions_reporting.php: Fixed problem with SQL custom reports + because the SQL html encoding. Added a SQL check for secure user-input + SQL code. - * include/functions.php: Added check_sql() function to do a basic - safety check on SQL code. + * include/functions.php: Added check_sql() function to do a basic + safety check on SQL code. 2010-10-11 Dario Rodriguez diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index cfd5162c6d..d17d6170cd 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.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 @@ -33,40 +33,35 @@ print_page_header (__('Pandora audit')." » ".__('Review Logs'), "", false, $offset = get_parameter ("offset", 0); $tipo_log = get_parameter ("tipo_log", 'all'); - -echo ''; -echo "
"; -echo ''.__('Filter').''; -echo ""; -if ($config['flash_charts']) { - echo graphic_user_activity (300, 140); -} else { - echo ''; -} +echo ""; +echo '"; -echo ""; - +echo ''; +echo '
'; +if ($config['flash_charts']) { + echo graphic_user_activity (300, 140); +} else { + echo ''; +} +echo '
'; +echo '
 
'; +echo '
'; +echo '
'; +echo ''.__('Filter').'

'; $rows = get_db_all_rows_sql ("SELECT DISTINCT(accion) FROM tsesion"); if (empty ($rows)) { $rows = array (); } - $actions = array (); foreach ($rows as $row) { $actions[$row["accion"]] = $row["accion"]; } - -echo "
"; echo '
'; echo __('Action').': '; -echo "
"; print_select ($actions, 'tipo_log', $tipo_log, 'this.form.submit();', __('All'), 'all'); echo '
'; echo ''; - - -echo "
'; $filter = ''; if ($tipo_log != 'all') { $filter = sprintf (" WHERE accion = '%s'", $tipo_log); @@ -76,10 +71,7 @@ $sql = "SELECT COUNT(*) FROM tsesion ".$filter; $count = get_db_sql ($sql); $url = "index.php?sec=godmode&sec2=godmode/admin_access_logs&tipo_log=".$tipo_log; - -echo "
"; pagination ($count, $url); -echo "
"; $sql = sprintf ("SELECT * FROM tsesion%s ORDER BY fecha DESC LIMIT %d, %d", $filter, $offset, $config["block_size"]); $result = get_db_all_rows_sql ($sql); diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php index 5c9d62bcd1..78d3761b6f 100644 --- a/pandora_console/godmode/agentes/manage_config_remote.php +++ b/pandora_console/godmode/agentes/manage_config_remote.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 @@ -131,6 +131,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { } } echo ''; + echo ''; // Destination agent echo ''; @@ -147,12 +148,11 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) { echo ""; } echo ''; - + echo ''; // Form buttons echo ''; echo ''; - echo ''; - echo ''; + echo ''; echo ''; } diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php index ca3c99dd6a..a6f186b1d3 100644 --- a/pandora_console/godmode/db/db_refine.php +++ b/pandora_console/godmode/db/db_refine.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 @@ -57,8 +57,11 @@ if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) { echo '

'.__('Filtering completed').'

'; } echo '
'; +echo ""; + +echo '
'; echo '
'; -echo ''.__('Source agent').'
'; +echo ''.__('Source agent').'

'; $agent_selected = get_parameter_post ("origen", 0); $agents = get_group_agents (array_keys (get_user_groups ($config["id_user"], "AW"))); @@ -80,13 +83,20 @@ print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, echo '
'; //Left div echo '
'.__('Purge data out of these limits').'

'; +echo ''; +echo ''; +echo '
'; echo __('Minimum').': '; +echo ''; print_input_text ("min", 0, __('Minimum'), 4, 0, false); -echo '
'; -echo __('Maximum').': '; +echo '
'; +echo __('Maximum').': '; +echo ''; print_input_text ("max", 0, __('Maximum'), 4, 0, false); -echo '
'; +echo '
'; +echo '
'; +echo '
 
'; +print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"'); +echo '
'; -print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"'); -echo '
 
'; ?> diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index d52280a496..baec0bde70 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -254,14 +254,14 @@ if (isset ($_GET["update_alert"])) { $table->size = array (); $table->cellpadding = 4; $table->cellspacing = 4; - $table->width = 750; + $table->width = "750 px"; $table->class= "databox"; $table->align = array (); $table->head[0] = __('Alert action'); $table->head[1] = __('SNMP Agent'); - $table->size[1] = 75; + $table->size[1] = "90px"; $table->align[1] = 'center'; $table->head[2] = __('OID'); @@ -279,8 +279,8 @@ if (isset ($_GET["update_alert"])) { $table->align[6] = 'center'; $table->head[7] = __('Action'); - $table->size[7] = 50; - $table->align[7] = 'right'; + $table->size[7] = "50px"; + $table->align[7] = 'center'; foreach ($result as $row) { $data = array (); diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php index 34d2cf63c9..b47f22cf62 100644 --- a/pandora_console/godmode/snmpconsole/snmp_filters.php +++ b/pandora_console/godmode/snmpconsole/snmp_filters.php @@ -110,15 +110,15 @@ if ($edit_filter > -2) { $table->size = array (); $table->cellpadding = 4; $table->cellspacing = 4; - $table->width = 750; + $table->width = "750px"; $table->class= "databox"; $table->align = array (); $table->head[0] = __('Description'); $table->head[1] = __('Filter'); $table->head[2] = __('Action'); - $table->size[2] = 50; - $table->align[2] = 'right'; + $table->size[2] = "50px"; + $table->align[2] = 'center'; foreach ($result as $row) { $data = array ();