chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

UI improvements in groups & messages & social network

Browse Source
skala
Julio Montoya 15 years ago
parent 1c484efa60
commit 13856d636d
12 changed files with 399 additions and 298 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/css/blue_lagoon/default.css
  2. 2
      main/css/chamilo/default.css
  3. 187
      main/inc/lib/group_portal_manager.lib.php
  4. 163
      main/inc/lib/message.lib.php
  5. 17
      main/social/group_edit.php
  6. 60
      main/social/group_invitation.php
  7. 75
      main/social/group_members.php
  8. 174
      main/social/groups.php
  9. 3
      main/social/invitations.php
  10. 4
      main/social/message_for_group_form.inc.php
  11. 4
      main/social/search.php
  12. 2
      user_portal.php

6
main/css/blue_lagoon/default.css
Unescape View File

@ -2624,6 +2624,9 @@ input.arrowl {
/* UI improvements for 1.8.6.2 this should be move to the chamilo theme and reproduce in all CSS*/
@ -2759,7 +2762,8 @@ a.unread {
}
.message-group-content {
line-height:150%
line-height:150%;
margin: 5px 0px 8px 0px;
}
.view-message-content {

2
main/css/chamilo/default.css
Unescape View File

@ -2875,7 +2875,7 @@ button.login {
button.login:hover{
background-color:#FFF;
border: solid 1px #FFF;
/* border: solid 1px #FFF; */
}
/*including "plus" image*/

187
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -9,14 +9,16 @@
==============================================================================
*/
// Group permissions
define('GROUP_PERMISSION_OPEN' , '1');
define('GROUP_PERMISSION_OPEN' , '1');
define('GROUP_PERMISSION_CLOSED', '2');
// Group user permissions
define('GROUP_USER_PERMISSION_ADMIN' ,'1'); // the admin of a group
define('GROUP_USER_PERMISSION_READER' ,'2'); // a normal user
define('GROUP_USER_PERMISSION_PENDING_INVITATION' ,'3'); // When an admin invite a user
define('GROUP_USER_PERMISSION_PENDING_INVITATION' ,'3'); // When an admin/moderator invite a user
define('GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER' ,'4'); // When a user whats to join to a group
define('GROUP_USER_PERMISSION_MODERATOR' ,'5'); // a moderator
define('GROUP_USER_PERMISSION_ANONYMOUS' ,'6'); // an anonymous user
@ -186,7 +188,7 @@ class GroupPortalManager
$table = Database :: get_main_table(TABLE_MAIN_GROUP);
$group_id = intval($group_id);
$user_condition = '';
$sql = "SELECT name, description, picture_uri, url, visibility FROM $table WHERE id = $group_id ";
$sql = "SELECT id, name, description, picture_uri, url, visibility FROM $table WHERE id = $group_id ";
$res = Database::query($sql, __FILE__, __LINE__);
$item = array();
if (Database::num_rows($res)>0) {
@ -528,11 +530,14 @@ class GroupPortalManager
{
$table_url_rel_group = Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
if (!empty($user_id) && !empty($group_id)) {
$role = self::get_user_group_role($user_id,$group_id);
if ($role==0) {
$role = self::get_user_group_role($user_id,$group_id);
if ($role == 0) {
$sql = "INSERT INTO $table_url_rel_group
SET user_id = ".intval($user_id).", group_id = ".intval($group_id).", relation_type = ".intval($relation_type);
$result = Database::query($sql, __FILE__, __LINE__);
} elseif($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
//if somebody already invited me I can be added
self::update_user_role($user_id, $group_id, GROUP_USER_PERMISSION_READER);
}
}
return $result;
@ -678,7 +683,7 @@ class GroupPortalManager
$group_id = intval($group_id);
$user_id = intval($user_id);
echo $sql = "SELECT user_id FROM $table_group_rel_user WHERE
$sql = "SELECT user_id FROM $table_group_rel_user WHERE
relation_type = ".GROUP_USER_PERMISSION_ADMIN." AND user_id = $user_id AND group_id = $group_id" ;
$result = Database::query($sql, __FILE__, __LINE__);
}
@ -1056,5 +1061,175 @@ class GroupPortalManager
public static function delete_group_picture($group_id) {
return self::update_group_picture($group_id);
}
public static function is_group_admin($group_id) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN))) {
return true;
} else {
return false;
}
}
public static function is_group_moderator($group_id) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
return true;
} else {
return false;
}
}
public static function is_group_member($group_id) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR, GROUP_USER_PERMISSION_READER))) {
return true;
} else {
return false;
}
}
public static function show_group_column_information($group_id, $user_id) {
$group_info = GroupPortalManager::get_group_data($group_id);
$picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
$big_image = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'','big_');
$tags = GroupPortalManager::get_group_tags($group_id, true);
$users = GroupPortalManager::get_users_by_group($group_id, true);
//my relation with the group is set here
if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
//im a member
if ($users[api_get_user_id()]['relation_type'] != '' ) {
$my_group_role = $users[api_get_user_id()]['relation_type'];
} else {
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
} else {
//im not a member
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
//@todo this must be move to default.css for dev use only
echo '<style>
#group_members { width:233px; height:300px; overflow-x:none; overflow-y: auto;}
.group_member_item { width:98px; height:86px; float:left; margin:5px 5px 15px 5px; }
.group_member_picture { display:block;
margin:0;
overflow:hidden; };
</style>';
echo '<div id="layout-left" style="float: left; width: 280px; height: 100%;">';
//Group's title
echo '<h1>'.$group_info['name'].'</h1>';
//Group's image
echo '<div id="group_image">';
if (basename($picture['file']) != 'unknown_group.png') {
echo '<a class="thickbox" href="'.$big_image['file'].'"><img src='.$picture['file'].' /> </a><br /><br />';
} else {
echo '<img src='.$picture['file'].' /><br /><br />';
}
echo '</div>';
//Group's description
echo '<div id="group_description">';
echo $group_info['description'];
echo '</div>';
//Group's description
echo '<div id="group-url">';
echo $group_info['url'];
echo '</div>';
//Privacy
echo '<div id="group_privacy">';
echo get_lang('Privacy').' : ';
if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
echo get_lang('ThisIsAnOpenGroup');
} elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
echo get_lang('ThisIsACloseGroup');
}
echo '</div>';
//Group's tags
if (!empty($tags)) {
echo '<div id="group_tags">';
echo get_lang('Tags').' : '.$tags;
echo '</div>';
}
//Compose message link
if (in_array($my_group_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR, GROUP_USER_PERMISSION_READER))) {
echo '<div id="actions" style="margin:10px">';
echo '<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>';
//echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.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>';
}
//Members
echo get_lang('Members').' : ';
echo '<div id="group_members">';
foreach($users as $user) {
if (in_array($user['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
if ($user['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$user['lastname'].= Display::return_icon('admin_star.png', get_lang('Admin'));
}
if ($user['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
$user['lastname'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
}
echo '<div class="group_member_item"><a href="profile.php?u='.$user['user_id'].'">';
echo '<div class="group_member_picture">'.$user['image'].'</div>';
echo api_get_person_name($user['firstname'], $user['lastname']).'</a></div>';
}
}
echo '</div>';
//loading group permission
echo '<div id="group_permissions">';
switch ($my_group_role) {
case GROUP_USER_PERMISSION_READER:
// I'm just a reader
echo '<a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_ADMIN:
echo 'Im the admin/';
echo '<a href="group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a>';
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang(YouHaveBeenInvitedJoinNow).'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
echo get_lang('WaitingForAdminResponse');
break;
case GROUP_USER_PERMISSION_MODERATOR:
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_ANONYMOUS:
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
}
echo '</div>'; // end layout permissions
echo '</div>'; // end layout left
}
}
?>

163
main/inc/lib/message.lib.php
Unescape View File

@ -501,19 +501,20 @@ class MessageManager
} else {
$message[0] = ($result[0]);
}
$class = 'class = "read"';
if ($request===true) {
if ($result[5]==4)
{
if ($result[5]==4) {
$message[1] = Display::return_icon('mail_send.png',get_lang('MessageSent'));//Message Sent
}
$message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.GetFullUserName($result[4]).'</a>';
$message[3] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",$result[2]).'</a>';
$message[5] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
} else {
$message[2] = '<a onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].'">'.GetFullUserName($result[4]).'</a>';
$message[3] = '<a onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].'">'.$result[2].'</a>';
$message[5] = '<a href="new_message.php?re_id='.$result[0].'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
$message[2] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].'">'.GetFullUserName($result[4]).'</a>';
$message[3] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].'">'.$result[2].'</a>';
$message[5] = '<a '.$class.' href="new_message.php?re_id='.$result[0].'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
'&nbsp;&nbsp;<a href="outbox.php?action=deleteone&id='.$result[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
}
$message[4] = $result[3]; //date stays the same
@ -542,31 +543,30 @@ class MessageManager
/**
* display message box in the inbox
* @param int the message id
* @param string inbox or outbox strings are available
* @return string html with the message content
*/
public static function show_message_box($message_id) {
public static function show_message_box($message_id, $source = 'inbox') {
$table_message = Database::get_main_table(TABLE_MESSAGE);
$tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
$message_id = intval($message_id);
/* if (isset($_GET['id_send']) && is_numeric($_GET['id_send'])) {
// when I get here ? by Julio Montoya
$query = "SELECT * FROM $table_message WHERE user_sender_id=".api_get_user_id()." AND id=".intval(Database::escape_string($_GET['id_send']))." AND msg_status=4;";
$result = Database::query($query,__FILE__,__LINE__);
$path='outbox.php';
$message_id = intval($_GET['id_send']);
} else {*/
$message_id = intval($message_id);
if (is_numeric($message_id) && !empty($message_id)) {
$query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
$result = Database::query($query,__FILE__,__LINE__);
$query = "SELECT * FROM $table_message WHERE msg_status<>4 AND user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
$result = Database::query($query,__FILE__,__LINE__);
}
if ($source == 'outbox') {
if (isset($message_id) && is_numeric($message_id)) {
$query = "SELECT * FROM $table_message WHERE user_sender_id=".api_get_user_id()." AND id=".$message_id." AND msg_status=4;";
$result = Database::query($query,__FILE__,__LINE__);
$path='outbox.php';
}
} else {
if (is_numeric($message_id) && !empty($message_id)) {
$query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
$result = Database::query($query,__FILE__,__LINE__);
$query = "SELECT * FROM $table_message WHERE msg_status<>4 AND user_receiver_id=".api_get_user_id()." AND id='".$message_id."';";
$result = Database::query($query,__FILE__,__LINE__);
}
$path='inbox.php';
//}
}
$row = Database::fetch_array($result);
@ -621,6 +621,11 @@ class MessageManager
<div id="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>
<DIV class=HT style="PADDING-BOTTOM: 5px">';
if ($source == 'outbox') {
$message_content .= '<a href="outbox.php">'.Display::return_icon('back.png',get_lang('ReturnToOutbox')).get_lang('ReturnToOutbox').'</a> &nbsp';
} else {
$message_content .= '<a href="inbox.php">'.Display::return_icon('back.png',get_lang('ReturnToInbox')).get_lang('ReturnToInbox').'</a> &nbsp';
}
$message_content .= '<a href="new_message.php?re_id='.$message_id.'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).get_lang('ReplyToMessage').'</a> &nbsp';
$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''.get_lang('DeleteMessage').'</a>&nbsp';
@ -720,13 +725,13 @@ class MessageManager
* @param int group id
*/
public static function display_messages_for_group($group_id) {
global $origin;
$rows = self::get_messages_by_group($group_id);
$rows = self::calculate_children($rows);
$group_info = GroupPortalManager::get_group_data($group_id);
$count=0;
if (is_array($rows) && count($rows)> 0) {
$html = '';
if (is_array($rows) && count($rows)> 0) {
foreach ($rows as $message) {
$indent = $message['indent_cnt']*'20';
$user_sender_info = UserManager::get_user_info_by_id($message['user_sender_id']);
@ -745,25 +750,28 @@ class MessageManager
// get file attachments by message id
$files_attachments = self::get_links_message_attachment_files($message['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
echo '<div class="'.$message_item.'" id="message-item-'.$count.'" style="margin-left: '.$indent.'px;">';
$html.= '<div class="'.$message_item.'" id="message-item-'.$count.'" style="margin-left: '.$indent.'px;">';
//if (!isset($message['children'])) {
echo '<div id="message-reply-link"><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='.$message['id'].'" class="thickbox" title="'.api_xml_http_response_encode(get_lang('Reply')).'">'.Display :: return_icon('forumthread_new.gif', api_xml_http_response_encode(get_lang('Reply'))).'&nbsp;'.api_xml_http_response_encode(get_lang('Reply')).'</a></div>';
$html.= '<div id="message-reply-link"><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='.$message['id'].'" class="thickbox" title="'.api_xml_http_response_encode(get_lang('Reply')).'">'.Display :: return_icon('forumthread_new.gif', api_xml_http_response_encode(get_lang('Reply'))).'&nbsp;'.api_xml_http_response_encode(get_lang('Reply')).'</a></div>';
//echo '<a href="/main/messages/new_message.php?group_id='.$group_id.'&message_id='.$message['id'].'">'.Display::return_icon('forumthread_new.gif',api_xml_http_response_encode(get_lang('Reply'))).'&nbsp;'.api_xml_http_response_encode(get_lang('Reply')).'</a>';
//}
echo '<div class="'.$message_title_item.'">'.$message['title'].'&nbsp;(&nbsp;'.date_to_str_ago($message['send_date']).'&nbsp;)&nbsp;</div>';
$html.= '<div class="'.$message_title_item.'">'.$message['title'].'&nbsp;</div>';
echo '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$message['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
echo '<div class="message-group-content">'.$message['content'].'</div>';
echo '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';
$html.= '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$message['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
$html.= '<div class="message-group-content">'.$message['content'].'</div>';
$html.= '<div class="message-group-date">'.get_lang('PostIn').' '.date_to_str_ago($message['send_date']).'</div>';
echo '</div>';
$html.= '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';
$html.= '</div>';
$count++;
}
}
return $html;
}
/**
@ -931,6 +939,7 @@ function outbox_display() {
$request=api_is_xml_http_request();
global $charset;
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-3";
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('BackToOutbox')."</a>";
@ -941,51 +950,51 @@ function outbox_display() {
} else {
$success= get_lang('SelectedMessagesDeleted')."&nbsp</b>"."<br><a href=\""."outbox.php\">".get_lang('BackToOutbox')."</a>";
}
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
foreach ($_POST['id'] as $index => $message_id) {
MessageManager::delete_message_by_user_receiver(api_get_user_id(), $message_id);
if (isset ($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'delete' :
$number_of_selected_messages = count($_POST['id']);
if ($number_of_selected_messages!=0) {
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::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_send_mask', 'get_message_data_send_mask', 3,get_number_of_messages_send_mask(),'DESC');
$title=api_xml_http_response_encode(get_lang('Title'));
$action=api_xml_http_response_encode(get_lang('Actions'));
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
$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('To')),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_sent">';
if ($request===true) {
echo '<form name="form_send_out" id="form_send_out" action="" method="post">';
echo '<input type="hidden" name="action" value="delete" />';
$table->display();
echo '</form>';
if (get_number_of_messages_send_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(\'outbox\')">'.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_send_mask', 'get_message_data_send_mask', 3,get_number_of_messages_send_mask(),'DESC');
$title=api_xml_http_response_encode(get_lang('Title'));
$action=api_xml_http_response_encode(get_lang('Actions'));
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
$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('To')),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_sent">';
if ($request===true) {
echo '<form name="form_send_out" id="form_send_out" action="" method="post">';
echo '<input type="hidden" name="action" value="delete" />';
$table->display();
echo '</form>';
if (get_number_of_messages_send_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(\'outbox\')">'.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_send_mask() {
return MessageManager::get_number_of_messages_sent();

17
main/social/group_edit.php
Unescape View File

@ -137,15 +137,28 @@ $big_image_size = api_getimagesize($big_image);
$big_image_width = $big_image_size[0];
$big_image_height = $big_image_size[1];
$url_big_image = $big_image.'?rnd='.time();
/*
if ($image == '') {
echo '<img '.$img_attributes.' />';
} else {
echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
}
*/
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
// Display form
//-- Show message groups
echo '<div id="layout_right" style="margin-left: 282px;">';
// Display form
$form->display();
echo '</div>'; // end layout right
// Footer
Display::display_footer();

60
main/social/group_invitation.php
Unescape View File

@ -56,10 +56,9 @@ if (empty($group_id)) {
api_not_allowed();
}
//only admin or moderator can do that
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
if (!in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
if (!GroupPortalManager::is_group_member($group_id)) {
api_not_allowed();
}
}
}
function search_users($needle,$type) {
@ -213,9 +212,6 @@ echo '<div class="actions-title">';
echo get_lang('Invitations');
echo '</div>';
if($_POST['form_sent']) {
$form_sent = $_POST['form_sent'];
$firstLetterUser = $_POST['firstLetterUser'];
@ -229,15 +225,15 @@ if($_POST['form_sent']) {
}
if ($form_sent == 1) {
//invite this users
$result = GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER);
$result = GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION);
$title = 'YouAreInvitedToGroup'.$group_id;
$content = 'YouAreInvitedToGroupContent'.$group_id;
//send invitation message
foreach($user_list as $user_id ){
MessageManager::send_message($user_id, $title, $content);
}
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);
}
}
}
}
@ -245,7 +241,6 @@ if($_POST['form_sent']) {
$nosessionUsersList = $sessionUsersList = array();
$ajax_search = $add_type == 'unique' ? true : false;
global $_configuration;
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
if ($ajax_search) {
@ -274,17 +269,17 @@ if ($ajax_search) {
foreach ($Users as $user) {
$sessionUsersList[$user['user_id']] = $user ;
}
} else {
$friends = SocialManager::get_friends(api_get_user_id());
} else {
$friends = SocialManager::get_friends(api_get_user_id());
$suggest_friends = false;
if (!$friends) {
$suggest_friends = true;
} else {
} else {
foreach($friends as $friend) {
$group_friend_list = GroupPortalManager::get_groups_by_user($friend['friend_user_id'], 0);
$group_friend_list = GroupPortalManager::get_groups_by_user($friend['friend_user_id'], 0);
//var_dump($group_friend_list);
$friend_group_id = '';
if (isset($group_friend_list[$group_id]) && $group_friend_list[$group_id]['id'] == $group_id) {
$friend_group_id = $group_id;
@ -308,11 +303,8 @@ if ($ajax_search) {
unset($nosessionUsersList[$key_user_list]);
}
}
}
if ($add_type == 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
@ -320,14 +312,15 @@ if ($add_type == 'multiple') {
$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
$link_add_type_multiple = '<a href="'.api_get_self().'?id='.$group_id.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
}
?>
<div class="actions">
<?php $link_add_type_unique ?>&nbsp;|&nbsp;<?php $link_add_type_multiple ?>
</div>
<?php echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info['name'].')</div></div><br/>'; ?>
/* <?php $link_add_type_unique ?>&nbsp;|&nbsp;<?php $link_add_type_multiple ?> */
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//-- Show group content
echo '<div id="layout_right" style="margin-left: 282px;">';
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $group_id; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
<?php
@ -463,6 +456,11 @@ unset($sessionUsersList);
</tr>
</table>
</form>
<?php
echo '</div>'; // end layout right
?>
<script type="text/javascript">
<!--
@ -558,7 +556,7 @@ function makepost(select){
<?php
//current group members
$members = GroupPortalManager::get_users_by_group($group_id,true,array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER));
$members = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION));
if (is_array($members) && count($members)>0) {
echo get_lang('UsersAlreadyInvited');
Display::display_sortable_grid('search_users', array(), $members, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, false, true));

75
main/social/group_members.php
Unescape View File

@ -48,8 +48,8 @@ $show_message = '';
if (isset($_GET['action']) && $_GET['action']=='add') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
//if i'm the admin
if (isset($admins[api_get_user_id()]) && $admins[api_get_user_id()]['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
//if i'm a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
GroupPortalManager::update_user_role($user_join, $group_id);
$show_message = get_lang('UserAdded');
}
@ -58,8 +58,8 @@ if (isset($_GET['action']) && $_GET['action']=='add') {
if (isset($_GET['action']) && $_GET['action']=='delete') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
//if i'm the admin
if (isset($admins[api_get_user_id()]) && $admins[api_get_user_id()]['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
//if i'm a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
GroupPortalManager::delete_user_rel_group($user_join, $group_id);
$show_message = get_lang('UserDeleted');
}
@ -69,12 +69,23 @@ if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
// we add a user only if is a open group
$user_moderator= intval($_GET['u']);
//if i'm the admin
if (isset($admins[api_get_user_id()]) && $admins[api_get_user_id()]['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
if (GroupPortalManager::is_group_admin(api_get_user_id())) {
GroupPortalManager::update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
$show_message = get_lang('UserChangeToModerator');
}
}
if (isset($_GET['action']) && $_GET['action']=='delete_moderator') {
// we add a user only if is a open group
$user_moderator= intval($_GET['u']);
//only group admins can do that
if (GroupPortalManager::is_group_admin(api_get_user_id())) {
GroupPortalManager::update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_READER);
$show_message = get_lang('UserChangeToReader');
}
}
if (! empty($show_message)){
Display :: display_normal_message($show_message);
@ -83,29 +94,41 @@ if (! empty($show_message)){
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR));
$new_member_list = array();
foreach($users as $user) {
switch ($user['relation_type']) {
case GROUP_USER_PERMISSION_ADMIN:
$user['link'] = Display::return_icon('admin_star.png', get_lang('Admin'));
break;
case GROUP_USER_PERMISSION_READER:
$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('del_user_big.gif', get_lang('DeleteFromGroup')).'</a><br />'.
'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('admins.gif', get_lang('AddModerator')).'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=add">'.Display::return_icon('pending_invitation.png', get_lang('PendingInvitation')).'</a>';
break;
case GROUP_USER_PERMISSION_MODERATOR:
$user['link'] = Display::return_icon('moderator_star.png', get_lang('Moderator'));
break;
}
$new_member_list[] = $user;
}
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));
}
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//-- Show message groups
echo '<div id="layout_right" style="margin-left: 282px;">';
// Display form
foreach($users as $user) {
switch ($user['relation_type']) {
case GROUP_USER_PERMISSION_ADMIN:
$user['link'] = Display::return_icon('admin_star.png', get_lang('Admin'));
break;
case GROUP_USER_PERMISSION_READER:
$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('del_user_big.gif', get_lang('DeleteFromGroup')).'</a><br />'.
'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('admins.gif', get_lang('AddModerator')).'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=add">'.Display::return_icon('pending_invitation.png', get_lang('PendingInvitation')).'</a>';
break;
case GROUP_USER_PERMISSION_MODERATOR:
$user['link'] = Display::return_icon('moderator_star.png', get_lang('Moderator')).
'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete_moderator">'.Display::return_icon('del_user_big.gif', get_lang('DeleteModerator')).'</a>';
break;
}
$new_member_list[] = $user;
}
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));
}
echo '</div>'; // end layout right
Display :: display_footer();
?>

174
main/social/groups.php
Unescape View File

@ -11,6 +11,7 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
api_block_anonymous_users();
@ -82,9 +83,9 @@ echo '</div>';
// getting group information
$group_id = intval($_GET['id']);
$group_info = GroupPortalManager::get_group_data($group_id);
if ($group_id != 0 ) {
if ($group_id != 0 ) {
//Loading group information
if (isset($_GET['status']) && $_GET['status']=='sent') {
Display::display_confirmation_message(get_lang('MessageHasBeenSent'), false);
@ -102,163 +103,37 @@ if ($group_id != 0 ) {
if (isset($_GET['action']) && $_GET['action']=='join') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
if (api_get_user_id() == $user_join) {
if (api_get_user_id() == $user_join && !empty($group_id)) {
$group_info = GroupPortalManager::get_group_data($group_id);
if ($group_info['visibility'] == GROUP_PERMISSION_OPEN) {
GroupPortalManager::add_user_to_group($user_join, $group_id);
} else {
GroupPortalManager::add_user_to_group($user_join, $group_id, GROUP_USER_PERMISSION_PENDING_INVITATION);
}
}
}
}
echo GroupPortalManager::show_group_column_information($group_id);
$picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
$big_image = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'','big_');
$tags = GroupPortalManager::get_group_tags($group_id, true);
$users = GroupPortalManager::get_users_by_group($group_id, true);
//my relation with the group is set here
if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
//im a member
if ($users[api_get_user_id()]['relation_type'] != '' ) {
$my_group_role = $users[api_get_user_id()]['relation_type'];
} else {
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
} else {
//im not a member
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
//@todo this must be move to default.css for dev use only
echo '<style>
#group_members { width:233px; height:300px; overflow-x:none; overflow-y: auto;}
.group_member_item { width:98px; height:86px; float:left; margin:5px 5px 15px 5px; }
.group_member_picture { display:block;
height:92px;
margin:0;
overflow:hidden; };
</style>';
echo '<div id="layout-left" style="float: left; width: 280px; height: 100%;">';
//Group's title
echo '<h1>'.$group_info['name'].'</h1>';
//Group's image
echo '<div id="group_image">';
if (basename($picture['file']) != 'unknown_group.png') {
echo '<a class="thickbox" href="'.$big_image['file'].'"><img src='.$picture['file'].' /> </a><br /><br />';
} else {
echo '<img src='.$picture['file'].' /><br /><br />';
}
echo '</div>';
//Group's description
echo '<div id="group_description">';
echo $group_info['description'];
echo '</div>';
//Group's description
echo '<div id="group-url">';
echo $group_info['url'];
echo '</div>';
//Privacy
echo '<div id="group_privacy">';
echo get_lang('Privacy').' : ';
if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
echo get_lang('ThisIsAnOpenGroup');
} elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
echo get_lang('ThisIsACloseGroup');
}
echo '</div>';
//Group's tags
if (!empty($tags)) {
echo '<div id="group_tags">';
echo get_lang('Tags').' : '.$tags;
echo '</div>';
}
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//Compose message link
if (in_array($my_group_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
echo '<div id="actions" style="margin:10px">';
echo '<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>';
//echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.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>';
}
//Members
echo get_lang('Members').' : ';
echo '<div id="group_members">';
foreach($users as $user) {
if (in_array($user['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
if ($user['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$user['lastname'].= Display::return_icon('admin_star.png', get_lang('Admin'));
}
if ($user['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
$user['lastname'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
}
echo '<div class="group_member_item"><a href="profile.php?u='.$user['user_id'].'">';
echo '<div class="group_member_picture">'.$user['image'].'</div>';
echo api_get_person_name($user['firstname'], $user['lastname']).'</a></div>';
}
}
echo '</div>';
//loading group permission
echo '<div id="group_permissions">';
switch ($my_group_role) {
case GROUP_USER_PERMISSION_READER:
// I'm just a reader
echo '<a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a>';
echo 'Invite others/';
break;
case GROUP_USER_PERMISSION_ADMIN:
echo 'Im the admin/';
echo '<a href="group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a>';
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
echo get_lang('PendingApproval');
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
echo get_lang('PendingApproval');
break;
case GROUP_USER_PERMISSION_MODERATOR:
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_ANONYMOUS:
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
}
echo '</div>'; // end layout permissions
echo '</div>'; // end layout left
//-- Show message groups
//-- Show message groups
echo '<div id="layout_right" style="margin-left: 282px;">';
echo '<div class="messages">';
MessageManager::display_messages_for_group($group_id);
echo '<div class="messages">';
if (GroupPortalManager::is_group_member($group_id)) {
$content = MessageManager::display_messages_for_group($group_id);
if (!empty($content)) {
echo $content;
} else {
echo get_lang('YouShouldCreateATopic');
}
} else {
echo get_lang('YouShouldJoinTheGroup');
}
echo '</div>'; // end layout messages
echo '</div>'; // end layout right
} else {
// Newest groups --------
$results = GroupPortalManager::get_groups_by_age(10 , true);
@ -267,7 +142,7 @@ if ($group_id != 0 ) {
$id = $result['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,cut($result['description'],140));
}
if (count($groups) > 0) {
echo '<h1>'.get_lang('Newest').'</h1>';
@ -289,7 +164,7 @@ if ($group_id != 0 ) {
$result['count'] = $result['count'].' '.get_lang('Members');
}
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],$result['description']);
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],cut($result['description'],140));
}
if (count($groups) > 0) {
echo '<h1>'.get_lang('Popular').'</h1>';
@ -300,6 +175,7 @@ if ($group_id != 0 ) {
// My groups -----
$results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true);
$groups = array();
foreach ($results as $result) {
@ -309,7 +185,7 @@ if ($group_id != 0 ) {
if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
}
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
$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>';
echo '<a href="group_add.php">'.get_lang('CreateAgroup').'</a>';

3
main/social/invitations.php
Unescape View File

@ -103,7 +103,8 @@ $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_SENT_BY_USER,true);
$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);

4
main/social/message_for_group_form.inc.php
Unescape View File

@ -52,13 +52,13 @@ if (!empty($group_id)) {
<div id="id_content_panel_init">
<dl>
<?php
if (api_get_setting('allow_message_tool')=='true') {
if (api_get_setting('allow_message_tool')=='true') {
//normal message
$user_info=api_get_user_info($userfriend_id);
echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;&nbsp;&nbsp;<?php echo api_xml_http_response_encode($to_group); ?>
<br />
<br /><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
<input id="txt_subject_id" name="title" type="text" style="width:300px;" value="<?php echo $title_group ?>"><br/>
<input id="txt_subject_id" name="title" type="text" style="width:450px;" value="<?php echo $title_group ?>"><br/>
<br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />
<textarea id="txt_area_invite" name="content" rows="3" cols="68"></textarea><br/>
<br /><?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />

4
main/social/search.php
Unescape View File

@ -35,7 +35,7 @@ if ($query != '') {
$users = UserManager::get_all_user_tags($query, 0, 0, 5);
$results = array();
if (is_array($users)) {
if (is_array($users) && count($users)> 0) {
echo '<h2>'.get_lang('Users').'</h2>';
foreach($users as $user) {
@ -47,6 +47,8 @@ if ($query != '') {
$results[] = array($img, $user['firstname'],$user['lastname'],$user['tag']);
}
} else {
echo get_lang('SorryNoResults');
}
Display::display_sortable_grid('search_users', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);

2
user_portal.php
Unescape View File

@ -1180,7 +1180,7 @@ api_session_register('status');
RIGHT MENU
==============================================================================
*/
echo ' <div class="menu">';
echo ' <div id="menu">';
// api_display_language_form(); // moved to the profile page.

Write Preview
Loading…
Cancel
Save