Skip to content

Commit e6d2098

Browse files
committed
Minor - format code
1 parent f0e07b5 commit e6d2098

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

main/group/group.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
if (is_array($_POST['group'])) {
106106
foreach ($_POST['group'] as $myGroupId) {
107107
$groupInfo = GroupManager::get_group_properties($myGroupId);
108-
GroupManager::delete_groups($groupInfo);
108+
GroupManager::deleteGroup($groupInfo);
109109
}
110110

111111
Display::addFlash(Display::return_message(get_lang('SelectedGroupsDeleted')));
@@ -150,7 +150,7 @@
150150
break;
151151
case 'delete_one':
152152
$groupInfo = GroupManager::get_group_properties($my_get_id);
153-
GroupManager::delete_groups($groupInfo);
153+
GroupManager::deleteGroup($groupInfo);
154154
Display::addFlash(Display::return_message(get_lang('GroupDel')));
155155
header("Location: $currentUrl");
156156
exit;

main/inc/lib/course.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2228,7 +2228,7 @@ public static function delete_course($code)
22282228
$groups = GroupManager::get_groups($courseId);
22292229
if (!empty($groups)) {
22302230
foreach ($groups as $group) {
2231-
GroupManager::delete_groups($group, $course['code']);
2231+
GroupManager::deleteGroup($group, $course['code']);
22322232
}
22332233
}
22342234

main/inc/lib/groupmanager.lib.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,16 @@ public static function create_class_groups($category_id)
428428
*
429429
* @return int - number of groups deleted
430430
*/
431-
public static function delete_groups($groupInfo, $course_code = null)
431+
public static function deleteGroup($groupInfo, $course_code = null)
432432
{
433433
if (empty($groupInfo['iid'])) {
434434
return false;
435435
}
436436
$course_info = api_get_course_info($course_code);
437+
if (empty($course_info)) {
438+
return false;
439+
}
440+
437441
$course_id = $course_info['real_id'];
438442

439443
// Database table definitions
@@ -874,7 +878,7 @@ public static function delete_category($cat_id, $course_code = '')
874878
while ($group = Database::fetch_object($res)) {
875879
// Delete all groups in category
876880
/*$groupInfo = self::get_group_properties($group->iid, true);
877-
self::delete_groups($groupInfo, $course_code);
881+
self::deleteGroup($groupInfo, $course_code);
878882
*/
879883
// Set the category to NULL to avoid losing groups in sessions.
880884
$sql = "UPDATE $table_group SET category_id = NULL WHERE iid = ".$group->iid;
@@ -2689,7 +2693,7 @@ public static function importCategoriesAndGroupsFromArray(
26892693
$groups = self::get_groups();
26902694
foreach ($groups as $group) {
26912695
if (!in_array($group['iid'], $elementsFound['groups'])) {
2692-
self::delete_groups($group);
2696+
self::deleteGroup($group);
26932697
$group['group'] = $group['name'];
26942698
$result['deleted']['group'][] = $group;
26952699
}

0 commit comments

Comments
 (0)