From f87902851787df1d7e15cbabce27fc6876bf2e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Tue, 16 Feb 2016 11:39:55 -0500 Subject: [PATCH] Prevent add invitees to course group - Refs #8091 --- main/group/member_settings.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/main/group/member_settings.php b/main/group/member_settings.php index 38f2d9a6f0..e8b373ccd6 100755 --- a/main/group/member_settings.php +++ b/main/group/member_settings.php @@ -136,23 +136,26 @@ $userGroup = new UserGroup(); if (!empty($complete_user_list)) { usort($complete_user_list, 'sort_users'); foreach ($complete_user_list as $index => $user) { - $officialCode = !empty($user['official_code']) ? ' - '.$user['official_code'] : null; - - $groups = $userGroup->getUserGroupListByUser($user['user_id']); - $groupNameListToString = ''; - if (!empty($groups)) { - $groupNameList = array_column($groups, 'name'); - $groupNameListToString = ' - ['.implode(', ', $groupNameList).']'; - } + //prevent invitee users add to groups - see #8091 + if ($user['status'] != 20) { + $officialCode = !empty($user['official_code']) ? ' - '.$user['official_code'] : null; + + $groups = $userGroup->getUserGroupListByUser($user['user_id']); + $groupNameListToString = ''; + if (!empty($groups)) { + $groupNameList = array_column($groups, 'name'); + $groupNameListToString = ' - ['.implode(', ', $groupNameList).']'; + } - $name = api_get_person_name($user['firstname'], $user['lastname']). - ' ('.$user['username'].')'.$officialCode; + $name = api_get_person_name($user['firstname'], $user['lastname']). + ' ('.$user['username'].')'.$officialCode; - if ($orderUserListByOfficialCode === 'true') { - $officialCode = !empty($user['official_code']) ? $user['official_code']." - " : '? - '; - $name = $officialCode." ".api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; + if ($orderUserListByOfficialCode === 'true') { + $officialCode = !empty($user['official_code']) ? $user['official_code']." - " : '? - '; + $name = $officialCode." ".api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; + } + $possible_users[$user['user_id']] = $name.$groupNameListToString; } - $possible_users[$user['user_id']] = $name.$groupNameListToString; } }