From 5df045cb4fc54334f850426cbb4e952be5ee31e3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 7 Jun 2021 14:20:39 +0200
Subject: [PATCH] Usergroup fixes

- Rename UserGroup() class to UserGroupModel() int order to avoid
  conflicts with the Usergroup entity
- Move SOCIAL_CLASS, NORMAL_CLASS inside the Usergroup entity
---
 .../admin/access_url_add_usergroup_to_url.php |  2 +-
 .../access_url_edit_usergroup_to_url.php      |  2 +-
 public/main/admin/access_urls.php             |  2 +-
 .../main/admin/add_courses_to_usergroup.php   |  2 +-
 .../main/admin/add_sessions_to_usergroup.php  |  2 +-
 public/main/admin/add_users_to_usergroup.php  |  6 ++-
 public/main/admin/course_list.php             |  4 ++
 public/main/admin/system_announcements.php    |  2 +-
 public/main/admin/user_import.php             |  4 +-
 public/main/admin/user_list.php               |  2 +-
 public/main/admin/user_update_import.php      |  4 +-
 public/main/admin/usergroup_export.php        |  2 +-
 public/main/admin/usergroup_import.php        |  6 +--
 public/main/admin/usergroup_user_import.php   |  6 +--
 public/main/admin/usergroup_users.php         |  6 +--
 public/main/admin/usergroups.php              |  2 +-
 public/main/dropbox/dropbox_functions.inc.php |  2 +-
 public/main/extra/myStudents.php              |  2 +-
 public/main/gradebook/certificate_report.php  |  2 +-
 .../gradebook_display_certificate.php         |  2 +-
 public/main/group/group_creation.php          |  2 +-
 public/main/group/member_settings.php         |  2 +-
 public/main/group/tutor_settings.php          |  2 +-
 public/main/inc/ajax/gradebook.ajax.php       |  2 +-
 public/main/inc/ajax/message.ajax.php         |  2 +-
 public/main/inc/ajax/model.ajax.php           | 10 ++---
 public/main/inc/ajax/social.ajax.php          |  2 +-
 public/main/inc/ajax/usergroup.ajax.php       |  4 +-
 public/main/inc/lib/course.lib.php            |  2 +-
 public/main/inc/lib/groupmanager.lib.php      |  2 +-
 public/main/inc/lib/message.lib.php           |  2 +-
 public/main/inc/lib/sessionmanager.lib.php    |  4 +-
 public/main/inc/lib/social.lib.php            | 10 ++---
 .../main/inc/lib/system_announcements.lib.php |  4 +-
 public/main/inc/lib/tracking.lib.php          |  2 +-
 public/main/inc/lib/usergroup.lib.php         | 39 ++++++++-----------
 public/main/inc/lib/usermanager.lib.php       | 14 ++-----
 public/main/inc/lib/userportal.lib.php        |  4 +-
 public/main/lp/lp_report.php                  |  2 +-
 public/main/lp/lp_subscribe_users.php         |  2 +-
 .../lp/lp_subscribe_users_to_category.php     |  2 +-
 public/main/messages/new_message.php          |  2 +-
 public/main/mySpace/myStudents.php            |  2 +-
 public/main/social/group_add.php              |  9 +++--
 public/main/social/group_edit.php             |  7 ++--
 public/main/social/group_invitation.php       |  2 +-
 public/main/social/group_members.php          |  2 +-
 public/main/social/group_topics.php           |  2 +-
 public/main/social/group_view.php             |  2 +-
 public/main/social/group_waiting_list.php     |  2 +-
 public/main/social/groups.php                 |  2 +-
 public/main/social/home.php                   |  2 +-
 public/main/social/invitations.php            |  2 +-
 .../social/message_for_group_form.inc.php     |  2 +-
 .../social/profile_friends_and_groups.inc.php |  2 +-
 public/main/social/search.php                 |  2 +-
 public/main/survey/survey.lib.php             |  2 +-
 public/main/survey/survey_list.php            |  2 +-
 public/main/tracking/courseLog.php            |  2 +-
 public/main/user/class.php                    |  2 +-
 public/main/user/classes.php                  |  2 +-
 public/main/webservices/registration.soap.php | 16 ++++----
 62 files changed, 121 insertions(+), 124 deletions(-)

diff --git a/public/main/admin/access_url_add_usergroup_to_url.php b/public/main/admin/access_url_add_usergroup_to_url.php
index 36de8113dc..2daa13b2cd 100644
--- a/public/main/admin/access_url_add_usergroup_to_url.php
+++ b/public/main/admin/access_url_add_usergroup_to_url.php
@@ -17,7 +17,7 @@ if (!api_get_multiple_access_url()) {
     exit;
 }
 
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 $firstLetterUserGroup = null;
 $courses = [];
 $url_list = [];
diff --git a/public/main/admin/access_url_edit_usergroup_to_url.php b/public/main/admin/access_url_edit_usergroup_to_url.php
index e10a182bed..9f790f23c2 100644
--- a/public/main/admin/access_url_edit_usergroup_to_url.php
+++ b/public/main/admin/access_url_edit_usergroup_to_url.php
@@ -11,7 +11,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 $xajax = new xajax();
 $xajax->registerFunction(['searchUserGroupAjax', 'UserGroup', 'searchUserGroupAjax']);
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 
 // Setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/public/main/admin/access_urls.php b/public/main/admin/access_urls.php
index e787e9c75b..e8df0cfde3 100644
--- a/public/main/admin/access_urls.php
+++ b/public/main/admin/access_urls.php
@@ -127,7 +127,7 @@ $actions .= Display::url(
     api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php'
 );
 
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 if ($userGroup->getUseMultipleUrl()) {
     $actions .= Display::url(
         Display::return_icon('class.png', get_lang('Manage user groups'), [], ICON_SIZE_MEDIUM),
diff --git a/public/main/admin/add_courses_to_usergroup.php b/public/main/admin/add_courses_to_usergroup.php
index 3798b10f67..51d4b7dbf8 100644
--- a/public/main/admin/add_courses_to_usergroup.php
+++ b/public/main/admin/add_courses_to_usergroup.php
@@ -8,7 +8,7 @@ $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
 $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $data = $usergroup->get($id);
 $usergroup->protectScript($data);
 
diff --git a/public/main/admin/add_sessions_to_usergroup.php b/public/main/admin/add_sessions_to_usergroup.php
index bb948f9e61..17b39488d1 100644
--- a/public/main/admin/add_sessions_to_usergroup.php
+++ b/public/main/admin/add_sessions_to_usergroup.php
@@ -8,7 +8,7 @@ $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
 $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $data = $usergroup->get($id);
 $usergroup->protectScript($data);
 
diff --git a/public/main/admin/add_users_to_usergroup.php b/public/main/admin/add_users_to_usergroup.php
index 85389e3555..eab34356f9 100644
--- a/public/main/admin/add_users_to_usergroup.php
+++ b/public/main/admin/add_users_to_usergroup.php
@@ -3,6 +3,8 @@
 /* For licensing terms, see /license.txt */
 
 // resetting the course id
+use Chamilo\CoreBundle\Entity\Usergroup;
+
 $cidReset = true;
 
 // including some necessary files
@@ -13,7 +15,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 $relation = isset($_REQUEST['relation']) ? (int) $_REQUEST['relation'] : '';
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $groupInfo = $usergroup->get($id);
 $usergroup->protectScript($groupInfo);
 
@@ -380,7 +382,7 @@ echo Display::input('hidden', 'add_type', null);
 ?>
 <div class="row">
     <div class="col-md-5">
-        <?php if (UserGroup::SOCIAL_CLASS == $data['group_type']) {
+        <?php if (Usergroup::SOCIAL_CLASS == $data['group_type']) {
     ?>
         <select name="relation" id="relation">
             <option value=""><?php echo get_lang('Relation type selection'); ?></option>
diff --git a/public/main/admin/course_list.php b/public/main/admin/course_list.php
index 6c9ad37ba5..5566098140 100644
--- a/public/main/admin/course_list.php
+++ b/public/main/admin/course_list.php
@@ -6,12 +6,16 @@
  * This script shows a list of courses and allows searching for courses codes
  * and names.
  */
+
+use Symfony\Component\Intl\Languages;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 $sessionId = isset($_GET['session_id']) ? $_GET['session_id'] : null;
 
+
 /**
  * Get the number of courses which will be displayed.
  *
diff --git a/public/main/admin/system_announcements.php b/public/main/admin/system_announcements.php
index e1603d4bb1..37eaa7896c 100644
--- a/public/main/admin/system_announcements.php
+++ b/public/main/admin/system_announcements.php
@@ -289,7 +289,7 @@ if ($action_todo) {
 
     $form->addGroup($group, null, get_lang('Visible'));
     $form->addElement('hidden', 'id');
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $group_list = $userGroup->get_all();
 
     if (!empty($group_list)) {
diff --git a/public/main/admin/user_import.php b/public/main/admin/user_import.php
index d360ea7205..296aff5b6b 100644
--- a/public/main/admin/user_import.php
+++ b/public/main/admin/user_import.php
@@ -37,7 +37,7 @@ function validate_data($users, $checkUniqueEmail = false)
     }
 
     $classExistList = [];
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     foreach ($users as &$user) {
         $user['has_error'] = false;
         $user['message'] = '';
@@ -216,7 +216,7 @@ function save_data($users, $sendMail = false)
         $inserted_in_course = [];
     }
 
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     if (is_array($users)) {
         $efo = new ExtraFieldOption('user');
 
diff --git a/public/main/admin/user_list.php b/public/main/admin/user_list.php
index 5b4ebef871..7dc0bf06cc 100644
--- a/public/main/admin/user_list.php
+++ b/public/main/admin/user_list.php
@@ -1073,7 +1073,7 @@ $form->addText('keyword_officialcode', get_lang('Code'), false);
 $classId = isset($_REQUEST['class_id']) && !empty($_REQUEST['class_id']) ? (int) $_REQUEST['class_id'] : 0;
 $options = [];
 if ($classId) {
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $groupInfo = $userGroup->get($classId);
     if ($groupInfo) {
         $options = [$classId => $groupInfo['name']];
diff --git a/public/main/admin/user_update_import.php b/public/main/admin/user_update_import.php
index 656731f744..c60c767497 100644
--- a/public/main/admin/user_update_import.php
+++ b/public/main/admin/user_update_import.php
@@ -25,7 +25,7 @@ function validate_data($users)
     $errors = [];
     $usernames = [];
     $classExistList = [];
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
 
     foreach ($users as $user) {
         // 2. Check username, first, check whether it is empty.
@@ -93,7 +93,7 @@ function updateUsers(
     $resetPassword = false,
     $sendEmail = false)
 {
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     if (is_array($users)) {
         foreach ($users as $user) {
             if (isset($user['Status'])) {
diff --git a/public/main/admin/usergroup_export.php b/public/main/admin/usergroup_export.php
index 09b149469e..5d96a0e7e0 100644
--- a/public/main/admin/usergroup_export.php
+++ b/public/main/admin/usergroup_export.php
@@ -6,7 +6,7 @@ $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 $userGroup->protectScript();
 
 $tool_name = get_lang('Export');
diff --git a/public/main/admin/usergroup_import.php b/public/main/admin/usergroup_import.php
index 695d156c04..eb528c64df 100644
--- a/public/main/admin/usergroup_import.php
+++ b/public/main/admin/usergroup_import.php
@@ -13,7 +13,7 @@
 function validate_data($classes)
 {
     $errors = [];
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     foreach ($classes as $index => $class) {
         // 1. Check of class name is available.
         if (!isset($class['name']) || 0 == strlen(trim($class['name']))) {
@@ -44,7 +44,7 @@ function validate_data($classes)
 function save_data($classes)
 {
     $count = 0;
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     foreach ($classes as $index => $class) {
         $usersToAdd = isset($class['users']) ? $class['users'] : null;
         unset($class['users']);
@@ -80,7 +80,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 // Setting the section (for the tabs).
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $usergroup->protectScript();
 
 // setting breadcrumbs
diff --git a/public/main/admin/usergroup_user_import.php b/public/main/admin/usergroup_user_import.php
index ed30c9824e..f7614b332b 100644
--- a/public/main/admin/usergroup_user_import.php
+++ b/public/main/admin/usergroup_user_import.php
@@ -15,7 +15,7 @@ function validate_data($user_classes)
     global $purification_option_for_usernames;
     $errors = [];
     $classcodes = [];
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
 
     foreach ($user_classes as $index => $user_class) {
         $user_class['line'] = $index + 1;
@@ -72,7 +72,7 @@ function save_data($users_classes, $deleteUsersNotInList = false)
     global $purification_option_for_usernames;
     // Table definitions.
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
-    $usergroup = new UserGroup();
+    $usergroup = new UserGroupModel();
     // Data parsing: purification + conversion (UserName, ClassName) --> (user_is, class_id)
     $csv_data = [];
     if (!empty($users_classes)) {
@@ -131,7 +131,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $usergroup->protectScript();
 
 $tool_name = get_lang('Add users to a class').' CSV';
diff --git a/public/main/admin/usergroup_users.php b/public/main/admin/usergroup_users.php
index ff2a5c82d8..c0c17ade7a 100644
--- a/public/main/admin/usergroup_users.php
+++ b/public/main/admin/usergroup_users.php
@@ -8,7 +8,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $userGroupInfo = $usergroup->get($id);
 if (empty($userGroupInfo)) {
     api_not_allowed(true);
@@ -232,8 +232,8 @@ function action_formatter(cellvalue, options, rowObject) {
 function extra_formatter(cellvalue, options, rowObject) {
     var calendarName = rowObject[1];
     var calendarId = rowObject[7];
-    
-    if (calendarName == "") {          
+
+    if (calendarName == "") {
         return \'<a href="'.
         api_get_path(WEB_CODE_PATH).'admin/usergroup_users.php?user_id=\'+options.rowId+\'&id='.$id.'&action=add_calendar&width=700" class="btn btn-primary ajax">'.get_lang('Add').'</a>\';
     } else {
diff --git a/public/main/admin/usergroups.php b/public/main/admin/usergroups.php
index 3cac094f6e..0f2a816896 100644
--- a/public/main/admin/usergroups.php
+++ b/public/main/admin/usergroups.php
@@ -10,7 +10,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $usergroup->protectScript();
 
 // Add the JS needed to use the jqgrid
diff --git a/public/main/dropbox/dropbox_functions.inc.php b/public/main/dropbox/dropbox_functions.inc.php
index 8c02c905f7..2eadfa8d8a 100644
--- a/public/main/dropbox/dropbox_functions.inc.php
+++ b/public/main/dropbox/dropbox_functions.inc.php
@@ -652,7 +652,7 @@ function display_add_form($viewReceivedCategory, $viewSentCategory, $view, $id =
     $current_user_id = '';
     $allowStudentToStudent = api_get_setting('dropbox_allow_student_to_student');
     $options = [];
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     foreach ($complete_user_list_for_dropbox as $current_user) {
         if ((
             $dropbox_person->isCourseTutor
diff --git a/public/main/extra/myStudents.php b/public/main/extra/myStudents.php
index a1bcb81e54..ec9d939c80 100644
--- a/public/main/extra/myStudents.php
+++ b/public/main/extra/myStudents.php
@@ -479,7 +479,7 @@ if (!empty($studentId)) {
     echo Display::page_subheader($table_title);
 
     $userPicture = UserManager::getUserPicture($user_info['user_id']);
-    $userGroupManager = new UserGroup();
+    $userGroupManager = new UserGroupModel();
     $userGroups = $userGroupManager->getNameListByUser($user_info['user_id'], UserGroup::NORMAL_CLASS); ?>
     <img src="<?php echo $userPicture; ?>">
     <div class="row">
diff --git a/public/main/gradebook/certificate_report.php b/public/main/gradebook/certificate_report.php
index 6e1cfb72a3..ebd99552ba 100644
--- a/public/main/gradebook/certificate_report.php
+++ b/public/main/gradebook/certificate_report.php
@@ -35,7 +35,7 @@ $userId = api_get_user_id();
 $sessions = $courses = $months = $students = [0 => get_lang('Select')];
 $userList = [];
 if (api_is_student_boss()) {
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $userList = $userGroup->getGroupUsersByUser($userId);
     $sessionsList = SessionManager::getSessionsFollowedForGroupAdmin($userId);
 } else {
diff --git a/public/main/gradebook/gradebook_display_certificate.php b/public/main/gradebook/gradebook_display_certificate.php
index ed34949dfa..bad0657ab8 100644
--- a/public/main/gradebook/gradebook_display_certificate.php
+++ b/public/main/gradebook/gradebook_display_certificate.php
@@ -142,7 +142,7 @@ switch ($action) {
                 'customcertificate/src/print_certificate.php?export_all_in_one=1&'.$params;
         } else {
             if (api_is_student_boss()) {
-                $userGroup = new UserGroup();
+                $userGroup = new UserGroupModel();
                 $userList = $userGroup->getGroupUsersByUser(api_get_user_id());
             } else {
                 $userList = [];
diff --git a/public/main/group/group_creation.php b/public/main/group/group_creation.php
index 2a33f98cb9..4133e35329 100644
--- a/public/main/group/group_creation.php
+++ b/public/main/group/group_creation.php
@@ -303,7 +303,7 @@ EOT;
      * Show form to generate groups from classes subscribed to the course
      */
     $options['where'] = [' usergroup.course_id = ? ' => api_get_course_int_id()];
-    $obj = new UserGroup();
+    $obj = new UserGroupModel();
     $classes = $obj->getUserGroupInCourse($options);
     if (count($classes) > 0) {
         $description = '<p>'.get_lang('Using this option, you can create groups based on the classes subscribed to your course.').'</p>';
diff --git a/public/main/group/member_settings.php b/public/main/group/member_settings.php
index b031408c4f..72c5b44f93 100644
--- a/public/main/group/member_settings.php
+++ b/public/main/group/member_settings.php
@@ -118,7 +118,7 @@ if ($subscribedTutors) {
 
 $orderUserListByOfficialCode = api_get_setting('order_user_list_by_official_code');
 $possible_users = [];
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 
 if (!empty($complete_user_list)) {
     usort($complete_user_list, 'sort_users');
diff --git a/public/main/group/tutor_settings.php b/public/main/group/tutor_settings.php
index 150762b7a8..297cc0939f 100644
--- a/public/main/group/tutor_settings.php
+++ b/public/main/group/tutor_settings.php
@@ -101,7 +101,7 @@ $complete_user_list = CourseManager::get_user_list_from_course_code(
 );
 
 $possible_users = [];
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 
 $subscribedUsers = GroupManager::get_subscribed_users($groupEntity);
 if ($subscribedUsers) {
diff --git a/public/main/inc/ajax/gradebook.ajax.php b/public/main/inc/ajax/gradebook.ajax.php
index 0e06e6cb06..8007db6b48 100644
--- a/public/main/inc/ajax/gradebook.ajax.php
+++ b/public/main/inc/ajax/gradebook.ajax.php
@@ -58,7 +58,7 @@ switch ($action) {
         $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
 
         if (api_is_student_boss()) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $userList = $userGroup->getGroupUsersByUser(api_get_user_id());
         } else {
             $userList = [];
diff --git a/public/main/inc/ajax/message.ajax.php b/public/main/inc/ajax/message.ajax.php
index d36a08f00b..3225b25c1a 100644
--- a/public/main/inc/ajax/message.ajax.php
+++ b/public/main/inc/ajax/message.ajax.php
@@ -72,7 +72,7 @@ switch ($action) {
             $number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(
                 $userId
             );
-            $usergroup = new UserGroup();
+            $usergroup = new UserGroupModel();
             $group_pending_invitations = $usergroup->get_groups_by_user(
                 $userId,
                 GROUP_USER_PERMISSION_PENDING_INVITATION,
diff --git a/public/main/inc/ajax/model.ajax.php b/public/main/inc/ajax/model.ajax.php
index cad55d0ee5..efc8163ad6 100644
--- a/public/main/inc/ajax/model.ajax.php
+++ b/public/main/inc/ajax/model.ajax.php
@@ -304,7 +304,7 @@ switch ($action) {
         $count = $calendarPlugin->getUsersPerCalendarCount($id);
         break;
     case 'get_usergroups_users':
-        $usergroup = new UserGroup();
+        $usergroup = new UserGroupModel();
         $usergroup->protectScript(null, true, true);
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
         $count = $usergroup->getUserGroupUsers($id, true);
@@ -475,7 +475,7 @@ switch ($action) {
         }
 
         if ($searchByGroups) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $userIdList = array_merge(
                 $userIdList,
                 $userGroup->getGroupUsersByUser(api_get_user_id())
@@ -922,12 +922,12 @@ switch ($action) {
         $count = $obj->get_count();
         break;
     case 'get_usergroups':
-        $obj = new UserGroup();
+        $obj = new UserGroupModel();
         $obj->protectScript();
         $count = $obj->get_count($whereCondition);
         break;
     case 'get_usergroups_teacher':
-        $obj = new UserGroup();
+        $obj = new UserGroupModel();
         $obj->protectScript(null, false, true);
         $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'registered';
         $groupFilter = isset($_REQUEST['group_filter']) ? (int) $_REQUEST['group_filter'] : 0;
@@ -1279,7 +1279,7 @@ switch ($action) {
         $result = array_merge($sessions, $courses);
 
         if (api_is_student_boss()) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             foreach ($result as &$item) {
                 $userGroups = $userGroup->get_groups_by_user($item['user_id']);
                 $item['group'] = implode(", ", array_column($userGroups, 'name'));
diff --git a/public/main/inc/ajax/social.ajax.php b/public/main/inc/ajax/social.ajax.php
index b55a52883b..4ba74e44b1 100644
--- a/public/main/inc/ajax/social.ajax.php
+++ b/public/main/inc/ajax/social.ajax.php
@@ -367,7 +367,7 @@ switch ($action) {
         }
 
         if (!empty($message->getGroupId())) {
-            $usergroup = new UserGroup();
+            $usergroup = new UserGroupModel();
             $groupInfo = $usergroup->get($groupId);
 
             if (empty($groupInfo)) {
diff --git a/public/main/inc/ajax/usergroup.ajax.php b/public/main/inc/ajax/usergroup.ajax.php
index 3f16c14b90..6ed36b7ccf 100644
--- a/public/main/inc/ajax/usergroup.ajax.php
+++ b/public/main/inc/ajax/usergroup.ajax.php
@@ -14,7 +14,7 @@ switch ($action) {
     case 'get_class_by_keyword':
         $keyword = isset($_REQUEST['q']) ? $_REQUEST['q'] : '';
         if (api_is_platform_admin() && !empty($keyword)) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $where = ['where' => ['name like ?' => "%$keyword%"], 'order' => 'name '];
             $items = [];
             $list = $userGroup->get_all($where);
@@ -29,7 +29,7 @@ switch ($action) {
         break;
     case 'delete_user_in_usergroup':
         if ($isAllowedToEdit) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $userId = isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
             $userIdList = explode(',', $userId);
             $groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : 0;
diff --git a/public/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php
index b82c21eefe..9cdf650980 100644
--- a/public/main/inc/lib/course.lib.php
+++ b/public/main/inc/lib/course.lib.php
@@ -6083,7 +6083,7 @@ class CourseManager
         $coursesList = [];
         $courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
         $courseUserTable = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         $userIdList = $userGroup->getGroupUsersByUser($userId);
 
         if (empty($userIdList)) {
diff --git a/public/main/inc/lib/groupmanager.lib.php b/public/main/inc/lib/groupmanager.lib.php
index 08469cfdfe..279464678e 100644
--- a/public/main/inc/lib/groupmanager.lib.php
+++ b/public/main/inc/lib/groupmanager.lib.php
@@ -405,7 +405,7 @@ class GroupManager
     public static function create_class_groups($categoryId)
     {
         $options['where'] = [' usergroup.course_id = ? ' => api_get_course_int_id()];
-        $obj = new UserGroup();
+        $obj = new UserGroupModel();
         $classes = $obj->getUserGroupInCourse($options);
         $group_ids = [];
 
diff --git a/public/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php
index f5a098bd3f..20b372b5b9 100644
--- a/public/main/inc/lib/message.lib.php
+++ b/public/main/inc/lib/message.lib.php
@@ -724,7 +724,7 @@ class MessageManager
                         $forceTitleWhenSendingEmail
                     );
                 } else {
-                    $usergroup = new UserGroup();
+                    $usergroup = new UserGroupModel();
                     $group_info = $usergroup->get($group_id);
                     $group_info['topic_id'] = $topic_id;
                     $group_info['msg_id'] = $messageId;
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
index cd4baff1a5..645f194bd7 100644
--- a/public/main/inc/lib/sessionmanager.lib.php
+++ b/public/main/inc/lib/sessionmanager.lib.php
@@ -7683,7 +7683,7 @@ class SessionManager
         $sessionList = [];
         $sessionTable = Database::get_main_table(TABLE_MAIN_SESSION);
         $sessionUserTable = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         $userIdList = $userGroup->getGroupUsersByUser($userId);
 
         if (empty($userIdList)) {
@@ -9772,7 +9772,7 @@ class SessionManager
             return;
         }
 
-        $usergroup = new UserGroup();
+        $usergroup = new UserGroupModel();
 
         foreach ($classesNames as $className) {
             if (empty($className)) {
diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php
index 25d48fe14b..f611c32137 100644
--- a/public/main/inc/lib/social.lib.php
+++ b/public/main/inc/lib/social.lib.php
@@ -756,7 +756,7 @@ class SocialManager extends UserManager
 
         if (in_array($show, $show_groups) && !empty($group_id)) {
             // Group image
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $group_info = $userGroup->get($group_id);
             $userGroupImage = $userGroup->get_picture_group(
                 $group_id,
@@ -828,7 +828,7 @@ class SocialManager extends UserManager
             $user_id = api_get_user_id();
         }
 
-        $usergroup = new UserGroup();
+        $usergroup = new UserGroupModel();
         $show_groups = [
             'groups',
             'group_messages',
@@ -1677,7 +1677,7 @@ class SocialManager extends UserManager
                 $repo = $em->getRepository(CForumPost::class);
                 $repoThread = $em->getRepository(CForumThread::class);
                 $groups = [];
-                $userGroup = new UserGroup();
+                $userGroup = new UserGroupModel();
                 $urlGroup = api_get_path(WEB_CODE_PATH).'social/group_view.php?id=';
                 while ($row = Database::fetch_array($res, 'ASSOC')) {
                     $row['group_info'] = [];
@@ -2355,7 +2355,7 @@ class SocialManager extends UserManager
      */
     public static function getMyWallMessages($userId, $start = 0, $length = 10, $threadList = [])
     {
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         $groups = $userGroup->get_groups_by_user($userId, [GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_ADMIN]);
         $groupList = [];
         if (!empty($groups)) {
@@ -3004,7 +3004,7 @@ class SocialManager extends UserManager
     public static function getGroupBlock($userId)
     {
         $threadList = self::getThreadList($userId);
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
 
         $forumCourseId = api_get_configuration_value('global_forums_course_id');
         $courseInfo = null;
diff --git a/public/main/inc/lib/system_announcements.lib.php b/public/main/inc/lib/system_announcements.lib.php
index a27768fddb..acbcd7319e 100644
--- a/public/main/inc/lib/system_announcements.lib.php
+++ b/public/main/inc/lib/system_announcements.lib.php
@@ -57,7 +57,7 @@ class SystemAnnouncementManager
         $user_selected_language = api_get_interface_language();
         $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
         $tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
 
         $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = [];
@@ -142,7 +142,7 @@ class SystemAnnouncementManager
     ) {
         $user_selected_language = api_get_interface_language();
         $start = (int) $start;
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         $tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
         $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = [];
diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php
index 46627c3596..0c69e66c7e 100644
--- a/public/main/inc/lib/tracking.lib.php
+++ b/public/main/inc/lib/tracking.lib.php
@@ -8935,7 +8935,7 @@ class TrackingCourseLog
             $user_row['count_assignments'] = $user['count_assignments'];
             $user_row['count_messages'] = $user['count_messages'];
 
-            $userGroupManager = new UserGroup();
+            $userGroupManager = new UserGroupModel();
             $user_row['classes'] = $userGroupManager->getLabelsFromNameList($user['user_id'], UserGroup::NORMAL_CLASS);
 
             if (empty($session_id)) {
diff --git a/public/main/inc/lib/usergroup.lib.php b/public/main/inc/lib/usergroup.lib.php
index eafce60830..1b6764d848 100644
--- a/public/main/inc/lib/usergroup.lib.php
+++ b/public/main/inc/lib/usergroup.lib.php
@@ -3,7 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\ResourceFile;
-use Chamilo\CoreBundle\Entity\Usergroup as UserGroupEntity;
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Framework\Container;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -13,10 +13,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
  * This class provides methods for the UserGroup management.
  * Include/require it in your code to use its features.
  */
-class UserGroup extends Model
+class UserGroupModel extends Model
 {
-    public const SOCIAL_CLASS = 1;
-    public const NORMAL_CLASS = 0;
     public $columns = [
         'id',
         'name',
@@ -452,7 +450,7 @@ class UserGroup extends Model
      * <?php
      *
      * $options['where'] = [' usergroup.course_id = ? ' => $course_id];
-     * $obj = new UserGroup();
+     * $obj = new UserGroupModel();
      * $count = $obj->getUserGroupInCourse(
      * $options,
      * -1,
@@ -469,7 +467,7 @@ class UserGroup extends Model
      * <?php
      *
      * $options['where'] = [' usergroup.course_id = ? ' => $course_id];
-     * $obj = new UserGroup();
+     * $obj = new UserGroupModel();
      * $students = $obj->getUserGroupInCourse(
      * $options,
      * -1,
@@ -1524,12 +1522,12 @@ class UserGroup extends Model
     public function save($params, $showQuery = false)
     {
         $params['updated_at'] = $params['created_at'] = api_get_utc_datetime();
-        $params['group_type'] = isset($params['group_type']) ? self::SOCIAL_CLASS : self::NORMAL_CLASS;
+        $params['group_type'] = isset($params['group_type']) ? Usergroup::SOCIAL_CLASS : Usergroup::NORMAL_CLASS;
         $params['allow_members_leave_group'] = isset($params['allow_members_leave_group']) ? 1 : 0;
 
         $userGroupExists = $this->usergroup_exists(trim($params['name']));
         if (false === $userGroupExists) {
-            $userGroup = new UserGroupEntity();
+            $userGroup = new Usergroup();
             $repo = Container::getUsergroupRepository();
             $userGroup
                 ->setName(trim($params['name']))
@@ -1551,7 +1549,7 @@ class UserGroup extends Model
                     $this->subscribeToUrl($id, api_get_current_access_url_id());
                 }
 
-                if (self::SOCIAL_CLASS == $params['group_type']) {
+                if (Usergroup::SOCIAL_CLASS == $params['group_type']) {
                     $this->add_user_to_group(
                         api_get_user_id(),
                         $id,
@@ -1574,7 +1572,7 @@ class UserGroup extends Model
     public function update($params, $showQuery = false)
     {
         $repo = Container::getUsergroupRepository();
-        /** @var UserGroupEntity $userGroup */
+        /** @var Usergroup $userGroup */
         $userGroup = $repo->find($params['id']);
         if (null === $userGroup) {
             return false;
@@ -1582,7 +1580,7 @@ class UserGroup extends Model
 
         //$params['updated_on'] = api_get_utc_datetime();
         $userGroup
-            ->setGroupType(isset($params['group_type']) ? self::SOCIAL_CLASS : self::NORMAL_CLASS)
+            ->setGroupType(isset($params['group_type']) ? Usergroup::SOCIAL_CLASS : Usergroup::NORMAL_CLASS)
             ->setAllowMembersToLeaveGroup(isset($params['allow_members_leave_group']) ? 1 : 0)
         ;
         $cropImage = $params['picture_crop_result'] ?? null;
@@ -1605,7 +1603,7 @@ class UserGroup extends Model
     }
 
     public function manageFileUpload(
-        UserGroupEntity $userGroup,
+        Usergroup $userGroup,
         UploadedFile $picture,
         string $cropParameters = ''
     ): ?ResourceFile {
@@ -1763,7 +1761,7 @@ class UserGroup extends Model
      * @param FormValidator $form
      * @param string        $type
      */
-    public function setForm($form, $type = 'add', UserGroupEntity $userGroup = null)
+    public function setForm($form, $type = 'add', Usergroup $userGroup = null)
     {
         $header = '';
         switch ($type) {
@@ -1920,17 +1918,12 @@ class UserGroup extends Model
         return ['jpg', 'jpeg', 'png', 'gif'];
     }
 
-    /**
-     * @return array
-     */
-    public function getGroupStatusList()
+    public function getGroupStatusList(): array
     {
-        $status = [
+        return [
             GROUP_PERMISSION_OPEN => get_lang('Open'),
             GROUP_PERMISSION_CLOSED => get_lang('Closed'),
         ];
-
-        return $status;
     }
 
     /**
@@ -2250,7 +2243,7 @@ class UserGroup extends Model
         }
 
         $sql .= " WHERE
-				    g.group_type = ".self::SOCIAL_CLASS." AND
+				    g.group_type = ".Usergroup::SOCIAL_CLASS." AND
                     gu.user_id = $user_id
                     $relationCondition
                     $urlCondition
@@ -2290,7 +2283,7 @@ class UserGroup extends Model
         }
         // only show admins and readers
         $whereCondition = " WHERE
-                              g.group_type = ".self::SOCIAL_CLASS." AND
+                              g.group_type = ".Usergroup::SOCIAL_CLASS." AND
                               gu.relation_type IN
                               ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."', '".GROUP_USER_PERMISSION_HRM."') ";
 
@@ -2355,7 +2348,7 @@ class UserGroup extends Model
         }
 
         $where = " WHERE
-                        g.group_type = ".self::SOCIAL_CLASS." AND
+                        g.group_type = ".Usergroup::SOCIAL_CLASS." AND
                         gu.relation_type IN
                         ('".GROUP_USER_PERMISSION_ADMIN."' ,
                         '".GROUP_USER_PERMISSION_READER."',
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index 718c9f82fc..3e95e53287 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -300,8 +300,8 @@ class UserManager
             $expirationDate = new \DateTime($expirationDate, new DateTimeZone('UTC'));
         }
 
-        $user = new User();
-        $user
+        $repo = Container::getUserRepository();
+        $user = $repo->createUser()
             ->setLastname($lastName)
             ->setFirstname($firstName)
             ->setUsername($loginName)
@@ -325,12 +325,6 @@ class UserManager
             $user->setExpirationDate($expirationDate);
         }
 
-        $em = Database::getManager();
-        $repo = Container::getUserRepository();
-        $repo->updateUser($user, false);
-        $em->persist($user);
-        $em->flush();
-
         // Add user to a group
         $statusToGroup = [
             COURSEMANAGER => 'TEACHER',
@@ -349,7 +343,7 @@ class UserManager
             }
         }
 
-        $em->flush();
+        $repo->updateUser($user, true);
 
         $userId = $user->getId();
 
@@ -787,7 +781,7 @@ class UserManager
         //UrlManager::deleteUserFromAllUrls($user_id);
 
         if ('true' === api_get_setting('allow_social_tool')) {
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             //Delete user from portal groups
             $group_list = $userGroup->get_groups_by_user($user_id);
             if (!empty($group_list)) {
diff --git a/public/main/inc/lib/userportal.lib.php b/public/main/inc/lib/userportal.lib.php
index aef493780f..baa3a39a49 100644
--- a/public/main/inc/lib/userportal.lib.php
+++ b/public/main/inc/lib/userportal.lib.php
@@ -760,7 +760,7 @@ class IndexManager
 
         $items = [];
 
-        $usergroup = new UserGroup();
+        $usergroup = new UserGroupModel();
         if (api_is_platform_admin()) {
             $items[] = [
                 'link' => api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add',
@@ -836,7 +836,7 @@ class IndexManager
         }
 
         $items = [];
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         //  @todo Add a platform setting to add the user image.
         if ('true' === api_get_setting('allow_message_tool')) {
             // New messages.
diff --git a/public/main/lp/lp_report.php b/public/main/lp/lp_report.php
index 8aaf20df00..d30d4166f0 100644
--- a/public/main/lp/lp_report.php
+++ b/public/main/lp/lp_report.php
@@ -151,7 +151,7 @@ $label = get_lang('Groups');
 $classes = [];
 if ($allowUserGroups) {
     $label = get_lang('Groups').' / '.get_lang('Classes');
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $conditions = [];
     $conditions['where'] = [' usergroup.course_id = ? ' => $courseId];
     $classes = $userGroup->getUserGroupInCourse($conditions);
diff --git a/public/main/lp/lp_subscribe_users.php b/public/main/lp/lp_subscribe_users.php
index 801a2850f9..d726c46184 100644
--- a/public/main/lp/lp_subscribe_users.php
+++ b/public/main/lp/lp_subscribe_users.php
@@ -156,7 +156,7 @@ if ($allowUserGroups) {
     $formUserGroup = new FormValidator('usergroup_form', 'post', $url);
     $formUserGroup->addHidden('usergroup_form', 1);
 
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $conditions = [];
     $conditions['where'] = [' usergroup.course_id = ? ' => $courseId];
     $groups = $userGroup->getUserGroupInCourse($conditions);
diff --git a/public/main/lp/lp_subscribe_users_to_category.php b/public/main/lp/lp_subscribe_users_to_category.php
index 5970cc3579..ec52060004 100644
--- a/public/main/lp/lp_subscribe_users_to_category.php
+++ b/public/main/lp/lp_subscribe_users_to_category.php
@@ -96,7 +96,7 @@ if ($allowUserGroups) {
     $formUserGroup = new FormValidator('lp_edit', 'post', $url);
     $formUserGroup->addHidden('usergroup_form', 1);
 
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $conditions = [];
     $conditions['where'] = [' usergroup.course_id = ? ' => $courseId];
     $groups = $userGroup->getUserGroupInCourse($conditions);
diff --git a/public/main/messages/new_message.php b/public/main/messages/new_message.php
index 690be865e5..b42299c92c 100644
--- a/public/main/messages/new_message.php
+++ b/public/main/messages/new_message.php
@@ -155,7 +155,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl
             }
         }
     } else {
-        $userGroup = new UserGroup();
+        $userGroup = new UserGroupModel();
         $group_info = $userGroup->get($group_id);
 
         $form->addElement('label', get_lang('To social group'), api_xml_http_response_encode($group_info['name']));
diff --git a/public/main/mySpace/myStudents.php b/public/main/mySpace/myStudents.php
index 6c2f9c7867..1b2cda3fbb 100644
--- a/public/main/mySpace/myStudents.php
+++ b/public/main/mySpace/myStudents.php
@@ -870,7 +870,7 @@ $csv_content[] = [
 
 $coachs_name = '';
 $session_name = '';
-$userGroupManager = new UserGroup();
+$userGroupManager = new UserGroupModel();
 $userGroups = $userGroupManager->getNameListByUser(
     $studentId,
     UserGroup::NORMAL_CLASS
diff --git a/public/main/social/group_add.php b/public/main/social/group_add.php
index df1d300c16..9696f039b1 100644
--- a/public/main/social/group_add.php
+++ b/public/main/social/group_add.php
@@ -2,9 +2,12 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\Usergroup;
+
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -18,14 +21,14 @@ if ('false' === api_get_setting('allow_students_to_create_groups_in_social') &&
 }
 
 $table_message = Database::get_main_table(TABLE_MESSAGE);
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $form = new FormValidator('add_group');
-$usergroup->setGroupType($usergroup::SOCIAL_CLASS);
+$usergroup->setGroupType(Usergroup::SOCIAL_CLASS);
 $usergroup->setForm($form, 'add');
 
 if ($form->validate()) {
     $values = $form->exportValues();
-    $values['group_type'] = UserGroup::SOCIAL_CLASS;
+    $values['group_type'] = Usergroup::SOCIAL_CLASS;
     $values['relation_type'] = GROUP_USER_PERMISSION_ADMIN;
     $groupId = $usergroup->save($values);
     if ($groupId) {
diff --git a/public/main/social/group_edit.php b/public/main/social/group_edit.php
index 89916029c1..fe944507fe 100644
--- a/public/main/social/group_edit.php
+++ b/public/main/social/group_edit.php
@@ -2,6 +2,7 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Framework\Container;
 
 /**
@@ -19,7 +20,7 @@ $this_section = SECTION_SOCIAL;
 
 $group_id = isset($_GET['id']) ? (int) $_GET['id'] : (int) $_POST['id'];
 $tool_name = get_lang('Edit group');
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $group_data = $usergroup->get($group_id);
 
 if (empty($group_data)) {
@@ -38,7 +39,7 @@ if (!$usergroup->is_group_admin($group_id)) {
 // Create the form
 $form = new FormValidator('group_edit', 'post', '', '');
 $form->addElement('hidden', 'id', $group_id);
-$usergroup->setGroupType($usergroup::SOCIAL_CLASS);
+$usergroup->setGroupType(Usergroup::SOCIAL_CLASS);
 $repo = Container::getUsergroupRepository();
 $usergroup->setForm($form, 'edit', $repo->find($group_id));
 
@@ -49,7 +50,7 @@ $form->setDefaults($group_data);
 if ($form->validate()) {
     $group = $form->exportValues();
     $group['id'] = $group_id;
-    $group['group_type'] = $usergroup::SOCIAL_CLASS;
+    $group['group_type'] = Usergroup::SOCIAL_CLASS;
     $usergroup->update($group);
     Display::addFlash(Display::return_message(get_lang('Class updated.')));
     header('Location: group_view.php?id='.$group_id);
diff --git a/public/main/social/group_invitation.php b/public/main/social/group_invitation.php
index cb89f2798f..e1936486d5 100644
--- a/public/main/social/group_invitation.php
+++ b/public/main/social/group_invitation.php
@@ -24,7 +24,7 @@ $tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
 $tool_name = get_lang('Subscribe users to group');
 $group_id = intval($_REQUEST['id']);
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 
 // todo @this validation could be in a function in group_portal_manager
 if (empty($group_id)) {
diff --git a/public/main/social/group_members.php b/public/main/social/group_members.php
index ed7896e590..18a11ba15d 100644
--- a/public/main/social/group_members.php
+++ b/public/main/social/group_members.php
@@ -16,7 +16,7 @@ if ('true' != api_get_setting('allow_social_tool')) {
 
 $this_section = SECTION_SOCIAL;
 $group_id = intval($_GET['id']);
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 $user_role = '';
 
 //todo @this validation could be in a function in group_portal_manager
diff --git a/public/main/social/group_topics.php b/public/main/social/group_topics.php
index 6c59698720..2293937d86 100644
--- a/public/main/social/group_topics.php
+++ b/public/main/social/group_topics.php
@@ -18,7 +18,7 @@ $group_id = intval($_GET['id']);
 $topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : null;
 $message_id = isset($_GET['msg_id']) ? intval($_GET['msg_id']) : null;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $is_member = false;
 
 //todo @this validation could be in a function in group_portal_manager
diff --git a/public/main/social/group_view.php b/public/main/social/group_view.php
index 96ead17d5c..316cdcb5a7 100644
--- a/public/main/social/group_view.php
+++ b/public/main/social/group_view.php
@@ -106,7 +106,7 @@ $group_id = isset($_GET['id']) ? (int) $_GET['id'] : null;
 $relation_group_title = '';
 $role = 0;
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 if (0 != $group_id) {
     $groupInfo = $usergroup->get($group_id);
     $groupInfo['name'] = Security::remove_XSS($groupInfo['name']);
diff --git a/public/main/social/group_waiting_list.php b/public/main/social/group_waiting_list.php
index 34d1479684..d6d6f8ff6e 100644
--- a/public/main/social/group_waiting_list.php
+++ b/public/main/social/group_waiting_list.php
@@ -15,7 +15,7 @@ if ('true' !== api_get_setting('allow_social_tool')) {
 
 $this_section = SECTION_SOCIAL;
 $group_id = intval($_GET['id']);
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 
 //todo @this validation could be in a function in group_portal_manager
 if (empty($group_id)) {
diff --git a/public/main/social/groups.php b/public/main/social/groups.php
index dc85e41513..943e92e9aa 100644
--- a/public/main/social/groups.php
+++ b/public/main/social/groups.php
@@ -40,7 +40,7 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
 // getting group information
 $relation_group_title = '';
 $my_group_role = 0;
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $create_thread_link = '';
 
 $show_menu = 'browse_groups';
diff --git a/public/main/social/home.php b/public/main/social/home.php
index fb81f5120b..f949a86ea0 100644
--- a/public/main/social/home.php
+++ b/public/main/social/home.php
@@ -26,7 +26,7 @@ if ('true' !== api_get_setting('allow_social_tool')) {
     exit;
 }
 
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 
 SocialManager::handlePosts(api_get_self());
 
diff --git a/public/main/social/invitations.php b/public/main/social/invitations.php
index de7a38003f..96a5fa1a36 100644
--- a/public/main/social/invitations.php
+++ b/public/main/social/invitations.php
@@ -19,7 +19,7 @@ $this_section = SECTION_SOCIAL;
 $interbreadcrumb[] = ['url' => 'profile.php', 'name' => get_lang('Social network')];
 $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Invitations')];
 
-$userGroupModel = new UserGroup();
+$userGroupModel = new UserGroupModel();
 
 if (is_array($_GET) && count($_GET) > 0) {
     foreach ($_GET as $key => $value) {
diff --git a/public/main/social/message_for_group_form.inc.php b/public/main/social/message_for_group_form.inc.php
index f593ebe8a4..8a70fa0946 100644
--- a/public/main/social/message_for_group_form.inc.php
+++ b/public/main/social/message_for_group_form.inc.php
@@ -27,7 +27,7 @@ $allowed_action = isset($_GET['action']) && in_array($_GET['action'], $actions)
 $to_group = '';
 $subject = '';
 $message = '';
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 if (!empty($group_id) && $allowed_action) {
     $group_info = $usergroup->get($group_id);
     $is_member = $usergroup->is_group_member($group_id);
diff --git a/public/main/social/profile_friends_and_groups.inc.php b/public/main/social/profile_friends_and_groups.inc.php
index 26a0f36374..097b8e799d 100644
--- a/public/main/social/profile_friends_and_groups.inc.php
+++ b/public/main/social/profile_friends_and_groups.inc.php
@@ -17,7 +17,7 @@ if ('true' != api_get_setting('allow_social_tool')) {
 
 $views = ['friends', 'mygroups'];
 $user_id = (int) $_GET['user_id'];
-$userGroup = new UserGroup();
+$userGroup = new UserGroupModel();
 
 if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
     // show all friends by user_id
diff --git a/public/main/social/search.php b/public/main/social/search.php
index c2aa18dd7f..e9fef77e66 100644
--- a/public/main/social/search.php
+++ b/public/main/social/search.php
@@ -46,7 +46,7 @@ $groups = [];
 $totalGroups = [];
 $users = [];
 $totalUsers = [];
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 
 // I'm searching something
 if ('' != $query || ('1' == $query_vars['search_type'] && count($query_vars) > 2)) {
diff --git a/public/main/survey/survey.lib.php b/public/main/survey/survey.lib.php
index cd26c6deff..39e3945ebc 100644
--- a/public/main/survey/survey.lib.php
+++ b/public/main/survey/survey.lib.php
@@ -1933,7 +1933,7 @@ class SurveyManager
         }
 
         if (null === $groupId) {
-            $obj = new UserGroup();
+            $obj = new UserGroupModel();
             $options['where'] = [' usergroup.course_id = ? ' => $courseId];
             $classList = $obj->getUserGroupInCourse($options);
 
diff --git a/public/main/survey/survey_list.php b/public/main/survey/survey_list.php
index a6b9f4f4ad..0dc054608c 100644
--- a/public/main/survey/survey_list.php
+++ b/public/main/survey/survey_list.php
@@ -239,7 +239,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
                 $surveyList[] = $surveyData;
             }
 
-            $userGroup = new UserGroup();
+            $userGroup = new UserGroupModel();
             $options = [];
             $options['where'] = [' usergroup.course_id = ? ' => $course_id];
             $classes = $userGroup->getUserGroupInCourse($options, 0);
diff --git a/public/main/tracking/courseLog.php b/public/main/tracking/courseLog.php
index a7ddd40751..d630935f6a 100644
--- a/public/main/tracking/courseLog.php
+++ b/public/main/tracking/courseLog.php
@@ -332,7 +332,7 @@ $hideReports = api_get_configuration_value('hide_course_report_graph');
 $conditions = [];
 
 $groupList = GroupManager::get_group_list(null, $course, 1, $sessionId);
-$class = new UserGroup();
+$class = new UserGroupModel();
 //$options['where'] = [' usergroup.course_id = ? ' => $courseId];
 //$classes = $class->getUserGroupInCourse($options);
 $classes = $class->get_all();
diff --git a/public/main/user/class.php b/public/main/user/class.php
index a00d2d5f13..558ea4217a 100644
--- a/public/main/user/class.php
+++ b/public/main/user/class.php
@@ -37,7 +37,7 @@ $(function() {
 
 $actionsLeft = '';
 $actionsRight = '';
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $actions = '';
 
 $sessionId = api_get_session_id();
diff --git a/public/main/user/classes.php b/public/main/user/classes.php
index 66ed95389a..7d3821e12e 100644
--- a/public/main/user/classes.php
+++ b/public/main/user/classes.php
@@ -19,7 +19,7 @@ if (isset($_GET['id'])) {
 
 $content = '';
 
-$usergroup = new UserGroup();
+$usergroup = new UserGroupModel();
 $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
 if (!empty($usergroup_list)) {
     $content .= Display::tag('h1', get_lang('My classes'));
diff --git a/public/main/webservices/registration.soap.php b/public/main/webservices/registration.soap.php
index 382d6f7709..5b7264467f 100644
--- a/public/main/webservices/registration.soap.php
+++ b/public/main/webservices/registration.soap.php
@@ -6823,7 +6823,7 @@ function WSCreateGroup($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
     $params = [
         'name' => $params['name'],
     ];
@@ -6874,7 +6874,7 @@ function WSUpdateGroup($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
     $params['allow_member_group_to_leave'] = null;
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->update($params);
 }
@@ -6915,7 +6915,7 @@ function WSDeleteGroup($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->delete($params['id']);
 }
@@ -6957,7 +6957,7 @@ function GroupBindToParent($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->setParentGroup($params['id'], $params['parent_id']);
 }
@@ -6998,7 +6998,7 @@ function GroupUnbindFromParent($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->setParentGroup($params['id'], 0);
 }
@@ -7042,7 +7042,7 @@ function WSAddUserToGroup($params)
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->subscribe_users_to_usergroup(
         $params['group_id'],
@@ -7090,7 +7090,7 @@ function WSUpdateUserRoleInGroup($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->update_user_role(
         $params['user_id'],
@@ -7136,7 +7136,7 @@ function WSDeleteUserFromGroup($params)
     if (!WSHelperVerifyKey($params['secret_key'])) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    $userGroup = new UserGroup();
+    $userGroup = new UserGroupModel();
 
     return $userGroup->delete_user_rel_group(
         $params['user_id'],