From 926c59a174f977bf1a6795963d50924db7891210 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 9 Sep 2011 16:38:33 +0200
Subject: [PATCH] Fixing group messages popups see #3871

---
 main/inc/lib/message.lib.php               | 14 +++++-----
 main/social/friends.php                    |  1 -
 main/social/group_edit.php                 |  2 --
 main/social/group_topics.php               | 31 +++++++++++++++++++---
 main/social/invitations.php                |  2 --
 main/social/message_for_group_form.inc.php |  6 ++---
 main/social/myfiles.php                    |  2 --
 7 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index d1f3fbedf0..1339c85fef 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1026,11 +1026,12 @@ class MessageManager
             
         $topic_page_nr = isset($_GET['topics_page_nr']) ? intval($_GET['topics_page_nr']) : null;
         $links.= '<div id="message-reply-link">';
-        if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $main_message['user_sender_id'] == $current_user_id) {
-        	
-            $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$main_message['id'].'&action=edit_message_group&anchor_topic=topic_'.$main_message['id'].'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$main_message['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>';
+        if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $main_message['user_sender_id'] == $current_user_id) {        	
+            $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$main_message['id'].'&action=edit_message_group&anchor_topic=topic_'.$main_message['id'].'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$main_message['id'].'" class="group_message_popup" title="'.get_lang('Edit').'">';
+            $links.= Display :: return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>';
         }
-        $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$main_message['id'].'&action=reply_message_group&anchor_topic=topic_'.$main_message['id'].'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$main_message['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+        $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$main_message['id'].'&action=reply_message_group&anchor_topic=topic_'.$main_message['id'].'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$main_message['id'].'" class="group_message_popup" title="'.get_lang('Reply').'">';
+        $links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
         $links.= '</div>';
                                 
         $image_path = UserManager::get_user_picture_path_by_id($main_message['user_sender_id'], 'web', false, true);                                
@@ -1075,9 +1076,10 @@ class MessageManager
                     
                 $links.= '<div id="message-reply-link">';                
                 if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
-                    $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>';
+                    $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="group_message_popup" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>';
                 } 
-                $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+                $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="group_message_popup" title="'.get_lang('Reply').'">';
+                $links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
                 $links.= '</div>';
                                         
                 $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true);                                
diff --git a/main/social/friends.php b/main/social/friends.php
index c1fd1ac8d6..dd790ccf04 100755
--- a/main/social/friends.php
+++ b/main/social/friends.php
@@ -21,7 +21,6 @@ if (api_get_setting('allow_social_tool') !='true') {
 
 $this_section = SECTION_SOCIAL;
 
-//jquery thickbox already called from main/inc/header.inc.php
 $htmlHeadXtra[] = '<script type="text/javascript">
 
 function delete_friend (element_div) {
diff --git a/main/social/group_edit.php b/main/social/group_edit.php
index 0d3caa4297..e42e81fc40 100755
--- a/main/social/group_edit.php
+++ b/main/social/group_edit.php
@@ -26,8 +26,6 @@ require_once $libpath.'group_portal_manager.lib.php';
 require_once $libpath.'formvalidator/FormValidator.class.php';
 require_once $libpath.'mail.lib.inc.php';
 
-//jquery thickbox already called from main/inc/header.inc.php
-
 $htmlHeadXtra[] = '<script type="text/javascript">
 var textarea = "";
 var num_characters_permited = 255;
diff --git a/main/social/group_topics.php b/main/social/group_topics.php
index a1b4025f73..6253938e63 100644
--- a/main/social/group_topics.php
+++ b/main/social/group_topics.php
@@ -13,9 +13,9 @@ api_block_anonymous_users();
 if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
-
 require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 
+$htmlHeadXtra[] = api_get_jquery_ui_js();
 $htmlHeadXtra[] = '<script type="text/javascript"> 
 
 var counter_image = 1;
@@ -63,7 +63,33 @@ function show_icon_edit(element_html) {
 function hide_icon_edit(element_html)  {
     ident="#edit_image";
     $(ident).hide();
-}       
+}  
+
+
+$(document).ready(function() {    
+	$(\'.group_message_popup\').live(\'click\', function() {
+		var url     = this.href;
+	    var dialog  = $("#dialog");
+	    if ($("#dialog").length == 0) {
+	    	dialog  = $(\'<div id="dialog" style="display:hidden"></div>\').appendTo(\'body\');
+		}
+	            
+	    // load remote content
+	    dialog.load(
+	    	url,                    
+	        {},
+	        	function(responseText, textStatus, XMLHttpRequest) {
+	                        dialog.dialog({
+	                            modal	: true, 
+	            				width	: 520, 
+	            				height	: 400,	            				
+	                        });	                    
+				});
+	            //prevent the browser to follow the link
+	            return false;
+	        });
+        });
+        
         
 </script>';
 
@@ -71,7 +97,6 @@ $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 $interbreadcrumb[] = array('url' => 'groups.php','name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => '#','name' => get_lang('Thread'));
-api_block_anonymous_users();
 
 $group_id   = intval($_GET['id']);
 $topic_id   = intval($_GET['topic_id']);
diff --git a/main/social/invitations.php b/main/social/invitations.php
index e5da1e0258..ddf305b371 100755
--- a/main/social/invitations.php
+++ b/main/social/invitations.php
@@ -23,8 +23,6 @@ $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Invitations'));
 
-//jquery thickbox already called from main/inc/header.inc.php
-
 $htmlHeadXtra[] = '
 <script type="text/javascript">
 		
diff --git a/main/social/message_for_group_form.inc.php b/main/social/message_for_group_form.inc.php
index 94911b9376..4c9f9a743e 100755
--- a/main/social/message_for_group_form.inc.php
+++ b/main/social/message_for_group_form.inc.php
@@ -75,7 +75,7 @@ $page_topic  = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
 <input type="hidden" name="parent_id" value="<?php echo $message_id ?>" />
 <input type="hidden" name="message_id" value="<?php echo $message_id ?>" />
 <input type="hidden" name="token" value="<?php echo $tok ?>" />
-<table width="600" border="0" height="220">
+<table width="500px" border="0" height="220px">
     <tr height="180">
         <td align="left">
 <div id="id_content_panel_init">
@@ -95,7 +95,7 @@ $page_topic  = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
 	   		
 			$oFCKeditor = new FCKeditor('content') ;
 			$oFCKeditor->ToolbarSet = 'messages';
-			$oFCKeditor->Width		= '100%';
+			$oFCKeditor->Width		= '95%';
 			$oFCKeditor->Height		= $height;
 			$oFCKeditor->Value		= $message;
 								
@@ -123,4 +123,4 @@ $page_topic  = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
 </tr>
 </div>
 </table>
-</form>
+</form>
\ No newline at end of file
diff --git a/main/social/myfiles.php b/main/social/myfiles.php
index b3b4a7647b..9d8a5fd2c9 100644
--- a/main/social/myfiles.php
+++ b/main/social/myfiles.php
@@ -23,8 +23,6 @@ $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));
 $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyFiles'));
 
-//jquery thickbox already called from main/inc/header.inc.php
-
 $htmlHeadXtra[] = '
 <script type="text/javascript">