Fix subscribe_users

main/group/group_space.php

@@ -52,7 +52,7 @@ Display::display_introduction_section(TOOL_GROUP);
 if (!empty($_GET['selfReg']) &&
     GroupManager :: is_self_registration_allowed($user_id, $current_group['iid'])
 ) {
-    GroupManager :: subscribe_users($user_id, $current_group['id']);
+    GroupManager :: subscribe_users($user_id, $current_group['iid']);
     Display :: display_normal_message(get_lang('GroupNowMember'));
 }
 
@@ -62,7 +62,7 @@ if (!empty($_GET['selfReg']) &&
 if (!empty($_GET['selfUnReg']) &&
     GroupManager :: is_self_unregistration_allowed($user_id, $current_group['iid'])
 ) {
-    GroupManager :: unsubscribe_users($user_id, $current_group['iid']);
+    GroupManager::unsubscribe_users($user_id, $current_group['iid']);
     Display::display_normal_message(get_lang('StudentDeletesHimself'));
 }
 

main/group/member_settings.php

@@ -194,10 +194,11 @@ if ($form->validate()) {
 
     // Storing the users (we first remove all users and then add only those who were selected)
     GroupManager:: unsubscribe_all_users($current_group['iid']);
-    if (isset ($_POST['group_members']) && count($_POST['group_members']) > 0) {
+
+    if (isset($_POST['group_members']) && count($_POST['group_members']) > 0) {
         GroupManager:: subscribe_users(
             $values['group_members'],
-            $current_group['id']
+            $current_group['iid']
         );
     }
 

main/inc/lib/groupmanager.lib.php

@@ -1638,14 +1638,19 @@ class GroupManager
      */
     public static function unsubscribe_all_users($groupId)
     {
-        $course_id = api_get_course_int_id();
+        $courseId = api_get_course_int_id();
         //api_is_element_in_the_session(TOOL_GROUP, $group_ids[$i])
 
+        $groupId = (int) $groupId;
+        if (empty($courseId) || empty($groupId)) {
+            return false;
+        }
+
         $table_group_user = Database :: get_course_table(TABLE_GROUP_USER);
         $sql = "DELETE FROM $table_group_user
                 WHERE 
                     group_id = $groupId AND 
-                    c_id = $course_id";
+                    c_id = $courseId";
         $result = Database::query($sql);
 
         return $result;
@@ -1660,13 +1665,17 @@ class GroupManager
      */
     public static function unsubscribe_all_tutors($groupId)
     {
-        $course_id = api_get_course_int_id();
+        $courseId = api_get_course_int_id();
         $groupId = (int) $groupId;
 
+        if (empty($courseId) || empty($groupId)) {
+            return false;
+        }
+
         if (!empty($groupId) > 0) {
             $table_group_tutor = Database :: get_course_table(TABLE_GROUP_TUTOR);
             $sql = "DELETE FROM $table_group_tutor
-                    WHERE group_id = $groupId AND c_id = $course_id";
+                    WHERE group_id = $groupId AND c_id = $courseId";
             $result = Database::query($sql);
             return $result;
         }