From 23a6cacc99bf708b3dd50b791a9f3a883eb91e4d Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 22 Dec 2010 13:37:15 +0000
Subject: [PATCH] 2010-12-22  Miguel de Dios  <miguel.dedios@artica.es>

	* operation/events/events.php: fixed the show list of events when to delete
	the events.

	Fixes: #3141622

	* operation/events/events_list.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3684 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  9 +++++++++
 pandora_console/operation/events/events.php   | 20 ++++++++++---------
 .../operation/events/events_list.php          | 12 +++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c00efe465d..559390c785 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-22  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* operation/events/events.php: fixed the show list of events when to delete
+	the events.
+	
+	Fixes: #3141622
+	
+	* operation/events/events_list.php: cleaned source code style.
+
 2010-12-22  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/fgraph.php: Read the event_type when drawing module
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index b12aa41f65..533a574cb2 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -271,21 +271,23 @@ if ($validate) {
 if ($delete) {
 	$ids = (array) get_parameter ("eventid", -1);
 		
-	if($ids[0] != -1){
+	if ($ids[0] != -1) {
 		$return = delete_event ($ids, ($group_rep == 1));
 		print_result_message ($return,
 			__('Successfully deleted'),
 			__('Could not be deleted'));
 	}
+	require_once('operation/events/events_list.php');
 }
-
-switch($section) {
-	case 'list':
-		require_once('operation/events/events_list.php');
-		break;
-	case 'validate':
-		require_once('operation/events/events_validate.php');
-		break;
+else {
+	switch($section) {
+		case 'list':
+			require_once('operation/events/events_list.php');
+			break;
+		case 'validate':
+			require_once('operation/events/events_validate.php');
+			break;
+	}
 }
 
 require_jquery_file ('bgiframe');
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index a45db24c3b..5c4ce11828 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -64,11 +64,13 @@ else {
 if ($ev_group > 0 && in_array ($ev_group, array_keys ($groups))) {
 	//If a group is selected and it's in the groups allowed
 	$sql_post = " AND id_grupo = $ev_group";
-} else {
+}
+else {
 	if (is_user_admin ($config["id_user"])) {
 		//Do nothing if you're admin, you get full access
 		$sql_post = "";
-	} else {
+	}
+	else {
 		//Otherwise select all groups the user has rights to.
 		$sql_post = " AND id_grupo IN (".implode (",", array_keys ($groups)).")";
 	}
@@ -380,7 +382,8 @@ foreach ($result as $event) {
 		$data[4] .= print_image ("images/ok.png", true,
 			array ("title" => __('Validate event')));
 		$data[4] .= '</a>&nbsp;';
-	}else {
+	}
+	else {
 		$data[4] .= print_image ("images/tick.png", true,
 			array ("title" => __('Event validated'))).'&nbsp;';
 	}
@@ -391,7 +394,8 @@ foreach ($result as $event) {
 			$data[4] .= print_image ("images/cross.png", true,
 				array ("title" => __('Delete event')));
 			$data[4] .= '</a>&nbsp;';
-		}else {
+		}
+		else {
 			$data[4] .= print_image ("images/cross.disabled.png", true,
 				array ("title" => __('Is not allowed delete events in process'))).'&nbsp;';
 		}