From f2c453bd9a231ab09395d98bdbf5bcc4af43ff20 Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Fri, 4 Jan 2013 09:58:13 +0000
Subject: [PATCH] 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

	* include/help/en/help_alert_macros.php
	 include/help/es/help_alert_macros.php: Added macro _email_tag_
	 to these help screens.
	* include/functions_reports.php: Added exception to templates when
	report types are displayed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            |  8 ++++++++
 pandora_console/include/functions_reports.php        | 12 +++++-------
 .../include/help/en/help_alert_macros.php            |  1 +
 .../include/help/es/help_alert_macros.php            |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0e484b4f1f..c8a57eb136 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/help/en/help_alert_macros.php
+	 include/help/es/help_alert_macros.php: Added macro _email_tag_
+	 to these help screens.
+	* include/functions_reports.php: Added exception to templates when
+	report types are displayed.
+	 
 2013-01-03 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* extensions/resource_registration.php,
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 060c3d6e92..e90b833c31 100644
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -604,13 +604,11 @@ function reports_get_report_types ($template = false, $not_editor = false) {
 		}
 	}
 	
-	$types['agent_configuration'] = array('optgroup' => __('Configuration'),
-		'name' => __('Agent configuration')); 
-	$types['group_configuration'] = array('optgroup' => __('Configuration'),
-		'name' => __('Group configuration')); 
-
-
-	if (!$template) {
+	if (!$template) {	
+		$types['agent_configuration'] = array('optgroup' => __('Configuration'),
+			'name' => __('Agent configuration')); 
+		$types['group_configuration'] = array('optgroup' => __('Configuration'),
+			'name' => __('Group configuration')); 
 		$types['netflow_area'] = array('optgroup' => __('Netflow'),
 			'name' => __('Netflow area chart')); 
 		$types['netflow_pie'] = array('optgroup' => __('Netflow'),
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index e6a29faf74..b75c96dff6 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -39,6 +39,7 @@ The following macros are available:
 <li>_plugin_parameters_ : Plug-in Parameters of the module.</li>
 <li>_groupcontact_ : Group contact information.	Configured when the group is created.</li>
 <li>_groupother_ : Other information about the group. Configured when the group is created.</li>
+<li>_email_tag_ : Emails associated to the module tags.</li>
 
 </ul>
 <p>
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index 3dfc84b80b..f3a4105248 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -40,6 +40,7 @@ Las siguientes macros están disponibles:
 <li>_plugin_parameters_ : Parámetros del Plug-in del módulo.</li>
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
+<li>_email_tag_ : Emails asociados a los tags de módulos.</li>
 
 </ul>
 <p>