From ac51c47df7a386eb267fdc03a193681296e115f2 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 26 Aug 2009 15:37:47 +0000
Subject: [PATCH] 2009-08-24  Miguel de Dios  <miguel.dedios@artica.es>

	* include/functions_menu.php, include/functions_html.php,
	include/functions_events.php, include/functions_messages.php,
	include/functions_modules.php, include/functions_exportserver.php,
	include/functions_reporting.php, include/functions_filemanager.php,
	include/pchart_graph.php, include/pandora_graph.php, include/auth/ldap.php,
	include/auth/mysql.php, include/config.inc.php,
	include/functions_networkmap.php, include/functions_servers.php,
	include/functions_network_profiles.php, include/gettext.php,
	include/functions_network_components.php, include/functions_visual_map.php,
	include/fgraph2.php, include/Image/image_functions.php,
	include/functions_config.php, include/config_process.php,
	include/functions_ui.php, include/htmlawed.php,
	include/functions_custom_graphs.php, include/fgraph.php,
	include/functions_incidents.php, include/functions.php,
	include/functions_agents.php, include/functions_db.php,
	include/functions_themes.php, include/streams.php,
	include/functions_fsgraph.php, include/functions_alerts.php,
	include/functions_reports.php, include/functions_extensions.php,
	include/functions_ui_renders.php: change or add the subpackage in phpdoc
	comment blocks for to organize more the result phpdoc files. Start to
	document undocument functions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1882 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  24 +++
 .../include/Image/image_functions.php         |  14 ++
 pandora_console/include/auth/ldap.php         |  21 ++-
 pandora_console/include/auth/mysql.php        |  18 ++
 pandora_console/include/config.inc.php        |   1 +
 pandora_console/include/config_process.php    |   1 +
 pandora_console/include/fgraph.php            | 176 +++++++++++++++++-
 pandora_console/include/fgraph2.php           |   1 +
 pandora_console/include/functions.php         |   1 +
 pandora_console/include/functions_agents.php  |   1 +
 pandora_console/include/functions_alerts.php  |   1 +
 pandora_console/include/functions_config.php  |   1 +
 .../include/functions_custom_graphs.php       |   1 +
 pandora_console/include/functions_db.php      |   1 +
 pandora_console/include/functions_events.php  |   1 +
 .../include/functions_exportserver.php        |   1 +
 .../include/functions_extensions.php          |   1 +
 .../include/functions_filemanager.php         |   1 +
 pandora_console/include/functions_fsgraph.php |   1 +
 pandora_console/include/functions_html.php    |   1 +
 .../include/functions_incidents.php           |   1 +
 pandora_console/include/functions_menu.php    |   1 +
 .../include/functions_messages.php            |   1 +
 pandora_console/include/functions_modules.php |   1 +
 .../include/functions_network_components.php  |   1 +
 .../include/functions_network_profiles.php    |   1 +
 .../include/functions_networkmap.php          |   1 +
 .../include/functions_reporting.php           |   1 +
 pandora_console/include/functions_reports.php |   1 +
 pandora_console/include/functions_servers.php |   1 +
 pandora_console/include/functions_themes.php  |   1 +
 pandora_console/include/functions_ui.php      |   1 +
 .../include/functions_ui_renders.php          |   1 +
 .../include/functions_visual_map.php          |   1 +
 pandora_console/include/gettext.php           |   1 +
 pandora_console/include/htmlawed.php          |   1 +
 pandora_console/include/pandora_graph.php     |   1 +
 pandora_console/include/pchart_graph.php      |   1 +
 pandora_console/include/streams.php           |   1 +
 39 files changed, 272 insertions(+), 15 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d78d56773c..c01f631edb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,27 @@
+2009-08-24  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_menu.php, include/functions_html.php,
+	include/functions_events.php, include/functions_messages.php,
+	include/functions_modules.php, include/functions_exportserver.php,
+	include/functions_reporting.php, include/functions_filemanager.php,
+	include/pchart_graph.php, include/pandora_graph.php, include/auth/ldap.php,
+	include/auth/mysql.php, include/config.inc.php,
+	include/functions_networkmap.php, include/functions_servers.php,
+	include/functions_network_profiles.php, include/gettext.php,
+	include/functions_network_components.php, include/functions_visual_map.php,
+	include/fgraph2.php, include/Image/image_functions.php,
+	include/functions_config.php, include/config_process.php,
+	include/functions_ui.php, include/htmlawed.php,
+	include/functions_custom_graphs.php, include/fgraph.php,
+	include/functions_incidents.php, include/functions.php,
+	include/functions_agents.php, include/functions_db.php,
+	include/functions_themes.php, include/streams.php,
+	include/functions_fsgraph.php, include/functions_alerts.php,
+	include/functions_reports.php, include/functions_extensions.php,
+	include/functions_ui_renders.php: change or add the subpackage in phpdoc
+	comment blocks for to organize more the result phpdoc files. Start to
+	document undocument functions. 
+
 2009-08-24  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_menu.php, include/functions_html.php,
diff --git a/pandora_console/include/Image/image_functions.php b/pandora_console/include/Image/image_functions.php
index ed9907839b..db23acd6b0 100644
--- a/pandora_console/include/Image/image_functions.php
+++ b/pandora_console/include/Image/image_functions.php
@@ -50,6 +50,13 @@ if (isset($_GET['getFile'])) {
 }
 //END Lines of code for direct url call script
 
+/**
+ * Get a file change http header and write as binary output for
+ * redirect to file content.
+ * 
+ * @param string destFileName Name for rename file when the browser get the file.
+ * @param string fileLocation The real location the file in server.
+ */
 function getFile ($destFileName,$fileLocation) {
 	error_reporting(E_ALL);
 	
@@ -60,6 +67,13 @@ function getFile ($destFileName,$fileLocation) {
 	readfile($fileLocation);
 }
 
+/**
+ * Create a thumb of image file in filesystem of server.
+ * @param string origFileName Original image
+ * @param string destFileName Thumb image
+ * @param integer newWidth Thumb width
+ * @param integer newHeight Thumb height
+ */
 function createthumb ($origFileName, $destFileName, $newWidth, $newHeight) {
 	//TODO $newWidth and $newHeight values as percent.
 	
diff --git a/pandora_console/include/auth/ldap.php b/pandora_console/include/auth/ldap.php
index 9d0ae02d5f..4135d8c76a 100644
--- a/pandora_console/include/auth/ldap.php
+++ b/pandora_console/include/auth/ldap.php
@@ -478,21 +478,24 @@ function get_users ($order = false) {
 	return $ldap_cache["cached_users"];
 }
 
-// Strip everything but the username (uid) from a dn.
-//  params:
-//    $dn - the dn you want to strip the uid from.
-//  returns: string - userid
-//
-//  ex: stripdn(uid=jeffh,ou=people,dc=example,dc=com) returns jeffh
+/**
+ * Strip everything but the username (uid) from a dn.
+ * Example: path description
+ * stripdn(uid=jeffh,ou=people,dc=example,dc=com) returns jeffh
+ * @param string dn the dn you want to strip the uid from.
+ * @return string userid
+ */
 function stripdn ($dn) {
 	list ($uid, $trash) = split (',', $dn, 2);
 	list ($trash, $user) = split ('=', $uid);
 	return ($user);
 }
 
-// Connects and binds to the LDAP server
-// Tries to connect as $config["auth"]["ldap_admin_dn"] if we set it.
-//  returns: bind result or false
+/**
+ * Connects and binds to the LDAP server
+ * Tries to connect as $config["auth"]["ldap_admin_dn"] if we set it.
+ * @return boolean Bind result or false
+ */
 function ldap_connect_bind () {
 	global $ldap_cache, $config;
 	
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 1f3f804f62..0024a66c07 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -224,12 +224,30 @@ function delete_user ($id_user) {
 	return true;
 }
 
+/**
+ * Update the password in MD5 for user pass as id_user with
+ * password in plain text.
+ * 
+ * @param string user User ID
+ * @param string password Password in plain text.
+ * 
+ * @return mixed False in case of error or invalid values passed. Affected rows otherwise
+ */
 function update_user_password ($user, $password_new) {
 	return process_sql_update ('tusuario',
 		array ('password' => md5 ($password_new)),
 		array ('id_user' => $user));
 }
 
+/**
+ * Update the data of a user that user is choose with
+ * id_user.
+ * 
+ * @param string user User ID
+ * @param array values Associative array with index as name of field and content.
+ * 
+ * @return mixed False in case of error or invalid values passed. Affected rows otherwise
+ */
 function update_user ($id_user, $values) {
 	if (! is_array ($values))
 		return false;
diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php
index 85ed9f92fe..5156893d9f 100644
--- a/pandora_console/include/config.inc.php
+++ b/pandora_console/include/config.inc.php
@@ -14,6 +14,7 @@
 
 /**
  * @package Include
+ * @subpackage Config
  */
 
 // Default values
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4c6214015a..13632799f9 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Config
  */
 
 /**
diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php
index f155a8c27e..9dae6da753 100644
--- a/pandora_console/include/fgraph.php
+++ b/pandora_console/include/fgraph.php
@@ -15,6 +15,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 
@@ -52,6 +53,8 @@ check_login ();
 
 /**
  * Show a brief error message in a PNG graph
+ * 
+ * @param string image File that show when has a problem.
  */
 function graphic_error ($image = 'image_problem.png') {
 	global $config;
@@ -83,7 +86,6 @@ function dame_fecha ($mh) {
  *
  * @return string Formatted date string
  */
-
 function dame_fecha_grafico_timestamp ($timestamp) {
 	return date ('d/m H:i', $timestamp);
 }
@@ -102,6 +104,8 @@ function dame_fecha_grafico_timestamp ($timestamp) {
  * @param int Show alerts in graph (set to 1)
  * @param int Pure mode (without titles) (set to 1)
  * @param int Date to start of getting info.
+ * 
+ * @return Mixed 
  */
 function graphic_combined_module ($module_list, $weight_list, $period, $width, $height,
 				$title, $unit_name, $show_event = 0, $show_alert = 0, $pure = 0, $stacked = 0, $date = 0) {
@@ -461,6 +465,13 @@ function grafico_modulo_sparse ($id_agente_modulo, $period, $show_event,
 	$engine->sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name);
 }
 
+/**
+ * Print a pie graph with module data of agents
+ * 
+ * @param integer id_agent Agent ID
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ */
 function graphic_agentmodules ($id_agent, $width, $height) {
 	global $config;
 	
@@ -476,6 +487,14 @@ function graphic_agentmodules ($id_agent, $width, $height) {
 	generic_pie_graph ($width, $height, $data);
 }
 
+/**
+ * Print a graph with access data of agents
+ * 
+ * @param integer id_agent Agent ID
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer period time period
+ */
 function graphic_agentaccess ($id_agent, $width, $height, $period = 0) {
 	global $config;
 	global $graphic_type;
@@ -527,6 +546,14 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) {
 	$engine->single_graph ();
 }
 
+/**
+ * Print a graph with event data of agents
+ * 
+ * @param integer id_agent Agent ID
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer period time period
+ */
 function graphic_agentevents ($id_agent, $width, $height, $period = 0) {
 	global $config;
 	global $graphic_type;
@@ -572,6 +599,9 @@ function graphic_agentevents ($id_agent, $width, $height, $period = 0) {
 	}
 }
 
+/**
+ * Print a pie graph with incidents data
+ */
 function graph_incidents_status () {
 	global $config;
 	global $graphic_type;
@@ -606,6 +636,9 @@ function graph_incidents_status () {
 	generic_pie_graph (370, 180, $data);
 }
 
+/**
+ * Print a pie graph with priodity incident
+ */
 function grafico_incidente_prioridad () {
 	global $config;
 	global $graphic_type;
@@ -635,6 +668,9 @@ function grafico_incidente_prioridad () {
 	generic_pie_graph (320, 200, $data);
 }
 
+/**
+ * Print a pie graph with incident data by group
+ */
 function graphic_incident_group () {
 	global $config;
 	global $graphic_type;
@@ -659,6 +695,14 @@ function graphic_incident_group () {
 	generic_pie_graph (320, 200, $data);
 }
 
+/**
+ * Print a graph with access data of agents
+ * 
+ * @param integer id_agent Agent ID
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer period time period
+ */
 function graphic_incident_user () {
 	global $config;
 	global $graphic_type;
@@ -681,6 +725,13 @@ function graphic_incident_user () {
 	generic_pie_graph (320, 200, $data);
 }
 
+/**
+ * Print a pie graph with users activity in a period of time
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer period time period
+ */
 function graphic_user_activity ($width = 350, $height = 230) {
 	global $config;
 	global $graphic_type;
@@ -702,6 +753,12 @@ function graphic_user_activity ($width = 350, $height = 230) {
  	generic_pie_graph ($width, $height, $data);
 }
 
+/**
+ * Print a pie graph with access data of incidents source
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ */
 function graphic_incident_source ($width = 320, $height = 200) {
 	global $config;
 	global $graphic_type;
@@ -723,6 +780,12 @@ function graphic_incident_source ($width = 320, $height = 200) {
 	generic_pie_graph ($width, $height, $data);
 }
 
+/**
+ * Print a horizontal bar graph with modules data of agents
+ * 
+ * @param integer height graph height
+ * @param integer width graph width
+ */
 function graph_db_agentes_modulos ($width, $height) {
 	global $config;
 	global $graphic_type;
@@ -747,6 +810,12 @@ function graph_db_agentes_modulos ($width, $height) {
 	generic_horizontal_bar_graph ($width, $height, $data);
 }
 
+/**
+ * Print a pie graph with events data of users
+ * 
+ * @param integer height pie graph height
+ * @param integer period time period
+ */
 function grafico_eventos_usuario ($width, $height) {
 	global $config;
 	global $graphic_type;
@@ -768,6 +837,11 @@ function grafico_eventos_usuario ($width, $height) {
 	generic_pie_graph ($width, $height, $data);
 }
 
+/**
+ * Print a pie graph with events data in 320x200 size
+ * 
+ * @param string filter Filter for query in DB
+ */
 function grafico_eventos_total ($filter = "") {
 	global $config;
 	global $graphic_type;
@@ -801,6 +875,13 @@ function grafico_eventos_total ($filter = "") {
 	generic_pie_graph (320, 200, $data);
 }
 
+/**
+ * Print a pie graph with events data of agent
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer id_agent Agent ID
+ */
 function graph_event_module ($width = 300, $height = 200, $id_agent) {
 	global $config;
 	global $graphic_type;
@@ -846,7 +927,13 @@ function graph_event_module ($width = 300, $height = 200, $id_agent) {
 			'show_legend' => false));
 }
 
-
+/**
+ * Print a pie graph with events data of group
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param string url
+ */
 function grafico_eventos_grupo ($width = 300, $height = 200, $url = "") {
 	global $config;
 	global $graphic_type;
@@ -899,6 +986,14 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "") {
 	generic_pie_graph ($width, $height, $data, array ('show_legend' => false));
 }
 
+/**
+ * Print a single graph with data
+ * 
+ * @param integer width graph width
+ * @param integer height graph height
+ * @param mixed data Data for make the graph
+ * @param integer interval interval to print
+ */
 function generic_single_graph ($width = 380, $height = 200, &$data, $interval = 1) {
 	global $config;
 	
@@ -916,6 +1011,14 @@ function generic_single_graph ($width = 380, $height = 200, &$data, $interval =
 	$engine->single_graph ();
 }
 
+/**
+ * Print a vertical bar graph with data
+ * 
+ * @param integer width graph width
+ * @param integer height graph height
+ * @param mixed data Data for make the graph
+ * @param string legend Legend to show in graph
+ */
 function generic_vertical_bar_graph ($width = 380, $height = 200, &$data, &$legend) {
 	global $config;
 	
@@ -933,6 +1036,14 @@ function generic_vertical_bar_graph ($width = 380, $height = 200, &$data, &$lege
 	$engine->vertical_bar_graph ();
 }
 
+/**
+ * Print a horizontal bar graph with data
+ * 
+ * @param integer width graph width
+ * @param integer height graph height
+ * @param mixed data Data for make the graph
+ * @param string legend Legend to show in graph
+ */
 function generic_horizontal_bar_graph ($width = 380, $height = 200, &$data, $legend = false) {
 	global $config;
 	
@@ -950,6 +1061,14 @@ function generic_horizontal_bar_graph ($width = 380, $height = 200, &$data, $leg
 	$engine->horizontal_bar_graph ();
 }
 
+/**
+ * Print a pie graph with data
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param mixed data Data for make the graph
+ * @param mixed options Options for show graph as 'show_title', 'show_legend' and 'zoom'
+ */
 function generic_pie_graph ($width = 300, $height = 200, &$data, $options = false) {
 	global $config;
 	
@@ -982,6 +1101,12 @@ function generic_pie_graph ($width = 300, $height = 200, &$data, $options = fals
 	$engine->pie_graph ();
 }
 
+/**
+ * Print a horizontal bar graph with packets data of agents
+ * 
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ */
 function grafico_db_agentes_paquetes ($width = 380, $height = 300) {
 	global $config;
 	global $graphic_type;
@@ -1006,6 +1131,13 @@ function grafico_db_agentes_paquetes ($width = 380, $height = 300) {
 	generic_horizontal_bar_graph ($width, $height, $data, $legend);
 }
 
+/**
+ * Print a pie graph with purge data of agent
+ * 
+ * @param integer id_agent ID of agent to show
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ */
 function grafico_db_agentes_purge ($id_agent, $width, $height) {
 	global $config;
 	global $graphic_type;
@@ -1054,10 +1186,14 @@ function grafico_db_agentes_purge ($id_agent, $width, $height) {
 	generic_pie_graph ($width, $height, $data);
 }
 
-// ***************************************************************************
-// Draw a dynamic progress bar using GDlib directly
-// ***************************************************************************
-
+/**
+ * Draw a dynamic progress bar using GDlib directly
+ * 
+ * @param integer progress bar progress
+ * @param integer height pie graph height
+ * @param integer width pie graph width
+ * @param integer mode style of graph (0 or 1)
+ */
 function progress_bar ($progress, $width, $height, $mode = 1) {
 	global $config;
 
@@ -1092,6 +1228,20 @@ function progress_bar ($progress, $width, $height, $mode = 1) {
 	$engine->progress_bar ($progress, $color);
 }
 
+/**
+ * Draw a graph of Module data of agent
+ * 
+ * @param integer id_agent_modulo Agent Module ID
+ * @param integer show_event show event (1 or 0)
+ * @param integer height graph height
+ * @param integer width graph width
+ * @param string title graph title
+ * @param string unit_name String of unit name
+ * @param integer show alerts (1 or 0)
+ * @param integer avg_only calcules avg only (1 or 0)
+ * @param integer pure Fullscreen (1 or 0)
+ * @param integer date date
+ */
 function grafico_modulo_boolean ($id_agente_modulo, $period, $show_event,
 	 $width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
 	 $date = 0 ) {
@@ -1262,6 +1412,20 @@ function grafico_modulo_boolean ($id_agente_modulo, $period, $show_event,
 	return;
 }
 
+/**
+ * Draw a graph of Module string data of agent
+ * 
+ * @param integer id_agent_modulo Agent Module ID
+ * @param integer show_event show event (1 or 0)
+ * @param integer height graph height
+ * @param integer width graph width
+ * @param string title graph title
+ * @param string unit_name String of unit name
+ * @param integer show alerts (1 or 0)
+ * @param integer avg_only calcules avg only (1 or 0)
+ * @param integer pure Fullscreen (1 or 0)
+ * @param integer date date
+ */
 function grafico_modulo_string ($id_agente_modulo, $period, $show_event,
 	 $width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
 	 $date = 0) {
diff --git a/pandora_console/include/fgraph2.php b/pandora_console/include/fgraph2.php
index 7e4e2f13ea..32c57f1bd1 100644
--- a/pandora_console/include/fgraph2.php
+++ b/pandora_console/include/fgraph2.php
@@ -19,6 +19,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 /**#@+
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 7f088c0755..8023a12694 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -17,6 +17,7 @@
 
 /**
  * @package Include
+ * @subpackage Generic_Functions
  */
 
 /**
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index b7049f435b..ea8cc17336 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Agents
  */
 
 /**
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 9766376041..cf9fde6c04 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Alerts
  */
 
 /**
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 613bdc1421..3fed3086d5 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -15,6 +15,7 @@
 
 /**
  * @package Include
+ * @subpackage Config
  */
 
 /**
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index 5274a9136a..a566cbbb14 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 9f9c4da8b5..75cb6f1acb 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage DataBase
  */
 
 /** 
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index eaed0363a8..2150f1b12d 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Events
  */
 
 /** 
diff --git a/pandora_console/include/functions_exportserver.php b/pandora_console/include/functions_exportserver.php
index 9b5e8017a6..78b3be4f63 100644
--- a/pandora_console/include/functions_exportserver.php
+++ b/pandora_console/include/functions_exportserver.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage ExportServer
  */
 
 /**
diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php
index b958c3f292..c647c6ae70 100644
--- a/pandora_console/include/functions_extensions.php
+++ b/pandora_console/include/functions_extensions.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Extensions
  */
 
 $extension_file = '';
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 1972a44681..e9dcfd7f51 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Filemanager
  */
 
 /**#@+
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
index b82c8e21c5..eebaaafe80 100644
--- a/pandora_console/include/functions_fsgraph.php
+++ b/pandora_console/include/functions_fsgraph.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 /**
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 84b8af769b..f4bfd99a10 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage HTML
  */
 
 /**
diff --git a/pandora_console/include/functions_incidents.php b/pandora_console/include/functions_incidents.php
index 76af1aa8ba..cf52795031 100644
--- a/pandora_console/include/functions_incidents.php
+++ b/pandora_console/include/functions_incidents.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Incidents
  */
 
 /**
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 144b360076..59079075d8 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Menu
  */
 
 /**
diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php
index f985dc5b69..04bd0fc1f5 100644
--- a/pandora_console/include/functions_messages.php
+++ b/pandora_console/include/functions_messages.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Messages
  */
 
 /** 
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 0a8f7a7d76..6d340fb42d 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Modules
  */
 
 /**
diff --git a/pandora_console/include/functions_network_components.php b/pandora_console/include/functions_network_components.php
index 539cd0cdf7..4c38c92948 100644
--- a/pandora_console/include/functions_network_components.php
+++ b/pandora_console/include/functions_network_components.php
@@ -15,6 +15,7 @@
 
 /**
  * @package Include
+ * @subpackage Modules
  */
 
 /**
diff --git a/pandora_console/include/functions_network_profiles.php b/pandora_console/include/functions_network_profiles.php
index eab93e90a7..7c6a9147a7 100644
--- a/pandora_console/include/functions_network_profiles.php
+++ b/pandora_console/include/functions_network_profiles.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Modules
  */
 
 /**
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index af0e20995b..2973558638 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Network_Map
  */
 
 /**
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f2e3597a09..12d745a790 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Reporting
  */
 
 /**
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 887586f969..5e3c1f0e67 100644
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Reporting
  */
 
 /**
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 3847ef704f..f1e3fd67e5 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Servers
  */
 
 /**
diff --git a/pandora_console/include/functions_themes.php b/pandora_console/include/functions_themes.php
index 86ecd86847..659577e322 100644
--- a/pandora_console/include/functions_themes.php
+++ b/pandora_console/include/functions_themes.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage HTML
  */
 
 /**
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 8145207bfc..f6a064ae24 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage UI
  */
 
 /** 
diff --git a/pandora_console/include/functions_ui_renders.php b/pandora_console/include/functions_ui_renders.php
index fed1beeb1f..7f65494ab4 100644
--- a/pandora_console/include/functions_ui_renders.php
+++ b/pandora_console/include/functions_ui_renders.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage UI
  */
 
 /**
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index a6baccf528..5ea75590be 100644
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -16,6 +16,7 @@
 
 /**
  * @package Include
+ * @subpackage Reporting
  */
 
 /**
diff --git a/pandora_console/include/gettext.php b/pandora_console/include/gettext.php
index 9dc697f699..c3c51cfa63 100644
--- a/pandora_console/include/gettext.php
+++ b/pandora_console/include/gettext.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @package Include
+ * @subpackage External Scripts
  */
 
 /*
diff --git a/pandora_console/include/htmlawed.php b/pandora_console/include/htmlawed.php
index fe0067b55b..f8cf4bafd1 100755
--- a/pandora_console/include/htmlawed.php
+++ b/pandora_console/include/htmlawed.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @package Include
+ * @subpackage External_Scripts
  */
 
 /**
diff --git a/pandora_console/include/pandora_graph.php b/pandora_console/include/pandora_graph.php
index d87fee37aa..39a2afc031 100644
--- a/pandora_console/include/pandora_graph.php
+++ b/pandora_console/include/pandora_graph.php
@@ -15,6 +15,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 /**
diff --git a/pandora_console/include/pchart_graph.php b/pandora_console/include/pchart_graph.php
index 6e822ee31e..93b182a46c 100644
--- a/pandora_console/include/pchart_graph.php
+++ b/pandora_console/include/pchart_graph.php
@@ -15,6 +15,7 @@
 
 /**
  * @package Include
+ * @subpackage Graphs
  */
 
 /**#@+
diff --git a/pandora_console/include/streams.php b/pandora_console/include/streams.php
index 199dd9a63d..e7c6a91d7a 100644
--- a/pandora_console/include/streams.php
+++ b/pandora_console/include/streams.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @package Include
+ * @subpackage External_Scripts
  */
 
 /*