diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index cb6fed137d..1511ec454e 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.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 @@ -39,8 +39,8 @@ if (is_ajax ()) { return; } -echo "

".__('Alerts')." » "; -echo __('Alert actions').'

'; +// Header +print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "", true); $update_action = (bool) get_parameter ('update_action'); $create_action = (bool) get_parameter ('create_action'); diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index be5ac315c8..0dea4d8309 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.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 @@ -38,8 +38,9 @@ if (is_ajax ()) { return; } -echo "

".__('Alerts')." » "; -echo __('Alert commands').'

'; +// Header +print_page_header (__('Alerts').' » '.__('Alert commands'), "images/god2.png", false, "", true); + $update_command = (bool) get_parameter ('update_command'); $create_command = (bool) get_parameter ('create_command'); $delete_command = (bool) get_parameter ('delete_command'); diff --git a/pandora_console/godmode/alerts/alert_compounds.php b/pandora_console/godmode/alerts/alert_compounds.php index 77db2bdfed..bcf67d08f2 100644 --- a/pandora_console/godmode/alerts/alert_compounds.php +++ b/pandora_console/godmode/alerts/alert_compounds.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 @@ -46,6 +46,10 @@ $delete_alert = (int) get_parameter ('delete_alert'); $enable_alert = (int) get_parameter ('enable_alert'); $disable_alert = (int) get_parameter ('disable_alert'); +// Header +print_page_header (__('Alerts').' » '.__('Correlated alerts'), "images/god2.png", false, "", true); + + if ($delete_alert) { $id = (int) get_parameter ('id'); $result = delete_alert_compound ($id); @@ -76,9 +80,6 @@ if ($disable_alert) { return; } -echo "

".__('Alerts')." » "; -echo __('Correlated alerts').'

'; - $table->id = 'filter_compound_table'; $table->width = '90%'; $table->data = array (); diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 3811b4a7d2..c39ed7a7bd 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.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 @@ -106,6 +106,16 @@ $delete_alert = (bool) get_parameter ('delete_alert'); $disable_alert = (bool) get_parameter ('disable_alert'); $enable_alert = (bool) get_parameter ('enable_alert'); +// Header +if ($id_agente) { + print_page_header (__('Agent configuration').' » '.__('Alerts'), "images/god2.png", false, "", true); + $agents = array ($id_agente => get_agent_name ($id_agente)); +} else { + print_page_header (__('Alerts').' » '.__('Manage alerts'), "images/god2.png", false, "", true); + $groups = get_user_groups (); + $agents = get_group_agents (array_keys ($groups), false, "none"); +} + if ($create_alert) { $id_alert_template = (int) get_parameter ('template'); $id_agent_module = (int) get_parameter ('id_agent_module'); @@ -209,15 +219,6 @@ if ($disable_alert) { __('Could not be disabled')); } -if ($id_agente) { - echo '

'.__('Agent configuration').' » '.__('Alerts').'

'; - $agents = array ($id_agente => get_agent_name ($id_agente)); -} else { - echo '

'.__('Alerts').' » '.__('Manage alerts').'

'; - $groups = get_user_groups (); - $agents = get_group_agents (array_keys ($groups), false, "none"); -} - echo ''.__('Alert control filter').' '.print_image ("images/down.png", true, array ("title" => __('Toggle filter(s)'))).'

'; $templateName = get_parameter('template_name',''); diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 6585c17ab3..04f9c19a43 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.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 @@ -107,7 +107,7 @@ if (! give_acl ($config['id_user'], 0, "LM")) { } // Header -print_page_header (__('Alerts')." » ". __('Alert templates'), "", false, "", true); +print_page_header (__('Alerts')." » ". __('Alert templates'), "images/god2.png", false, "", true); $update_template = (bool) get_parameter ('update_template'); $delete_template = (bool) get_parameter ('delete_template'); diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 876f5f5fe9..9a697c3d22 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.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 @@ -45,8 +45,8 @@ if ($id) { $field3 = $action['field3']; $group = $action ['group']; } - -echo "

".__('Alerts')." » ".__('Configure alert action')."

"; +// Header +print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/god2.png", false, "", true); $table->width = '90%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 947941afa2..0d7c029490 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.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 @@ -38,7 +38,8 @@ if ($id) { $description = $alert['description']; } -echo '

'.__('Alerts').' » '.__('Configure alert command').'

'; +// Header +print_page_header (__('Alerts').' » '.__('Configure alert command'), "images/god2.png", false, "", true); $table->width = '90%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php index c687852906..cbba037d41 100644 --- a/pandora_console/godmode/alerts/configure_alert_compound.php +++ b/pandora_console/godmode/alerts/configure_alert_compound.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 @@ -235,6 +235,9 @@ if ($id && ! $create_compound) { } } +// Header +print_page_header (__('Alerts').' » '.__('Configure correlated alert'), "images/god2.png", false, "", true); + if ($create_compound) { $name = (string) get_parameter ('name'); $description = (string) get_parameter ('description'); @@ -271,9 +274,6 @@ if ($update_compound) { } } -echo "

".__('Alerts')." » "; -echo __('Configure correlated alert').'

'; - print_alert_compound_steps ($step, $id); $groups = get_user_groups (); diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 13c2820034..0077320969 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.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 diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 03d473a475..479ccf68ab 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.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 diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index a731fdf332..9adc7d63f0 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.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 @@ -25,6 +25,10 @@ if (! give_acl ($config['id_user'], 0, "UM")) { exit; } +// Header +print_page_header (__('User management').' » '.__('Users defined in Pandora'), "images/god3.png", false, "", true); + + if (isset ($_GET["user_del"])) { //delete user $id_user = get_parameter_post ("delete_user"); $result = delete_user ($id_user); @@ -43,8 +47,6 @@ if (isset ($_GET["user_del"])) { //delete user __('There was a problem deleting the profile')); } -echo '

'.__('User management').' » '.__('Users defined in Pandora').'

'; - $table->cellpadding = 4; $table->cellspacing = 4; $table->width = 700;