Browse Source

Minor - format code

jmontoyaa 6 years ago
parent
commit
e6d2098bdb
3 changed files with 10 additions and 6 deletions
  1. 2 2
      main/group/group.php
  2. 1 1
      main/inc/lib/course.lib.php
  3. 7 3
      main/inc/lib/groupmanager.lib.php

+ 2 - 2
main/group/group.php

@@ -105,7 +105,7 @@ if (api_is_allowed_to_edit(false, true)) {
                 if (is_array($_POST['group'])) {
                     foreach ($_POST['group'] as $myGroupId) {
                         $groupInfo = GroupManager::get_group_properties($myGroupId);
-                        GroupManager::delete_groups($groupInfo);
+                        GroupManager::deleteGroup($groupInfo);
                     }
 
                     Display::addFlash(Display::return_message(get_lang('SelectedGroupsDeleted')));
@@ -150,7 +150,7 @@ if (api_is_allowed_to_edit(false, true)) {
                 break;
             case 'delete_one':
                 $groupInfo = GroupManager::get_group_properties($my_get_id);
-                GroupManager::delete_groups($groupInfo);
+                GroupManager::deleteGroup($groupInfo);
                 Display::addFlash(Display::return_message(get_lang('GroupDel')));
                 header("Location: $currentUrl");
                 exit;

+ 1 - 1
main/inc/lib/course.lib.php

@@ -2228,7 +2228,7 @@ class CourseManager
             $groups = GroupManager::get_groups($courseId);
             if (!empty($groups)) {
                 foreach ($groups as $group) {
-                    GroupManager::delete_groups($group, $course['code']);
+                    GroupManager::deleteGroup($group, $course['code']);
                 }
             }
 

+ 7 - 3
main/inc/lib/groupmanager.lib.php

@@ -428,12 +428,16 @@ class GroupManager
      *
      * @return int - number of groups deleted
      */
-    public static function delete_groups($groupInfo, $course_code = null)
+    public static function deleteGroup($groupInfo, $course_code = null)
     {
         if (empty($groupInfo['iid'])) {
             return false;
         }
         $course_info = api_get_course_info($course_code);
+        if (empty($course_info)) {
+            return false;
+        }
+
         $course_id = $course_info['real_id'];
 
         // Database table definitions
@@ -874,7 +878,7 @@ class GroupManager
             while ($group = Database::fetch_object($res)) {
                 // Delete all groups in category
                 /*$groupInfo = self::get_group_properties($group->iid, true);
-                self::delete_groups($groupInfo, $course_code);
+                self::deleteGroup($groupInfo, $course_code);
                 */
                 // Set the category to NULL to avoid losing groups in sessions.
                 $sql = "UPDATE $table_group SET category_id = NULL WHERE iid = ".$group->iid;
@@ -2689,7 +2693,7 @@ class GroupManager
             $groups = self::get_groups();
             foreach ($groups as $group) {
                 if (!in_array($group['iid'], $elementsFound['groups'])) {
-                    self::delete_groups($group);
+                    self::deleteGroup($group);
                     $group['group'] = $group['name'];
                     $result['deleted']['group'][] = $group;
                 }