Browse Source

Messages can be sent no matter if the content is the same, groups usability improvements, see #190

Julio Montoya 15 years ago
parent
commit
900c544fae

+ 18 - 11
main/inc/lib/group_portal_manager.lib.php

@@ -1077,7 +1077,7 @@ class GroupPortalManager
 		echo '<div id="layout-left" style="float: left; width: 280px; height: 100%;">';
 	
 		//Group's title
-		echo '<h1>'.$group_info['name'].'</h1>';
+		echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h1>';
 		
 		//Group's image 
 		echo '<div id="group_image">';
@@ -1126,8 +1126,10 @@ class GroupPortalManager
 			case GROUP_USER_PERMISSION_READER:
 				// I'm just a reader
 				echo get_lang('IamAReader');
-				echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic')).'&nbsp;'.get_lang('NewTopic').'</a></li>';				
-				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a></li>';
+								
+				echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic')).'&nbsp;'.get_lang('NewTopic').'</a></li>';
+				echo '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('notebook.gif', get_lang('MessageList')).'&nbsp;'.get_lang('MessageList').'</a></li>';
+				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends')).'&nbsp;'.get_lang('InviteFriends').'</a></li>';
 				echo '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a></li>';
 					
 				break;
@@ -1135,24 +1137,28 @@ class GroupPortalManager
 				echo get_lang('IamAnAdmin');
 				echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic')).'&nbsp;'.get_lang('NewTopic').'</a></li>';
 	
+				echo '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('notebook.gif', get_lang('MessageList')).'&nbsp;'.get_lang('MessageList').'</a></li>';	
 				echo '<li><a href="group_edit.php?id='.$group_id.'">'.			Display::return_icon('edit.gif', get_lang('EditGroup')).'&nbsp;'.get_lang('EditGroup').'</a></li>';
 				echo '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('coachs.gif', get_lang('MemberList')).'&nbsp;'.get_lang('MemberList').'</a></li>';
 				echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
 				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends')).'&nbsp;'.get_lang('InviteFriends').'</a></li>';
+				
 				break;
 			case GROUP_USER_PERMISSION_PENDING_INVITATION:				
-				echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang(YouHaveBeenInvitedJoinNow).'</a></li>';
+				echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a></li>';
 				break;
 			case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
 				echo get_lang('WaitingForAdminResponse');
 				break;
 			case GROUP_USER_PERMISSION_MODERATOR:
 				echo get_lang('IamAModerator');
-				echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic')).'&nbsp;'.get_lang('NewTopic').'</a></li>';		
-				echo '<li><a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a></li>';
-				echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.get_lang('WaitingList').'</a></li>';
-				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a></li>';
-				echo '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a></li>';
+				echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic')).'&nbsp;'.get_lang('NewTopic').'</a></li>';
+				
+				echo '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('notebook.gif', get_lang('MessageList')).'&nbsp;'.get_lang('MessageList').'</a></li>';							
+				echo '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('coachs.gif', get_lang('MemberList')).'&nbsp;'.get_lang('MemberList').'</a></li>';
+				echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
+				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends')).'&nbsp;'.get_lang('InviteFriends').'</a></li>';
+				
 				break;
 			default:
 				echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a></li>';
@@ -1180,12 +1186,13 @@ class GroupPortalManager
 					echo api_get_person_name($member['firstname'], $member['lastname']).'</a></div>';
 				}
 			}
-			
-			if ($my_group_role == GROUP_USER_PERMISSION_READER) {
+			if (count($members) > 15) { 
+				//More link
 				echo '<div class="group_member_more"><a href="group_members.php?id='.$group_id.'">';
 				echo get_lang('More').'</a></div>';
 			}
 			
+			
 		echo '</div>';	
 	echo '</div>'; // end layout left		
 	}

+ 69 - 62
main/inc/lib/message.lib.php

@@ -24,6 +24,8 @@ define('MESSAGE_STATUS_NEW',				'0');
 define('MESSAGE_STATUS_UNREAD',				'1');
 define('MESSAGE_STATUS_DELETED',			'2');
 
+///define('MESSAGE_STATUS_DELETED',			'4');
+
 define('MESSAGE_STATUS_INVITATION_PENDING',	'5');
 define('MESSAGE_STATUS_INVITATION_ACCEPTED','6');
 define('MESSAGE_STATUS_INVITATION_DENIED',	'7');
@@ -192,74 +194,79 @@ class MessageManager
 	        $content = api_convert_encoding($content,$charset,'UTF-8');
 	        $content = Database::escape_string($content);
 			//message in inbox
-			$sql = "SELECT COUNT(*) as count FROM $table_message WHERE user_sender_id = ".$user_sender_id." AND user_receiver_id='$receiver_user_id' AND title = '$title' AND content ='$content' AND group_id = '$group_id' AND parent_id = '$parent_id'";
-			$res_exist = Database::query($sql,__FILE__,__LINE__);
-			$row_exist = Database::fetch_array($res_exist,'ASSOC');
-			if ($row_exist['count'] == 0) {
-				//message in outbox for user friend or group
-				$sql = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
-						 " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".date('Y-m-d H:i:s')."','$title','$content', '$group_id', '$parent_id')";
-				$rs = Database::query($sql,__FILE__,__LINE__);
-				$outbox_last_id = Database::insert_id();
+			
+			//useless query
+			//echo $sql = "SELECT COUNT(*) as count FROM $table_message WHERE user_sender_id = ".$user_sender_id." AND user_receiver_id='$receiver_user_id' AND title = '$title' AND content ='$content' AND group_id = '$group_id' AND parent_id = '$parent_id'";		
+			//$res_exist = Database::query($sql,__FILE__,__LINE__);
+			//$row_exist = Database::fetch_array($res_exist,'ASSOC');
+			
+			//We should ALWAYS sent emails
+			//if ($row_exist['count'] == 0) {
 				
-				// save attachment file for outbox messages
-				if (is_array($file_attachments)) {
-					$o = 0;
-					foreach ($file_attachments as $file_attach) {						
-						if ($file_attach['error'] == 0) {
-							self::save_message_attachment_file($file_attach,$file_comments[$o],$outbox_last_id,$user_sender_id);
-						}
-						$o++;
+			//message in outbox for user friend or group
+			$sql = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
+					 " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".date('Y-m-d H:i:s')."','$title','$content', '$group_id', '$parent_id')";
+			$rs = Database::query($sql,__FILE__,__LINE__);
+			$outbox_last_id = Database::insert_id();
+			
+			// save attachment file for outbox messages
+			if (is_array($file_attachments)) {
+				$o = 0;
+				foreach ($file_attachments as $file_attach) {						
+					if ($file_attach['error'] == 0) {
+						self::save_message_attachment_file($file_attach,$file_comments[$o],$outbox_last_id,$user_sender_id);
 					}
+					$o++;
 				}
-				
-				if (!empty($group_id)) {
-					//message in inbox for group										
-					$users_by_group = GroupPortalManager::get_all_users_by_group($group_id);
-					$users_ids = array_keys($users_by_group);	
-					if (is_array($users_ids) && count($users_ids) > 0) {				
-						foreach ($users_ids as $user_id) {
-							$receiver_user_id = $user_id;														 
-							$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
-									 " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".date('Y-m-d H:i:s')."','$title','$content','$group_id','$parent_id')";
-							$result = Database::query($query,__FILE__,__LINE__);				
-							$inbox_last_id = Database::insert_id();					
-							// save attachment file for inbox messages
-							if (is_array($file_attachments)) {
-								$i = 0;
-								foreach ($file_attachments as $file_attach) {						
-									if ($file_attach['error'] == 0) {
-										self::save_message_attachment_file($file_attach,$file_comments[$i],$inbox_last_id,null,$receiver_user_id);
-									}
-									$i++;
+			}
+			
+			if (!empty($group_id)) {
+				//message in inbox for group										
+				$users_by_group = GroupPortalManager::get_all_users_by_group($group_id);
+				$users_ids = array_keys($users_by_group);	
+				if (is_array($users_ids) && count($users_ids) > 0) {				
+					foreach ($users_ids as $user_id) {
+						$receiver_user_id = $user_id;														 
+						$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
+								 " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".date('Y-m-d H:i:s')."','$title','$content','$group_id','$parent_id')";
+						$result = Database::query($query,__FILE__,__LINE__);				
+						$inbox_last_id = Database::insert_id();					
+						// save attachment file for inbox messages
+						if (is_array($file_attachments)) {
+							$i = 0;
+							foreach ($file_attachments as $file_attach) {						
+								if ($file_attach['error'] == 0) {
+									self::save_message_attachment_file($file_attach,$file_comments[$i],$inbox_last_id,null,$receiver_user_id);
 								}
-							}						
-							// update parent id for other receiver users belongs the group						
-							if (!empty($parent_id)) {
-								self::update_parent_ids_from_reply($parent_id, $receiver_user_id, $inbox_last_id);
-							}													
-						}
-					}
-				} else {		
-								
-					//message in inbox for user friend								 
-					$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
-							 " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".date('Y-m-d H:i:s')."','$title','$content','$group_id','$parent_id')";
-					$result = Database::query($query,__FILE__,__LINE__);				
-					$inbox_last_id = Database::insert_id();					
-					// save attachment file for inbox messages
-					if (is_array($file_attachments)) {
-						$i = 0;
-						foreach ($file_attachments as $file_attach) {						
-							if ($file_attach['error'] == 0) {
-								self::save_message_attachment_file($file_attach,$file_comments[$i],$inbox_last_id,null,$receiver_user_id);
+								$i++;
 							}
-							$i++;	
+						}						
+						// update parent id for other receiver users belongs the group						
+						if (!empty($parent_id)) {
+							self::update_parent_ids_from_reply($parent_id, $receiver_user_id, $inbox_last_id);
+						}													
+					}
+				}
+			} else {		
+							
+				//message in inbox for user friend								 
+				$query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id ) ".
+						 " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".date('Y-m-d H:i:s')."','$title','$content','$group_id','$parent_id')";
+				$result = Database::query($query,__FILE__,__LINE__);				
+				$inbox_last_id = Database::insert_id();					
+				// save attachment file for inbox messages
+				if (is_array($file_attachments)) {
+					$i = 0;
+					foreach ($file_attachments as $file_attach) {						
+						if ($file_attach['error'] == 0) {
+							self::save_message_attachment_file($file_attach,$file_comments[$i],$inbox_last_id,null,$receiver_user_id);
 						}
-					}					
-				}														
-				return $result;
-			}
+						$i++;	
+					}
+				}					
+			}														
+			return $result;
+			//}
         }         
 		return false;
 	}

+ 1 - 1
main/inc/lib/usermanager.lib.php

@@ -2292,7 +2292,7 @@ class UserManager
 		// database table definition
 		$table_user_tag			= Database::get_main_table(TABLE_MAIN_TAG);
 		$table_user_tag_values	= Database::get_main_table(TABLE_MAIN_USER_REL_TAG);
-		$field_id	= intval($field_id);			 //like '%$tag%' 
+		$field_id	= intval($field_id);			  
 		$limit		= intval($limit);	
 		$tag 		= trim(Database::escape_string($tag));
 					 

+ 6 - 1
main/social/group_edit.php

@@ -4,7 +4,6 @@
  * @package dokeos.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
- 
 
 // Language files that should be included
 $language_file = array('userInfo');
@@ -36,6 +35,12 @@ if (Database::num_rows($res) != 1) {
 	exit;
 }
 
+//only group admins can edit the group
+if (!GroupPortalManager::is_group_admin($group_id)) {
+	api_not_allowed();		
+}	
+
+
 $group_data = Database::fetch_array($res, 'ASSOC');
 
 // Create the form

+ 12 - 3
main/social/group_invitation.php

@@ -16,6 +16,11 @@ require('../inc/global.inc.php');
 require_once ('../inc/lib/xajax/xajax.inc.php');
 api_block_anonymous_users();
 
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/jquery.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/thickbox.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="/main/inc/lib/javascript/thickbox.css" type="text/css" media="projection, screen">';
+
+
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction ('search_users');
@@ -224,14 +229,18 @@ if($_POST['form_sent']) {
 		$user_list=array();
 	}
 	if ($form_sent == 1) {
+		var_dump($group_info);
 		//invite this users
 		$result = GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION);
-		$title = 'YouAreInvitedToGroup'.$group_id;
-		$content = 'YouAreInvitedToGroupContent'.$group_id;
+		$title = get_lang('YouAreInvitedToGroup').' '.$group_info['name'];
+		$content = get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />';
+		$content .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />';
+		$content .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php?accept='.$group_id.'">'.get_lang('Subscribe').'</a>';
+		
 		if (is_array($user_list) && count($user_list) > 0) {
 			//send invitation message
 			foreach($user_list as $user_id ){
-				MessageManager::send_message($user_id, $title, $content);
+				$result = MessageManager::send_message($user_id, $title, $content);				
 			}
 		}		
 	}

+ 5 - 0
main/social/group_members.php

@@ -11,6 +11,11 @@ require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/jquery.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/thickbox.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="/main/inc/lib/javascript/thickbox.css" type="text/css" media="projection, screen">';
+
+
 $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 api_block_anonymous_users();

+ 7 - 1
main/social/group_waiting_list.php

@@ -11,6 +11,10 @@ require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/jquery.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/thickbox.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="/main/inc/lib/javascript/thickbox.css" type="text/css" media="projection, screen">';
+
 $this_section = SECTION_SOCIAL;
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
 
@@ -77,7 +81,7 @@ if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
 
 
 
-if (! empty($show_message)){
+if (!empty($show_message)){
 	Display :: display_normal_message($show_message);
 }
 
@@ -104,6 +108,8 @@ echo '<div id="layout_right" style="margin-left: 282px;">';
 	
 	if (count($new_member_list) > 0) {			
 		Display::display_sortable_grid('search_users', array(), $new_member_list, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true,true,false,true,true));		
+	} else {
+		Display :: display_normal_message(get_lang('ThereAreNotUsersInTheWaitingList'));
 	}
 
 echo '</div>'; // end layout right

+ 37 - 33
main/social/groups.php

@@ -136,6 +136,42 @@ if ($group_id != 0 ) {
 	
 } else {
 		
+		
+	// My groups -----
+	
+	$results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true);
+	
+	$groups = array();
+	if (is_array($results) && count($results) > 0) {
+		foreach ($results as $result) {
+			$id = $result['id'];
+			$url_open  = '<a href="groups.php?id='.$id.'">';
+			$url_close = '</a>';
+			if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {			
+				$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
+			}
+			if ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
+				$result['name'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
+			}			
+			$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],140));
+		}
+	}
+	echo '<h1>'.get_lang('MyGroups').'</h1>';
+	// Everybody can create groups
+	if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+		echo '<a href="group_add.php">'.get_lang('CreateAgroup').'</a>';	
+	} else {
+		// Only admins and teachers can create groups		
+		if (api_is_allowed_to_edit(null,true)) {
+			echo '<a href="group_add.php">'.get_lang('CreateAgroup').'</a>';
+		}
+	}
+	
+	if (count($groups) > 0) {		
+		Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+	}
+	
+	
 	// Newest groups --------
 	
 	$results = GroupPortalManager::get_groups_by_age();
@@ -174,39 +210,7 @@ if ($group_id != 0 ) {
 	}
 	
 	
-	// My groups -----
-	
-	$results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true);
-	
-	$groups = array();
-	if (is_array($results) && count($results) > 0) {
-		foreach ($results as $result) {
-			$id = $result['id'];
-			$url_open  = '<a href="groups.php?id='.$id.'">';
-			$url_close = '</a>';
-			if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {			
-				$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
-			}
-			if ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
-				$result['name'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
-			}			
-			$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],140));
-		}
-	}
-	echo '<h1>'.get_lang('MyGroups').'</h1>';
-	// Everybody can create groups
-	if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
-		echo '<a href="group_add.php">'.get_lang('CreateAgroup').'</a>';	
-	} else {
-		// Only admins and teachers can create groups		
-		if (api_is_allowed_to_edit(null,true)) {
-			echo '<a href="group_add.php">'.get_lang('CreateAgroup').'</a>';
-		}
-	}
-	
-	if (count($groups) > 0) {		
-		Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
-	}
+
 }	
 Display :: display_footer();
 ?>

+ 2 - 3
main/social/invitations.php

@@ -109,7 +109,6 @@ $user_id = api_get_user_id();
 $list_get_invitation		= SocialManager::get_list_invitation_of_friends_by_user_id($user_id);
 $list_get_invitation_sent	= SocialManager::get_list_invitation_sent_by_user_id($user_id);
 $pending_invitations 		= GroupPortalManager::get_groups_by_user($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION, true);
-//$pending_invitations_by_me 	= GroupPortalManager::get_groups_by_user($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,true);
 
 $number_loop=count($list_get_invitation);
 
@@ -216,8 +215,8 @@ if (count($pending_invitations) > 0) {
 		$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.$invitation['name'].'</a>'; 
 		$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.get_lang('AcceptInvitation').'</a>';
 		$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.get_lang('DenyInvitation').'</a>';
-		$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
-		$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';
+		//$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
+		//$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';
 		$new_invitation[]=$invitation;
 	}	
 	Display::display_sortable_grid('search_users', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true));

+ 1 - 1
user_portal.php

@@ -1240,7 +1240,7 @@ if ($show_menu) {
 		$number_of_new_messages_of_friend	= SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
 		
 		// New group invitations sent by a moderator
-		$group_pending_invitations = GroupPortalManager::get_groups_by_user(api_get_user_id(), GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,false);
+		$group_pending_invitations = GroupPortalManager::get_groups_by_user(api_get_user_id(), GROUP_USER_PERMISSION_PENDING_INVITATION,false);
 		$group_pending_invitations = count($group_pending_invitations);
 		
 		$cant_msg  = '';