From 2ca62440faaabbb8ed12886072626caebad888a5 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Tue, 2 Mar 2010 16:41:27 +0000
Subject: [PATCH] 2010-03-02  Raul Mateos <raulofpandora@gmail.com>

	* godmode/agentes/*.php, godmode/group/*.php, godmode/modules/*.php:
	Updated year and headers in several files. Little by little I'll change
	the rest...

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                                | 6 ++++++
 pandora_console/godmode/agentes/agent_manager.php        | 9 ++++-----
 pandora_console/godmode/agentes/configurar_agente.php    | 2 +-
 pandora_console/godmode/agentes/manage_config_remote.php | 7 +++++--
 pandora_console/godmode/agentes/modificar_agente.php     | 6 ++++--
 pandora_console/godmode/agentes/planned_downtime.php     | 8 ++++----
 pandora_console/godmode/groups/configure_group.php       | 9 ++++-----
 pandora_console/godmode/groups/group_list.php            | 7 ++++---
 pandora_console/godmode/modules/manage_nc_groups.php     | 2 +-
 .../godmode/modules/manage_network_components.php        | 5 ++---
 .../godmode/modules/manage_network_components_form.php   | 2 +-
 .../modules/manage_network_components_form_common.php    | 2 +-
 .../modules/manage_network_components_form_network.php   | 9 ++-------
 .../modules/manage_network_components_form_plugin.php    | 4 +---
 .../modules/manage_network_components_form_wmi.php       | 4 +---
 .../godmode/modules/manage_network_templates.php         | 2 +-
 .../godmode/modules/manage_network_templates_form.php    | 3 ++-
 17 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6e34dd6dbc..aa26dd67a9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-02  Raúl Mateos <raulofpandora@gmail.com>
+
+	* godmode/agentes/*.php, godmode/group/*.php, godmode/modules/*.php:
+	Updated year and headers in several files. Little by little I'll change
+	the rest...
+
 2010-03-02  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/javascript/OpenLayers/lib/*, 
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 3a5473b4d1..93fa4a482e 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.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
@@ -60,14 +60,13 @@ if ($new_agent) {
 		$nombre_agente = $direccion_agente;
 }
 
-echo "<h2>".__('Agent configuration')." &raquo; ";
+// Header
 
 if ($id_agente) {
-	echo __('Update agent');
+	print_page_header (__('Agent configuration')." &raquo; ".__('Update agent'), "", false, "", true);
 } else {
-	echo __('Create agent');
+	print_page_header (__('Agent configuration')." &raquo; ".__('Create agent'), "", false, "", true);
 }
-echo "</h2>";
 echo '<div style="height: 5px">&nbsp;</div>';
 
 if (!$new_agent) {
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index d0b57fca08..bfa7add2e0 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_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
diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php
index 1adc3f0572..c06482e40f 100644
--- a/pandora_console/godmode/agentes/manage_config_remote.php
+++ b/pandora_console/godmode/agentes/manage_config_remote.php
@@ -36,7 +36,9 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
 	// DATA COPY
 	// ---------
 	if (isset($_POST["copy"])) {
-		echo "<h2>".__('Data Copy')."</h2>";
+		// Header
+		print_page_header (__("Data Copy"), "images/god1.png", false, "", true, "");
+
 		// Initial checkings
 
 		// if selected more than 0 agents
@@ -91,7 +93,8 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
 	} else { 
 		
 		// title
-		echo '<h2>'.__('Agent configuration'). ' &raquo; '. __('Remote configuration management').'</h2>';
+		// Header
+		print_page_header (__("Remote configuration management"), "images/god1.png", false, "", true, "");
 		echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/manage_config_remote&operacion=1">';
 		echo "<table width='650' border='0' cellspacing='4' cellpadding='4' class='databox'>";
 		
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index bfc10c1fd0..0fe7bd9e19 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_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
@@ -50,7 +50,9 @@ if (isset ($_GET["borrar_agente"])) { // if delete agent
 		exit;
 	}
 }
-echo "<h2>".__('Agent configuration')." &raquo; ".__('Agents defined in Pandora')."</h2>";
+
+// Header
+print_page_header (__('Agent configuration')." &raquo; ".__('Agents defined in Pandora'), "", false, "", true);
 
 // Show group selector
 if (isset($_POST["ag_group"])){
diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php
index 38ee790d66..0f7e9b9dfb 100644
--- a/pandora_console/godmode/agentes/planned_downtime.php
+++ b/pandora_console/godmode/agentes/planned_downtime.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
@@ -49,6 +49,9 @@ $delete_downtime_agent = (int) get_parameter ("delete_downtime_agent", 0);
 
 $groups = get_user_groups ();
 
+// Header
+print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, "");
+
 // INSERT A NEW DOWNTIME_AGENT ASSOCIATION
 if ($insert_downtime_agent == 1){
 	$agents = $_POST["id_agent"];
@@ -118,9 +121,6 @@ if ($create_downtime || $update_downtime) {
 	}
 }
 
-// Header
-print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, "");
-
 // Show create / update form
 	
 	if (($first_create != 0) OR ($first_update != 0)){
diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index eb4c2ae6a2..ebccb5e503 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.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
@@ -50,13 +50,12 @@ if ($id_group) {
 	}
 }
 
-echo "<h2>".__('Group management')." &raquo; ";
+// Header
 if ($id_group) {
-	echo __('Update group');
+	print_page_header (__("Update group"), "images/god1.png", false, "", true, "");
 } else {
-	echo __('Create group');
+	print_page_header (__("Create group"), "images/god1.png", false, "", true, "");
 }
-echo "</h2>";
 
 $table->width = '450px';
 $table->data = array ();
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 21cebdd267..7b42203540 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_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
@@ -63,6 +63,9 @@ if (is_ajax ()) {
 	return;
 }
 
+// Header
+print_page_header (__("Groups defined in Pandora"), "images/god1.png", false, "", true, "");
+
 $create_group = (bool) get_parameter ('create_group');
 $update_group = (bool) get_parameter ('update_group');
 $delete_group = (bool) get_parameter ('delete_group');
@@ -120,8 +123,6 @@ if ($delete_group) {
 		echo "<h3 class='suc'>".__('Group successfully deleted')."</h3>";
 }
 
-echo "<h2>".__('Group management')." &raquo; ";	
-echo __('Groups defined in Pandora')."</h2>";
 
 $table->width = '65%';
 $table->head = array ();
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 2281543cc6..6ac1c1e811 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.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/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index 1eb7d8c63c..3cb5b279ac 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.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
@@ -26,8 +26,7 @@ if (! give_acl ($config['id_user'], 0, "PM")) {
 }
 
 // Header
-print_page_header (__('Module management')." &raquo; ". __('Module component management'), "", false, "", true);
-
+print_page_header (__('Module management').' &raquo; '.__('Module component management'), "", false, "", true);
 
 require_once ('include/functions_network_components.php');
 
diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php
index ad37deed44..048965c570 100644
--- a/pandora_console/godmode/modules/manage_network_components_form.php
+++ b/pandora_console/godmode/modules/manage_network_components_form.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/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index e80febc279..440bcc0b5f 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.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/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php
index f406fa378c..b180566f0c 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_network.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_network.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
@@ -29,8 +29,6 @@ if (! $id) {
 	$snmp_community = "public";
 }
 
-echo "<h2>".__('Module management')." &raquo; ";
-echo __('Module component management')."</h2>";
 echo "<h3>".__('Network component')."</h3>";
 
 $snmp_versions['1'] = 'v. 1';
@@ -57,9 +55,6 @@ $data[3] = print_input_text ('snmp_community', $snmp_community, '', 15, 60, true
 push_table_row ($data, 'snmp_2');
 
 
-
-
-
 $data = array();
 $data[0] = __('Auth user');
 $data[1] = print_input_text ('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
@@ -99,4 +94,4 @@ $data[1] = print_textarea ('tcp_rcv', 2, 65, $tcp_rcv, '', true);
 $table->colspan['tcp_receive'][1] = 3;
 
 push_table_row ($data, 'tcp_receive');
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php
index 9b2f7ba6fb..a14d427428 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.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
@@ -18,8 +18,6 @@ require_once ('include/config.php');
 
 check_login ();
 
-echo "<h2>".__('Module management')." &raquo; ";
-echo __('Module component management')."</h2>";
 echo "<h3>".__('Plugin component').'</h3>';
 
 $data = array ();
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wmi.php b/pandora_console/godmode/modules/manage_network_components_form_wmi.php
index 087552032b..85c683bf46 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wmi.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wmi.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
@@ -26,8 +26,6 @@ if (! give_acl ($config['id_user'], 0, "PM")) {
 	return;
 }
 
-echo "<h2>".__('Module management')." &raquo; ";
-echo __('Module component management')."</h2>";
 echo "<h3>".__('WMI component management').'</h3>';
 
 $data = array ();
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 0811d4a356..98cf47fd42 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_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
diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php
index 54773366fb..ec686cafe3 100644
--- a/pandora_console/godmode/modules/manage_network_templates_form.php
+++ b/pandora_console/godmode/modules/manage_network_templates_form.php
@@ -28,6 +28,8 @@ if (! give_acl ($config['id_user'], 0, "PM")) {
 
 require_once ('include/functions_network_components.php');
 
+print_page_header (__('Module management')." &raquo; ".__('Module template management'), "", false, "", true);
+
 $id_np = get_parameter ("id_np", -1); //Network Profile
 $ncgroup = get_parameter ("ncgroup", -1); //Network component group
 $id_nc = get_parameter ("components", array ());
@@ -97,7 +99,6 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) {
 	$name = "";
 }
 
-echo "<h2>".__('Module management')." &raquo; ".__('Module template management')."</h2>";
 
 if ($id_np < 1) {
 	echo '<form name="new_temp" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'&create=1">';