From 0075d5da2b6bd9eca254065b14e6f78c11952abf Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Wed, 2 Jun 2010 15:06:48 +0000
Subject: [PATCH] 2010-06-02  Ramon Novoa  <rnovoa@artica.es>

	* operation/messages/message.php: Small fixes. Fixed bug #3008779.

        * godmode/servers/modificar_server.php: Ask for confirmation before
          deleting a server.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2845 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            | 7 +++++++
 pandora_console/godmode/servers/modificar_server.php | 6 +++---
 pandora_console/operation/messages/message.php       | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4cfc4e8f4d..fc6d3d0b09 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* operation/messages/message.php: Small fixes. Fixed bug #3008779.
+
+	* godmode/servers/modificar_server.php: Ask for confirmation before
+	  deleting a server.
+
 2010-06-02  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/alerts/alert_list.list.php: Fixed the error
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 2a8e235178..48dee6c066 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -52,7 +52,6 @@ if (isset($_GET["server"])) {
 	echo "</div>";
 
 } else {
-	$servers = get_server_info ();
 	print_page_header (__('Manage servers'), "", false, "", true);
 
 	if (isset ($_GET["delete"])) {
@@ -77,7 +76,8 @@ if (isset($_GET["server"])) {
 			echo '<h3 class="error">'.__('There was a problem updating the server').'</h3>';
 		}
 	}
-
+	
+	$servers = get_server_info ();
 	if ($servers !== false) {
 		$table->width = "90%";
 		$table->class = "databox";
@@ -118,7 +118,7 @@ if (isset($_GET["server"])) {
 			$data[4] = human_time_comparation ($server["laststart"]);
 			$data[5] = human_time_comparation ($server["keepalive"]);
 			$data[6] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
-			$data[6] .= print_image ('images/cross.png', true, array ('title' => __('Delete')));
+			$data[6] .= print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
 			$data[6] .= '</a>';
 			
 			array_push ($table->data, $data);
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index 97d225275e..73fe2a22f8 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -29,7 +29,7 @@ if (isset ($_GET["new_msg"]))
 	print_page_header (__('Messages'). " &raquo;  ".__('New message'), "images/email.png", false, "", false, "" );
 elseif (isset ($_GET["read_message"]))
 	print_page_header (__('Messages'). " &raquo;  ".__('Read message'), "images/email.png", false, "", false, "" );
-if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"]))
+else
 	if (empty ($config["pure"]) && !is_ajax ())
 		print_page_header (__('Messages'). " &raquo;  ".__('Message overview'), "images/email.png", false, "", false, "" );
 	
@@ -232,7 +232,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
 			array_push ($table->data, $data);
 		}
 
-		echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;new_msg=1">';
+		echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message">';
 		print_table ($table);
 		echo '</form>';
 	}