Skip to content

Commit 3a9c18e

Browse files
committed
Minor - format code , remove unused code
1 parent 5a446ee commit 3a9c18e

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

main/group/member_settings.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ function check_group_members($value)
113113
return true;
114114
}
115115

116-
/* MAIN CODE */
117-
118116
$htmlHeadXtra[] = '<script>
119117
$(document).ready( function() {
120118
$("#max_member").on("focus", function() {
@@ -128,7 +126,6 @@ function check_group_members($value)
128126
$form->addElement('hidden', 'action');
129127
$form->addElement('hidden', 'max_student', $current_group['max_student']);
130128
$complete_user_list = GroupManager::fill_groups_list($current_group['iid']);
131-
132129
$subscribedTutors = GroupManager::getTutors($current_group['iid']);
133130
if ($subscribedTutors) {
134131
$subscribedTutors = array_column($subscribedTutors, 'user_id');

main/inc/lib/groupmanager.lib.php

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,36 +2080,12 @@ public static function fill_groups_list($groupId)
20802080
$categoryId = $category['id'];
20812081
}
20822082

2083-
$group_table = Database::get_course_table(TABLE_GROUP);
2084-
$group_user_table = Database::get_course_table(TABLE_GROUP_USER);
20852083
$session_id = api_get_session_id();
2086-
$complete_user_list = CourseManager::get_real_and_linked_user_list($_course['code'], true, $session_id);
2087-
$course_id = api_get_course_int_id();
2088-
2089-
/*
2090-
* Retrieve all the groups where enrollment is still allowed
2091-
* (reverse) ordered by the number of place available
2092-
*/
2093-
$sql = "SELECT g.id gid, count(ug.user_id) count_users, g.max_student
2094-
FROM $group_table g
2095-
LEFT JOIN $group_user_table ug
2096-
ON g.iid = ug.group_id
2097-
WHERE
2098-
g.c_id = $course_id AND
2099-
ug.c_id = $course_id AND
2100-
g.iid = $groupId
2101-
GROUP BY (g.iid)";
2102-
2103-
$sql_result = Database::query($sql);
2104-
$group_available_place = array();
2105-
while ($group = Database::fetch_array($sql_result, 'ASSOC')) {
2106-
if (!empty($group['max_student'])) {
2107-
$places = intval($group['max_student'] - $group['count_users']);
2108-
} else {
2109-
$places = self::MEMBER_PER_GROUP_NO_LIMIT;
2110-
}
2111-
$group_available_place[$group['gid']] = $places;
2112-
}
2084+
$complete_user_list = CourseManager::get_real_and_linked_user_list(
2085+
$_course['code'],
2086+
true,
2087+
$session_id
2088+
);
21132089

21142090
/*
21152091
* Retrieve course users (reverse) ordered by the number

0 commit comments

Comments
 (0)