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

User group minor fixes see #190

Browse Source
skala
Julio Montoya 16 years ago
parent e7b3944958
commit a8115d5fc4
9 changed files with 171 additions and 125 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. 2
      main/css/blue_lagoon/default.css
  2. 120
      main/inc/lib/group_portal_manager.lib.php
  3. 44
      main/inc/lib/message.lib.php
  4. 4
      main/inc/lib/social.lib.php
  5. 68
      main/social/group_members.php
  6. 28
      main/social/group_waiting_list.php
  7. 10
      main/social/groups.php
  8. 10
      main/social/invitations.php
  9. 10
      main/social/profile.php

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

@ -389,7 +389,7 @@ default.css (línea 362)
width: auto;
margin: 24px 6px 0 6px;
padding-left: 10px;
border: 1px solid #636363;
border: 1px solid #ccc;
background-color: #FFF;
}
.menusectioncaption {

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

@ -302,16 +302,28 @@ class GroupPortalManager
}
/**
* Gets the members of a group
* Gets the group's members
*/
public static function get_users_by_group($group_id='', $with_image = false, $relation_type = array(), $limit = 100, $image_conf = array('size'=>'medium_','height'=>80))
public static function get_users_by_group($group_id, $with_image = false, $relation_type = array(), $from = 0, $limit = 15, $image_conf = array('size'=>'medium_','height'=>80))
{
$where = '';
$table_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$group_id = intval($group_id);
$limit = intval($limit);
$from = intval($from);
$limit = intval($limit);
if (empty($group_id)){
return array();
}
if (empty($limit)) {
$limit = 15;
}
if (empty($from)) {
$from = 0;
}
if (count($relation_type) == 0) {
$where_relation_condition = '';
} else {
@ -326,7 +338,7 @@ class GroupPortalManager
$sql="SELECT picture_uri as image, u.user_id, u.firstname, u.lastname, relation_type FROM $tbl_user u
INNER JOIN $table_group_rel_user gu
ON (gu.user_id = u.user_id) WHERE gu.group_id= $group_id $where_relation_condition ORDER BY relation_type, firstname LIMIT $limit";
ON (gu.user_id = u.user_id) WHERE gu.group_id= $group_id $where_relation_condition ORDER BY relation_type, firstname LIMIT $from, $limit";
$result=Database::query($sql,__FILE__,__LINE__);
$array = array();
@ -340,6 +352,32 @@ class GroupPortalManager
return $array;
}
/**
* Gets all the members of a group no matter the relationship for more specifications use get_users_by_group
* @param int group id
* @return array
*/
public static function get_all_users_by_group($group_id)
{
$table_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$group_id = intval($group_id);
if (empty($group_id)){
return array();
}
$sql="SELECT u.user_id, u.firstname, u.lastname, relation_type FROM $tbl_user u
INNER JOIN $table_group_rel_user gu
ON (gu.user_id = u.user_id) WHERE gu.group_id= $group_id ORDER BY relation_type, firstname";
$result=Database::query($sql,__FILE__,__LINE__);
$array = array();
while ($row = Database::fetch_array($result, 'ASSOC')) {
$array[$row['user_id']] = $row;
}
return $array;
}
/** Gets the inner join of access_url and the course table
@ -422,9 +460,8 @@ class GroupPortalManager
* @author Julio Montoya
* @param int user id
* @param int group_id
* @return int 0 if there are not relationship otherwise return GROUP_USER_PERMISSION_ADMIN or GROUP_USER_PERMISSION_READER constants
* */
* @return int 0 if there are not relationship otherwise returns the user group
* */
public static function get_user_group_role($user_id, $group_id)
{
$table_group_rel_user= Database :: get_main_table(TABLE_MAIN_USER_REL_GROUP);
@ -974,8 +1011,12 @@ class GroupPortalManager
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);
public static function is_group_admin($group_id, $user_id = 0) {
if (empty($user_id)) {
$user_id = api_get_user_id();
}
$user_role = GroupPortalManager::get_user_group_role($user_id, $group_id);
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN))) {
return true;
} else {
@ -983,8 +1024,11 @@ class GroupPortalManager
}
}
public static function is_group_moderator($group_id) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
public static function is_group_moderator($group_id, $user_id = 0) {
if (empty($user_id)) {
$user_id = api_get_user_id();
}
$user_role = GroupPortalManager::get_user_group_role($user_id, $group_id);
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
return true;
} else {
@ -992,8 +1036,11 @@ class GroupPortalManager
}
}
public static function is_group_member($group_id) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $group_id);
public static function is_group_member($group_id, $user_id = 0) {
if (empty($user_id)) {
$user_id = api_get_user_id();
}
$user_role = GroupPortalManager::get_user_group_role($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 {
@ -1013,22 +1060,11 @@ class GroupPortalManager
$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);
$members = 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;
}
$my_group_role = self::get_user_group_role($user_id, $group_id);
//@todo this must be move to default.css for dev use only
echo '<style>
@ -1118,8 +1154,9 @@ class GroupPortalManager
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>';
break;
case GROUP_USER_PERMISSION_ANONYMOUS:
default:
echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a></li>';
break;
}
echo '</ul>';
echo '</div>'; // end layout permissions
@ -1128,20 +1165,27 @@ class GroupPortalManager
//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'));
foreach($members as $member) {
// if is a member
if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
//add icons
if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$member['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>';
if ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
$member['lastname'].= Display::return_icon('moderator_star.png', get_lang('Moderator'));
}
echo '<div class="group_member_item"><a href="profile.php?u='.$member['user_id'].'">';
echo '<div class="group_member_picture">'.$member['image'].'</div>';
echo api_get_person_name($member['firstname'], $member['lastname']).'</a></div>';
}
}
if ($my_group_role == GROUP_USER_PERMISSION_READER) {
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
}

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

@ -215,28 +215,30 @@ class MessageManager
if (!empty($group_id)) {
//message in inbox for group
$users_by_group = GroupPortalManager::get_users_by_group($group_id);
$users_ids = array_keys($users_by_group);
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);
$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++;
}
$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);
}
}
// 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 {

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

@ -870,6 +870,10 @@ class SocialManager extends UserManager {
echo '</ul></dd>';
}
}
/**
* Dummy function
*
*/
public static function get_plugins($place = SOCIAL_CENTER_PLUGIN) {
$content = '';
switch ($place) {

68
main/social/group_members.php
Unescape View File

@ -12,9 +12,7 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
$this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
api_block_anonymous_users();
$group_id = intval($_GET['id']);
@ -27,9 +25,8 @@ if (empty($group_id)) {
if (empty($group_info)) {
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 (!in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR, GROUP_USER_PERMISSION_READER))) {
api_not_allowed();
}
}
@ -41,15 +38,15 @@ echo '<div class="actions-title">';
echo get_lang('GroupMembers');
echo '</div>';
// Group information
$admins = GroupPortalManager::get_users_by_group($group_id, true,array(GROUP_USER_PERMISSION_ADMIN));
$show_message = '';
$show_message = '';
//if i'm a moderator
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 a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
if (GroupPortalManager::is_group_moderator($group_id)) {
GroupPortalManager::update_user_role($user_join, $group_id);
$show_message = get_lang('UserAdded');
}
@ -59,7 +56,7 @@ 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 a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
if (GroupPortalManager::is_group_moderator($group_id)) {
GroupPortalManager::delete_user_rel_group($user_join, $group_id);
$show_message = get_lang('UserDeleted');
}
@ -69,7 +66,7 @@ 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 (GroupPortalManager::is_group_admin(api_get_user_id())) {
if (GroupPortalManager::is_group_admin($group_id)) {
GroupPortalManager::update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
$show_message = get_lang('UserChangeToModerator');
}
@ -79,56 +76,57 @@ 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())) {
if (GroupPortalManager::is_group_admin($group_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);
}
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR));
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000);
$new_member_list = array();
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//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) {
//-- 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:
if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
$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>';
$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>';
$user['link'] = Display::return_icon('moderator_star.png', get_lang('Moderator'));
//only group admin can manage moderators
if ($user_role == GROUP_USER_PERMISSION_ADMIN) {
$user['link'] .='<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
$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();
?>

28
main/social/group_waiting_list.php
Unescape View File

@ -12,7 +12,6 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
$this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
api_block_anonymous_users();
@ -42,14 +41,14 @@ echo get_lang('GroupWaitingList');
echo '</div>';
// Group information
$admins = GroupPortalManager::get_users_by_group($group_id, true,array(GROUP_USER_PERMISSION_ADMIN));
$admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000);
$show_message = '';
if (isset($_GET['action']) && $_GET['action']=='accept') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
//if i'm a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
if (GroupPortalManager::is_group_moderator($group_id)) {
GroupPortalManager::update_user_role($user_join, $group_id);
$show_message = get_lang('UserAdded');
}
@ -59,7 +58,7 @@ if (isset($_GET['action']) && $_GET['action']=='deny') {
// we add a user only if is a open group
$user_join = intval($_GET['u']);
//if i'm a moderator
if (GroupPortalManager::is_group_moderator(api_get_user_id())) {
if (GroupPortalManager::is_group_moderator($group_id)) {
GroupPortalManager::delete_user_rel_group($user_join, $group_id);
$show_message = get_lang('UserDeleted');
}
@ -70,7 +69,7 @@ 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 (GroupPortalManager::is_group_admin(api_get_user_id())) {
if (GroupPortalManager::is_group_admin($group_id)) {
GroupPortalManager::update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
$show_message = get_lang('UserChangeToModerator');
}
@ -82,23 +81,22 @@ if (! empty($show_message)){
Display :: display_normal_message($show_message);
}
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER));
$users = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER), 0, 1000);
$new_member_list = array();
//Shows left column
echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
//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;">';
//-- 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_PENDING_INVITATION_SENT_BY_USER:
$user['link'] = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_user.gif', get_lang('Accept')).'</a>';
$user['link'] = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_user.gif', get_lang('Accept')).'</a>';
$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('add_teacher_big.gif', get_lang('Moderator')).'</a>';
$user['link'] .='<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('Deny')).'</a>';
$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('Deny')).'</a>';
break;
}
$new_member_list[] = $user;
@ -107,8 +105,8 @@ $new_member_list = array();
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
echo '</div>'; // end layout right
Display :: display_footer();
?>

10
main/social/groups.php
Unescape View File

@ -113,8 +113,10 @@ if ($group_id != 0 ) {
}
}
//Shows left column
//-- 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;">';
@ -187,16 +189,16 @@ if ($group_id != 0 ) {
}
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>';
}

10
main/social/invitations.php
Unescape View File

@ -75,12 +75,12 @@ if (is_array($_GET) && count($_GET)>0) {
foreach($_GET as $key => $value) {
switch ($key) {
case 'accept':
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value);
if ($user_role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
$user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value);
if (in_array($user_role , array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,GROUP_USER_PERMISSION_PENDING_INVITATION))) {
GroupPortalManager::update_user_role(api_get_user_id(), $value, GROUP_USER_PERMISSION_READER);
$show_message = get_lang('UserIsSubscribeToThisGroup');
$show_message = get_lang('UserIsSubscribedToThisGroup');
} else {
$show_message = get_lang('UserIsSubscribeToThisGroup');
$show_message = get_lang('UserIsNotSubscribedToThisGroup');
}
break 2;
case 'deny':
@ -108,7 +108,7 @@ $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 = 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);

10
main/social/profile.php
Unescape View File

@ -434,7 +434,7 @@ echo '<div id="social-profile-wrapper">';
echo '</div>';
//Load right plugin's
echo SocialManager::get_plugins(SOCIAL_RIGHT_PLUGIN);
//echo SocialManager::get_plugins(SOCIAL_RIGHT_PLUGIN);
} else {
echo '<div class="clear"></div><br />';
@ -614,12 +614,10 @@ echo '<div id="social-profile-container">';
echo '<div class="social-content-announcements">';
echo $announcement_content.'<br/>';
echo '</div>';
}
}
//Load left plugin
echo SocialManager::get_plugins(SOCIAL_LEFT_PLUGIN);
//echo SocialManager::get_plugins(SOCIAL_LEFT_PLUGIN);
}
echo '</div>';
@ -711,7 +709,7 @@ echo '<div id="social-profile-container">';
}
//Load plugin center
echo SocialManager::get_plugins(SOCIAL_CENTER_PLUGIN);
//echo SocialManager::get_plugins(SOCIAL_CENTER_PLUGIN);
//--------------------------

Write Preview
Loading…
Cancel
Save