diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 56cbca499f..c299d49d85 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-25 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/functions_api.php, operation/agentes/alerts_status.php:
+	improved the style code.
+	
+	* include/functions_alerts.php: in function "get_group_alerts" fixed
+	the get all alerts, sometimes set empty the return array.
+
 2013-02-25  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_reports.php
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 04a9a3154a..267378ca1d 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -1410,14 +1410,18 @@ function get_alert_fires_in_period ($id_alert_module, $period, $date = 0) {
 function get_group_alerts ($id_group) {
 	global $config;
 	
-	require_once ($config["homedir"].'/include/functions_agents.php');
+	require_once ($config["homedir"] . '/include/functions_agents.php');
 	
-	$alerts = array ();
+	$alerts = array ('simple' => array());
 	$agents = agents_get_group_agents ($id_group, false, "none");
 	
 	foreach ($agents as $agent_id => $agent_name) {
 		$agent_alerts = agents_get_alerts ($agent_id);
-		$alerts = array_merge ($alerts, $agent_alerts);
+		
+		
+		if (!empty($agent_alerts['simple']))
+			$alerts['simple'] = array_merge ($alerts['simple'],
+				$agent_alerts['simple']);
 	}
 	
 	return $alerts;
@@ -1444,7 +1448,8 @@ function get_alerts_fired ($alerts, $period = 0, $date = 0) {
 	
 	foreach ($alerts as $alert) {
 		if (isset($alert['id'])) {
-			$fires = get_alert_fires_in_period ($alert['id'], $period, $date);
+			$fires = get_alert_fires_in_period($alert['id'],
+				$period, $date);
 			if (! $fires) {
 				continue;
 			}
@@ -1465,7 +1470,7 @@ function get_alerts_fired ($alerts, $period = 0, $date = 0) {
  * @return int The last time an alert fired. It's an UNIX timestamp.
  */
 function get_alert_last_fire_timestamp_in_period ($id_alert_module, $period, $date = 0) {
-	global $config;	
+	global $config;
 	
 	if ($date == 0) {
 		$date = get_system_time ();
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 153c7952f2..9349f27b59 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -2484,34 +2484,34 @@ function api_set_create_module_template($id, $thrash1, $other, $thrash3) {
 		returnError('error_module_to_template', __('Error assigning module to template. Id_module cannot be left blank.'));
 		return;
 	}
-
-	if ($other['data'][1] == ""){
+	
+	if ($other['data'][1] == "") {
 		returnError('error_module_to_template', __('Error assigning module to template. Id_agent cannot be left blank.'));
 		return;
 	}
 	
 	$result_template = alerts_get_alert_template($id);
-		
+	
 	if (!$result_template){
 		returnError('error_module_to_template', __('Error assigning module to template. Id_template doensn\'t exists.'));
 		return;
-	}	
-		
+	}
+	
 	$id_module = $other['data'][0];
 	$id_agent = $other['data'][1];
 	
 	$result_agent = agents_get_name($id_agent);
 	
-	if (!$result_agent){
+	if (!$result_agent) {
 		returnError('error_module_to_template', __('Error assigning module to template. Id_agent doesn\'t exists.'));
-		return;		
+		return;
 	}
-
+	
 	$result_module = db_get_value ('nombre', 'tagente_modulo', 'id_agente_modulo', (int) $id_module);
-
-	if (!$result_module){
+	
+	if (!$result_module) {
 		returnError('error_module_to_template', __('Error assigning module to template. Id_module doesn\'t exists.'));
-		return;			
+		return;
 	}
 	
 	$id_template_module = alerts_create_alert_agent_module($id_module, $id);
@@ -2539,21 +2539,21 @@ function api_set_create_module_template($id, $thrash1, $other, $thrash3) {
  * @param $thrash3 Don't use
  */
 function api_set_delete_module_template($id, $thrash1, $other, $thrash3) {
-
+	
 	if ($id == "") {
 		returnError('error_delete_module_template', __('Error deleting module template. Id_module_template cannot be left blank.'));
 		return;
 	}
-
+	
 	$result_module_template = alerts_get_alert_agent_module($id);
-
-	if (!$result_module_template){
+	
+	if (!$result_module_template) {
 		returnError('error_delete_module_template', __('Error deleting module template. Id_module_template doesn\'t exists.'));
-		return;		
+		return;
 	}
 	
 	$result = alerts_delete_alert_agent_module($id);
-
+	
 	if ($result == 0) {
 		// TODO: Improve the error returning more info
 		returnError('error_delete_module_template', __('Error deleting module template.'));
@@ -2577,7 +2577,7 @@ function api_set_delete_module_template($id, $thrash1, $other, $thrash3) {
  * @param $thrash3 Don't use
  */
 function api_set_validate_all_alerts($id, $thrash1, $other, $thrash3) {
-
+	
 	// Return all groups
 	$allGroups = db_get_all_rows_filter('tgrupo', array(), 'id_grupo');
 	
@@ -2590,32 +2590,32 @@ function api_set_validate_all_alerts($id, $thrash1, $other, $thrash3) {
 	$groups[] = 0;
 	
 	$id_groups = implode(',', $groups);
-
+	
 	$sql = sprintf ("SELECT id_agente  
 		FROM tagente 
 		WHERE id_grupo IN (%s) AND disabled = 0", 
 		$id_groups);
-		
+	
 	$id_agents = array();
 	$result_agents = array();
-
+	
 	$id_agents = db_get_all_rows_sql($sql);
 	
 	foreach ($id_agents as $id_agent){
 		$result_agents[] = $id_agent['id_agente'];
 	}
-
+	
 	$agents_string = implode(',', $result_agents);
 	
 	$sql = sprintf ("SELECT talert_template_modules.id
-	FROM talert_template_modules
-		INNER JOIN tagente_modulo t2
-			ON talert_template_modules.id_agent_module = t2.id_agente_modulo
-		INNER JOIN tagente t3
-			ON t2.id_agente = t3.id_agente
-		INNER JOIN talert_templates t4
-			ON talert_template_modules.id_alert_template = t4.id
-	WHERE id_agent_module in (%s)", $agents_string);	
+		FROM talert_template_modules
+			INNER JOIN tagente_modulo t2
+				ON talert_template_modules.id_agent_module = t2.id_agente_modulo
+			INNER JOIN tagente t3
+				ON t2.id_agente = t3.id_agente
+			INNER JOIN talert_templates t4
+				ON talert_template_modules.id_alert_template = t4.id
+		WHERE id_agent_module in (%s)", $agents_string);	
 	
 	$alerts = db_get_all_rows_sql($sql);
 	
@@ -2633,7 +2633,7 @@ function api_set_validate_all_alerts($id, $thrash1, $other, $thrash3) {
 		$errors = $total_alerts - $count_results;	
 		returnError('error_validate_all_alerts', __('Error validate all alerts. Failed ' . $errors . '.'));
 	}
-	else{
+	else {
 		returnData('string', array('type' => 'string', 'data' => __('Correct validating of all alerts.')));	
 	}
 }
@@ -2652,24 +2652,24 @@ function api_set_validate_all_alerts($id, $thrash1, $other, $thrash3) {
  * @param $thrash3 Don't use
  */
 function api_set_validate_all_policy_alerts($id, $thrash1, $other, $thrash3) {
-
+	
 	# Get all policies
 	$policies = enterprise_hook('policies_get_policies', array(false, false, false, true));
-
+	
 	if ($duplicated === ENTERPRISE_NOT_HOOK) {
 		returnError('error_validate_all_policy_alerts', __('Error validating all alert policies.'));
-		return;	
-	}	
-
+		return;
+	}
+	
 	// Count of valid results
 	$total_alerts = 0;
 	$count_results = 0;
 	// Check all policies
-	foreach ($policies as $policy){
+	foreach ($policies as $policy) {
 		$policy_alerts = array();
 		$policy_alerts = enterprise_hook('policies_get_alerts',  array($policy['id'], false, false));
-	
-
+		
+		
 		
 		// Number of alerts in this policy
 		if ($policy_alerts != false){
@@ -2686,8 +2686,8 @@ function api_set_validate_all_policy_alerts($id, $thrash1, $other, $thrash3) {
 		$id_pol_alerts = implode(',', $result_pol_alerts);
 		
 		// If the policy has alerts
-		if (count($result_pol_alerts) != 0){
-			$sql = sprintf ("SELECT id  
+		if (count($result_pol_alerts) != 0) {
+			$sql = sprintf ("SELECT id
 				FROM talert_template_modules 
 				WHERE id_policy_alerts IN (%s)", 
 				$id_pol_alerts);
@@ -2695,7 +2695,7 @@ function api_set_validate_all_policy_alerts($id, $thrash1, $other, $thrash3) {
 			$id_alerts = db_get_all_rows_sql($sql);
 			
 			$result_alerts = array();
-			foreach ($id_alerts as $id_alert){
+			foreach ($id_alerts as $id_alert) {
 				$result_alerts[] = $id_alert['id'];
 			}
 			
@@ -2712,8 +2712,8 @@ function api_set_validate_all_policy_alerts($id, $thrash1, $other, $thrash3) {
 	}
 	
 	// Check results
-	if ($total_alerts > $count_results){
-		$errors = $total_alerts - $count_results;	
+	if ($total_alerts > $count_results) {
+		$errors = $total_alerts - $count_results;
 		returnError('error_validate_all_alerts', __('Error validate all policy alerts. Failed ' . $errors . '.'));
 	}
 	else {
@@ -2829,24 +2829,24 @@ function api_set_add_agent_policy($id, $thrash1, $other, $thrash3) {
  * @param $thrash3 Don't use
  */
 function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3) {
-	if ($id == ""){
+	if ($id == "") {
 		returnError('error_add_data_module_policy', __('Error adding data module to policy. Id_policy cannot be left blank.'));
-		return;			
+		return;
 	}
-
-	if ($other['data'][0] == ""){
+	
+	if ($other['data'][0] == "") {
 		returnError('error_add_data_module_policy', __('Error adding data module to policy. Module_name cannot be left blank.'));
-		return;			
+		return;
 	}
 	
 	// Check if the module is already in the policy
 	$name_module_policy = enterprise_hook('policies_get_modules', array($id, array('name'=>$other['data'][0]), 'name'));
-
+	
 	if ($name_module_policy === ENTERPRISE_NOT_HOOK) {
 		returnError('error_add_data_module_policy', __('Error adding data module to policy.'));
-		return;	
-	}	
-
+		return;
+	}
+	
 	$values = array();
 	$values['id_tipo_modulo'] = $other['data'][1];
 	$values['description'] = $other['data'][2];
@@ -2864,13 +2864,13 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3) {
  	$values['history_data'] = $other['data'][14];
  	$values['configuration_data'] = $other['data'][15];	
  	
- 	if ($name_module_policy !== false){
-		if ($name_module_policy[0]['name'] == $other['data'][0]){
+ 	if ($name_module_policy !== false) {
+		if ($name_module_policy[0]['name'] == $other['data'][0]) {
 			returnError('error_add_data_module_policy', __('Error adding data module to policy. The module is already in the policy.'));
-			return;				
+			return;
 		}
 	}
- 
+	
 	$success = enterprise_hook('policies_create_module', array($other['data'][0], $id, 1, $values, false)); 
 	
 	if ($success)
@@ -2878,7 +2878,7 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3) {
 		returnData('string', array('type' => 'string', 'data' => $success));
 	else
 		returnError('error_add_data_module_policy', 'Error adding data module to policy.');	
-
+	
 }
 
 /**
@@ -2899,29 +2899,29 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3) {
  * @param $thrash3 Don't use
  */
 function api_set_update_data_module_policy($id, $thrash1, $other, $thrash3) {
-	if ($id == ""){
+	if ($id == "") {
 		returnError('error_update_data_module_policy', __('Error updating data module in policy. Id_policy cannot be left blank.'));
-		return;			
+		return;
 	}
 	
-	if ($other['data'][0] == ""){
+	if ($other['data'][0] == "") {
 		returnError('error_update_data_module_policy', __('Error updating data module in policy. Id_policy_module cannot be left blank.'));
-		return;			
-	}	
+		return;
+	}
 	
 	// Check if the module exists
 	$module_policy = enterprise_hook('policies_get_modules', array($id, array('id' => $other['data'][0]), 'id_module'));
-
+	
 	if ($module_policy === false) {
 		returnError('error_update_data_module_policy', __('Error updating data module in policy. Module doesn\'t exists.'));
-		return;					
+		return;
 	}
 	
-	if ($module_policy[0]['id_module'] != 1){
+	if ($module_policy[0]['id_module'] != 1) {
 		returnError('error_update_network_module_policy', __('Error updating network module in policy. Module type is not network type.'));
-		return;	
-	}	
-
+		return;
+	}
+	
 	$fields_data_module = array('id','description', 'id_module_group', 'min', 'max', 'post_process', 'module_interval', 
 						 'min_warning', 'max_warning', 'str_warning', 'min_critical', 'max_critical', 'str_critical',
 						 'history_data', 'configuration_data');
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 14476723e1..377ac92c38 100644
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -64,11 +64,12 @@ $idAgent = get_parameter_get('id_agente', 0);
 
 // Show alerts for specific agent
 if ($idAgent != 0) {
-	$url = $url.'&id_agente='.$idAgent;
+	$url = $url . '&id_agente=' . $idAgent;
 	
 	$id_group = agents_get_agent_group ($idAgent);
 	
-	$is_extra = enterprise_hook('policies_is_agent_extra_policy', array($id_agente));
+	$is_extra = enterprise_hook('policies_is_agent_extra_policy',
+		array($id_agente));
 	
 	if($is_extra === ENTERPRISE_NOT_HOOK) {
 		$is_extra = false;
@@ -120,7 +121,7 @@ if ($free_search != '') {
 				'id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE nombre LIKE "%' . $free_search . '%") OR ' .
 				'id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente IN (SELECT id_agente FROM tagente WHERE nombre LIKE "%' . $free_search . '%"))' .
 				')';
-
+			
 			break;
 		case "postgresql":
 		case "oracle":
@@ -165,11 +166,13 @@ switch ($sortField) {
 		switch ($sort) {
 			case 'up':
 				$selectModuleUp = $selected;
-				$order = array('field' => 'agent_module_name', 'order' => 'ASC');
+				$order = array('field' => 'agent_module_name',
+					'order' => 'ASC');
 				break;
 			case 'down':
 				$selectModuleDown = $selected;
-				$order = array('field' => 'agent_module_name', 'order' => 'DESC');
+				$order = array('field' => 'agent_module_name',
+					'order' => 'DESC');
 				break;
 		}
 		break;
@@ -177,11 +180,13 @@ switch ($sortField) {
 		switch ($sort) {
 			case 'up':
 				$selectTemplateUp = $selected;
-				$order = array('field' => 'template_name', 'order' => 'ASC');
+				$order = array('field' => 'template_name',
+					'order' => 'ASC');
 				break;
 			case 'down':
 				$selectTemplateDown = $selected;
-				$order = array('field' => 'template_name', 'order' => 'DESC');
+				$order = array('field' => 'template_name',
+					'order' => 'DESC');
 				break;
 		}
 		break;
@@ -195,7 +200,8 @@ switch ($sortField) {
 			$selectModuleDown = '';
 			$selectTemplateUp = '';
 			$selectTemplateDown = '';
-			$order = array('field' => 'agent_module_name', 'order' => 'ASC');
+			$order = array('field' => 'agent_module_name',
+				'order' => 'ASC');
 		}
 		else {
 			$selectDisabledUp = '';
@@ -206,7 +212,8 @@ switch ($sortField) {
 			$selectModuleDown = '';
 			$selectTemplateUp = '';
 			$selectTemplateDown = '';
-			$order = array('field' => 'agent_module_name', 'order' => 'ASC');
+			$order = array('field' => 'agent_module_name',
+				'order' => 'ASC');
 		}
 		break;
 }