[svn r21002] style changes - improvements in message tool - (partial FS#3909)

main/inc/lib/message.lib.php

@@ -25,62 +25,70 @@
 require_once api_get_path(LIBRARY_PATH).'online.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'messages/message.class.php';
 function inbox_display() {
-	$charset = api_get_setting('platform_charset');
-	$table_message = Database::get_main_table(TABLE_MESSAGE); 
-	$request=api_is_xml_http_request();
-	if ($_SESSION['social_exist']===true) {
-		$redirect="#remote-tab-2";	
-		if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
-			$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."../social/index.php?$redirect\">".get_lang('BackToInbox')."</a>";
+	global $charset;
+	echo '<div id="div_content_messages">&nbsp;&nbsp;';
+	//api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox')));
+	echo '<div class=actions>';
+	echo '<a onclick="compose_and_show_message(\'show\',\'1\')" href="javascript:void(0)">'.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('ComposeMessage')).'</a>';
+	echo '<a class="refresh" href="javascript:window.location.reload()">'.api_convert_encoding(get_lang('Refresh'),'UTF-8',$charset).'</a>';
+	echo '</div>';
+	echo '</div>';	
+		$charset = api_get_setting('platform_charset');
+		$table_message = Database::get_main_table(TABLE_MESSAGE); 
+		$request=api_is_xml_http_request();
+		if ($_SESSION['social_exist']===true) {
+			$redirect="#remote-tab-2";	
+			if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
+				$success= get_lang('SelectedMessagesDeleted');
+			} else {
+				$success= get_lang('SelectedMessagesDeleted');				
+			}
 		} else {
-			$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."../social/index.php?$redirect\">".get_lang('BackToInbox')."</a>";				
+			$success= get_lang('SelectedMessagesDeleted');
 		}
-	} else {
-		$success= get_lang('SelectedMessagesDeleted')."&nbsp;<br /><a href=\""."inbox.php\">".get_lang('BackToOutbox')."</a>";
-	}
-	if (isset ($_REQUEST['action'])) {
-		switch ($_REQUEST['action']) {
-			case 'delete' :
-    			$number_of_selected_messages = count($_POST['id']);
-    			foreach ($_POST['id'] as $index => $message_id) {
-    				MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
-    			}
-    			Display::display_normal_message(api_xml_http_response_encode($success),false);
-    			break;
-			case 'deleteone' :
-    			MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
-    			Display::display_confirmation_message(api_xml_http_response_encode($success),false);
-    			echo '<br />';
-    			break;
+		if (isset ($_REQUEST['action'])) {
+			switch ($_REQUEST['action']) {
+				case 'delete' :
+	    			$number_of_selected_messages = count($_POST['id']);
+	    			foreach ($_POST['id'] as $index => $message_id) {
+	    				MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
+	    			}
+	    			Display::display_normal_message(api_xml_http_response_encode($success),false);
+	    			break;
+				case 'deleteone' :
+	    			MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
+	    			Display::display_confirmation_message(api_xml_http_response_encode($success),false);
+	    			echo '<br />';
+	    			break;
+			}
 		}
-	}
-	// display sortable table with messages of the current user
-	$table = new SortableTable('messages', 'get_number_of_messages_mask', 'get_message_data_mask', 3, get_number_of_messages_mask(),'DESC');
-	$table->set_header(0, '', false,array ('style' => 'width:20px;'));
-	$title=api_xml_http_response_encode(get_lang('Title'));
-	$action=api_xml_http_response_encode(get_lang('Actions'));
-	$table->set_header(1,api_xml_http_response_encode(get_lang('Status')),false,array('style' => 'width:30px;'));
-	$table->set_header(2,api_xml_http_response_encode(get_lang('From')),false);
-	$table->set_header(3,$title,false);
-	$table->set_header(4,api_xml_http_response_encode(get_lang('Date')),false,array('style' => 'width:150px;'));
-	$table->set_header(5,$action,false,array ('style' => 'width:100px;'));
-    echo '<div id="div_content_table_data">';
-	if ($request===true) {
-		echo '<form name="form_send" id="form_send" action="" method="post">';
-		echo '<input type="hidden" name="action" value="delete" />';
-		$table->display();
-		echo '</form>';
-		if (get_number_of_messages_mask() > 0) {
-			echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.api_xml_http_response_encode(get_lang('SelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
-			echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.api_xml_http_response_encode(get_lang('UnSelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
-			echo '<button class="save" name="delete" type="button" value="'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'" onclick="submit_form(\'inbox\')">'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'</button>';
-			
+		// display sortable table with messages of the current user
+		$table = new SortableTable('messages', 'get_number_of_messages_mask', 'get_message_data_mask', 3, get_number_of_messages_mask(),'DESC');
+		$table->set_header(0, '', false,array ('style' => 'width:20px;'));
+		$title=api_xml_http_response_encode(get_lang('Title'));
+		$action=api_xml_http_response_encode(get_lang('Actions'));
+		$table->set_header(1,api_xml_http_response_encode(get_lang('Status')),false,array('style' => 'width:30px;'));
+		$table->set_header(2,api_xml_http_response_encode(get_lang('From')),false);
+		$table->set_header(3,$title,false);
+		$table->set_header(4,api_xml_http_response_encode(get_lang('Date')),false,array('style' => 'width:150px;'));
+		$table->set_header(5,$action,false,array ('style' => 'width:100px;'));
+	    echo '<div id="div_content_table_data">';
+		if ($request===true) {
+			echo '<form name="form_send" id="form_send" action="" method="post">';
+			echo '<input type="hidden" name="action" value="delete" />';
+			$table->display();
+			echo '</form>';
+			if (get_number_of_messages_mask() > 0) {
+				echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.api_xml_http_response_encode(get_lang('SelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
+				echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.api_xml_http_response_encode(get_lang('UnSelectAll')).'</a>&nbsp;&nbsp;&nbsp;';
+				echo '<button class="save" name="delete" type="button" value="'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'" onclick="submit_form(\'inbox\')">'.api_xml_http_response_encode(get_lang('DeleteSelectedMessages')).'</button>';
+				
+			}
+		} else {
+			$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
+			$table->display();
 		}
-	} else {
-		$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
-		$table->display();
-	}
-    echo '</div>';
+	    echo '</div>';
 }
 function get_number_of_messages_mask() {
 	return MessageManager::get_number_of_messages();

main/messages/inbox.php

@@ -29,7 +29,7 @@
 ==============================================================================
 */ 
 // name of the language file that needs to be included 
-$language_file = array('registration','messages','userInfo','admin');
+$language_file = array('registration','messages','userInfo','admin','index');
 $cidReset=true;
 require_once '../inc/global.inc.php';
 require_once '../messages/message.class.php';
@@ -117,26 +117,21 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
 		if ( isset($user_reply) && !is_null($user_id_by_email) && strlen($info_reply[0]) >0) {
 			MessageManager::send_message($user_id_by_email, $title, $content);
 			MessageManager::display_success_message($user_id_by_email);
+			inbox_display();
 			exit;
 		} elseif (is_null($user_id_by_email)) {
-			$message_box=get_lang('ErrorSendingMessage').
-			' 
-			<br /><a href="../social/index.php?#remote-tab-2">'.
-			get_lang('BackToInbox').
-			'</a>';
+			$message_box=get_lang('ErrorSendingMessage');
 			Display::display_error_message(api_xml_http_response_encode($message_box),false);
+			inbox_display();
 			exit;
 		}
 	} elseif (trim($info_delete[0])=='delete' ) {
 		for ($i=1;$i<=$count_delete;$i++) {
 			MessageManager::delete_message_by_user_receiver(api_get_user_id(), $info_delete[$i]);	
 		}
-			$message_box=get_lang('SelectedMessagesDeleted').
-			'&nbsp;
-			<br /><a href="../social/index.php?#remote-tab-2">'.
-			get_lang('BackToInbox').
-			'</a>';
+			$message_box=get_lang('SelectedMessagesDeleted');
 			Display::display_normal_message(api_xml_http_response_encode($message_box),false);
+		   	inbox_display();
 		    exit;
 	}
 }
@@ -160,12 +155,12 @@ if ($request===false) {
 	$link_ref="../messages/new_message.php?rs=1";
 }
 $table_message = Database::get_main_table(TABLE_MESSAGE);
-echo '<div id="div_content_messages">&nbsp;&nbsp;';
+/*echo '<div id="div_content_messages">&nbsp;&nbsp;';
 //api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox')));
 echo '<div class=actions>';
 echo '<a onclick="compose_and_show_message(\'show\',\'1\')" href="javascript:void(0)">'.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('ComposeMessage')).'</a>';
 echo '</div>';
-echo '</div>';
+echo '</div>';*/
 if (!isset($_GET['del_msg'])) {
 	inbox_display();
 } else {

main/messages/message.class.php

@@ -49,31 +49,19 @@ class MessageManager {
 				$success=get_lang('MessageSentTo').
 				"&nbsp;<b>".
 				GetFullUserName($uid).
-				"</b>".
-				"<br><a href=\"".
-				"../social/index.php$redirect\">".
-				get_lang('BackToInbox').
-				"</a>";
+				"</b>";
 			}else {
-				$success= get_lang('MessageSentTo').
+				$success=get_lang('MessageSentTo').
 				"&nbsp;<b>".
 				GetFullUserName($uid).
-				"</b>".
-				"<br><a href=\"".
-				"../social/index.php$redirect\">".
-				get_lang('BackToInbox').
-				"</a>";				
+				"</b>";			
 			}
 				
 		} else {
-			$success= get_lang('MessageSentTo').
+				$success=get_lang('MessageSentTo').
 				"&nbsp;<b>".
 				GetFullUserName($uid).
-				"</b>".
-				"<br><a href=\"".
-				"inbox.php\">".
-				get_lang('BackToInbox').
-				"</a>";
+				"</b>";
 		}
 		Display::display_confirmation_message(api_xml_http_response_encode($success), false);
 	}

main/social/index.php

@@ -237,6 +237,9 @@ function count_checkbox(status_type) {
 	}
 }
 function get_action_url_and_show_messages (name_rs,name_id) {
+	$(".confirmation-message").remove();
+	$(".normal-message").remove();
+	$(".error-message").remove();	
 		 $.ajax({
 			contentType: "application/x-www-form-urlencoded",
 			beforeSend: function(objeto) {
@@ -251,6 +254,9 @@ function get_action_url_and_show_messages (name_rs,name_id) {
 		});
 }
 function close_div_show (my_div) {
+	$(".confirmation-message").remove();
+	$(".normal-message").remove();
+	$(".error-message").remove();
 	$("div#"+my_div).html("");
 		 $.ajax({
 			contentType: "application/x-www-form-urlencoded",
@@ -265,6 +271,9 @@ function close_div_show (my_div) {
 		});
 }
 function reply_to_messages (my_action,name_rs,name_id) {
+	$(".confirmation-message").remove();
+	$(".normal-message").remove();
+	$(".error-message").remove();
 	if(my_action=="show") {
 		$("div#div_content_messages").html("");
 		$("div#div_content_table_data").html("");
@@ -285,6 +294,9 @@ function compose_and_show_message (my_action,name_rs) {
 	if(my_action=="show") {
 		$("div#div_content_messages").html("");
 		$("div#div_content_table_data").html("");
+		$(".confirmation-message").remove();
+		$(".normal-message").remove();
+		$(".error-message").remove();
 			$.ajax({
 			contentType: "application/x-www-form-urlencoded",
 			beforeSend: function(objeto) {
@@ -339,7 +351,10 @@ function send_request_and_search() {
 }
 function delete_one_message (num_id) {
 		$("div#div_content_messages").html("");
-		$("div#div_content_table_data").html("");	
+		$("div#div_content_table_data").html("");
+		$(".confirmation-message").remove();
+		$(".normal-message").remove();
+		$(".error-message").remove();				
 			$.ajax({
 				contentType: "application/x-www-form-urlencoded",
 				beforeSend: function(objeto) {