From 92c729c0b05ebb7e541d0232ca0e64d33023523f Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 27 May 2021 10:22:45 +0200
Subject: [PATCH] Replace u.user_id with u.id

---
 .../admin/access_url_check_user_session.php   |  6 +-
 .../admin/access_url_edit_users_to_url.php    | 22 +++++---
 public/main/admin/user_export.php             |  4 +-
 ...ss_url_edit_users_to_url_functions.lib.php | 15 +++--
 public/main/inc/lib/myspace.lib.php           | 12 ++--
 public/main/inc/lib/sessionmanager.lib.php    |  2 +-
 .../main/inc/lib/system_announcements.lib.php |  2 +-
 public/main/inc/lib/tracking.lib.php          |  6 +-
 public/main/inc/lib/urlmanager.lib.php        | 55 +++++++++----------
 public/main/session/session_export.php        |  4 +-
 public/main/ticket/tutor_report.lib.php       | 13 ++++-
 public/main/user/add_users_to_session.php     | 38 +++++++------
 public/main/user/resume_session.php           | 13 +++--
 public/main/work/work.lib.php                 |  2 +-
 .../src/AdvancedSubscriptionPlugin.php        |  2 +-
 .../plugin/courselegal/CourseLegalPlugin.php  |  2 +-
 public/plugin/sepe/src/configuration.php      |  9 ++-
 public/plugin/sepe/ws/service.php             | 18 +++---
 18 files changed, 122 insertions(+), 103 deletions(-)

diff --git a/public/main/admin/access_url_check_user_session.php b/public/main/admin/access_url_check_user_session.php
index 2956628474..5dc0f43108 100644
--- a/public/main/admin/access_url_check_user_session.php
+++ b/public/main/admin/access_url_check_user_session.php
@@ -67,12 +67,12 @@ foreach ($session_list as $session_item) {
         $access_where = '(access_url_id is null)';
     }
 
-    $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
+    $sql = "SELECT u.id as user_id, lastname, firstname, username, access_url_id
             FROM $tbl_user u
             INNER JOIN $tbl_session_rel_user su
-            ON u.user_id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
+            ON u.id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
             LEFT OUTER JOIN $table_access_url_user uu
-            ON (uu.user_id = u.user_id)
+            ON (uu.user_id = u.id)
             WHERE su.session_id = $session_id AND $access_where
             $order_clause";
 
diff --git a/public/main/admin/access_url_edit_users_to_url.php b/public/main/admin/access_url_edit_users_to_url.php
index f0fe915a51..e8b1f2dc9b 100644
--- a/public/main/admin/access_url_edit_users_to_url.php
+++ b/public/main/admin/access_url_edit_users_to_url.php
@@ -1,9 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
+
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
-// resetting the course id
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -13,7 +15,6 @@ $xajax->registerFunction(['search_users', 'AccessUrlEditUsersToUrl', 'search_use
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 
-// Access restrictions
 api_protect_global_admin_script();
 
 if (!api_get_multiple_access_url()) {
@@ -131,17 +132,20 @@ if (!empty($message)) {
     echo Display::return_message($message, 'normal', false);
 }
 
-echo '<div class="actions">';
-echo Display::url(
-    Display::return_icon('view_more_stats.gif', get_lang('Add user to this URL'), ''),
-    api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php'
+echo Display::toolbarAction(
+    'url',
+    [
+        Display::url(
+            Display::return_icon('view_more_stats.gif', get_lang('Add user to this URL'), ''),
+            api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php'
+        ),
+    ]
 );
-echo '</div>';
 
 api_display_tool_title($tool_name);
 
 $nosessionUsersList = $sessionUsersList = [];
-$ajax_search = 'unique' == $add_type ? true : false;
+$ajax_search = 'unique' === $add_type ? true : false;
 
 if ($ajax_search) {
     $Users = UrlManager::get_url_rel_user_data($access_url_id);
@@ -158,7 +162,7 @@ if ($ajax_search) {
         }
     }
 
-    $sql = "SELECT u.user_id, lastname, firstname, username
+    $sql = "SELECT u.id as user_id, lastname, firstname, username
 	  	  	FROM $tbl_user u WHERE status <> ".ANONYMOUS.' '.
             $order_clause;
     $result = Database::query($sql);
diff --git a/public/main/admin/user_export.php b/public/main/admin/user_export.php
index b7c9a5217b..e92174f6b3 100644
--- a/public/main/admin/user_export.php
+++ b/public/main/admin/user_export.php
@@ -100,7 +100,7 @@ if ($form->validate()) {
     if (strlen($course_code) > 0) {
         $sql .= " FROM $user_table u, $course_user_table cu
                     WHERE
-                        u.user_id = cu.user_id AND
+                        u.id = cu.user_id AND
                         cu.c_id = $courseId AND
                         cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
                     ORDER BY lastname,firstname";
@@ -108,7 +108,7 @@ if ($form->validate()) {
     } elseif (strlen($courseSessionCode) > 0) {
         $sql .= " FROM $user_table u, $session_course_user_table scu
                     WHERE
-                        u.user_id = scu.user_id AND
+                        u.id = scu.user_id AND
                         scu.c_id = $courseSessionId AND
                         scu.session_id = $sessionId
                     ORDER BY lastname,firstname";
diff --git a/public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php b/public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php
index 722ec918ab..7d42ba0d1a 100644
--- a/public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php
+++ b/public/main/inc/lib/access_url_edit_users_to_url_functions.lib.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -36,12 +37,14 @@ class AccessUrlEditUsersToUrl
             $needle = Database::escape_string($needle);
             // search users where username or firstname or lastname begins likes $needle
             $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-            $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '.
-                   ' WHERE (username LIKE "'.$needle.'%" '.
-                   ' OR firstname LIKE "'.$needle.'%" '.
-                   ' OR lastname LIKE "'.$needle.'%") '.
-                    $order_clause.
-                   ' LIMIT 11';
+            $sql = 'SELECT u.id as user_id, username, lastname, firstname
+                    FROM '.$tbl_user.' u
+                    WHERE
+                    (
+                        username LIKE "'.$needle.'%" OR
+                        firstname LIKE "'.$needle.'%" OR
+                        lastname LIKE "'.$needle.'%"
+                    ) '.$order_clause.' LIMIT 11';
             $rs = Database::query($sql);
             $i = 0;
 
diff --git a/public/main/inc/lib/myspace.lib.php b/public/main/inc/lib/myspace.lib.php
index 8d5cc70a6c..0310029e90 100644
--- a/public/main/inc/lib/myspace.lib.php
+++ b/public/main/inc/lib/myspace.lib.php
@@ -1979,10 +1979,10 @@ class MySpace
             //$users = Container::getSessionRepository()->getUsersByCourse($session, $course, $url);
 
             // get the users in the course
-            $sql = "SELECT u.user_id
+            $sql = "SELECT u.id as user_id
                     FROM $tbl_user AS u
                     INNER JOIN $tbl_session_rel_course_rel_user AS scu
-                    ON u.user_id = scu.user_id
+                    ON u.id = scu.user_id
                     WHERE scu.session_id = '".$session_id."' AND scu.c_id = '".$courseId."'";
             $result_users = Database::query($sql);
             $time_spent = 0;
@@ -2161,7 +2161,7 @@ class MySpace
                 $sql = "SELECT scu.user_id
                         FROM $tbl_user AS u
                         INNER JOIN $tbl_session_rel_course_rel_user AS scu
-                        ON u.user_id = scu.user_id
+                        ON u.id = scu.user_id
                         WHERE scu.session_id = '".$session_id."' AND scu.c_id = '".$courseId."'";
                 $result_users = Database::query($sql);
                 $time_spent = 0;
@@ -2771,9 +2771,9 @@ class MySpace
         $username = Database::escape_string($username);
         foreach ($course_list as $courseId) {
             $courseId = (int) $courseId;
-            $sql = " SELECT u.user_id FROM $tbl_session_rel_course_rel_user rel
+            $sql = " SELECT u.id as user_id FROM $tbl_session_rel_course_rel_user rel
                      INNER JOIN $table_user u
-                     ON (rel.user_id = u.user_id)
+                     ON (rel.user_id = u.id)
                      WHERE
                         rel.session_id='$id_session' AND
                         u.status='5' AND
@@ -3904,7 +3904,7 @@ class MySpace
 
         if (isset($_GET['student_id']) && !empty($_GET['student_id'])) {
             $userId = (int) $_GET['student_id'];
-            $sql .= " AND u.user_id = ".$userId;
+            $sql .= " AND u.id = ".$userId;
         }
 
         $sql .= " AND u.status <> ".ANONYMOUS;
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
index 8e1c16e88b..562d782b56 100644
--- a/public/main/inc/lib/sessionmanager.lib.php
+++ b/public/main/inc/lib/sessionmanager.lib.php
@@ -1100,7 +1100,7 @@ class SessionManager
                     $where $order $limit";
         } else {
             $sql = "SELECT
-                        u.user_id, u.lastname, u.firstname, u.username,
+                        u.id as user_id, u.lastname, u.firstname, u.username,
                         u.email, s.c_id, s.session_id
                     FROM $session_course_user s
                     INNER JOIN $user u ON u.id = s.user_id
diff --git a/public/main/inc/lib/system_announcements.lib.php b/public/main/inc/lib/system_announcements.lib.php
index 16887c8322..a27768fddb 100644
--- a/public/main/inc/lib/system_announcements.lib.php
+++ b/public/main/inc/lib/system_announcements.lib.php
@@ -823,7 +823,7 @@ class SystemAnnouncementManager
         if (api_is_multiple_url_enabled()) {
             $current_access_url_id = api_get_current_access_url_id();
             $url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-            $urlJoin = " INNER JOIN $url_rel_user uu ON uu.user_id = u.user_id ";
+            $urlJoin = " INNER JOIN $url_rel_user uu ON uu.user_id = u.id ";
             $urlCondition = " AND access_url_id = '".$current_access_url_id."' ";
         }
 
diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php
index df3085b361..c45997db95 100644
--- a/public/main/inc/lib/tracking.lib.php
+++ b/public/main/inc/lib/tracking.lib.php
@@ -4660,11 +4660,11 @@ class Tracking
                     ORDER BY title";
         } else {
             $sql = "SELECT c.id, c.code, title
-                    FROM $tbl_course_user u
+                    FROM $tbl_course_user cu
                     INNER JOIN $tbl_course c
-                    ON (c_id = c.id)
+                    ON (cu.c_id = c.id)
                     WHERE
-                        u.user_id= $user_id AND
+                        cu.user_id = $user_id AND
                         relation_type <> ".COURSE_RELATION_TYPE_RRHH."
                     ORDER BY title";
         }
diff --git a/public/main/inc/lib/urlmanager.lib.php b/public/main/inc/lib/urlmanager.lib.php
index 30d09562be..9119d33b01 100644
--- a/public/main/inc/lib/urlmanager.lib.php
+++ b/public/main/inc/lib/urlmanager.lib.php
@@ -231,15 +231,14 @@ class UrlManager
         } else {
             $order_clause = $order_by;
         }
-        $sql = "SELECT u.user_id, lastname, firstname, username, official_code, access_url_id
+        $sql = "SELECT u.id as user_id, lastname, firstname, username, official_code, access_url_id
                 FROM $tbl_user u
                 INNER JOIN $table_url_rel_user
-                ON $table_url_rel_user.user_id = u.user_id
+                ON $table_url_rel_user.user_id = u.id
                 $where  $order_clause";
         $result = Database::query($sql);
-        $users = Database::store_result($result);
 
-        return $users;
+        return Database::store_result($result);
     }
 
     /**
@@ -479,7 +478,7 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
         $sql = "SELECT usergroup_id FROM $table
-               WHERE 
+               WHERE
                     access_url_id = ".intval($urlId)." AND
                     usergroup_id = ".intval($userGroupId);
         $result = Database::query($sql);
@@ -534,8 +533,8 @@ class UrlManager
                     $count = self::relation_url_user_exist($user_id, $urlId);
                     if (0 == $count) {
                         $sql = "INSERT INTO $table
-                                SET 
-                                    user_id = ".intval($user_id).", 
+                                SET
+                                    user_id = ".intval($user_id).",
                                     access_url_id = ".intval($urlId);
                         $result = Database::query($sql);
                         if ($result) {
@@ -672,7 +671,7 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
         $sql = "SELECT course_category_id FROM $table
-                WHERE 
+                WHERE
                     access_url_id = ".intval($urlId)." AND
                     course_category_id = ".intval($categoryCourseId);
         $result = Database::query($sql);
@@ -861,8 +860,8 @@ class UrlManager
         $result = true;
         if (!empty($user_id) && !empty($urlId)) {
             $sql = "DELETE FROM $table
-                   WHERE 
-                        user_id = ".intval($user_id)." AND 
+                   WHERE
+                        user_id = ".intval($user_id)." AND
                         access_url_id = ".intval($urlId);
             $result = Database::query($sql);
         }
@@ -947,7 +946,7 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
         $sql = "DELETE FROM $table
-                WHERE 
+                WHERE
                     course_category_id = '".intval($userGroupId)."' AND
                     access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
@@ -969,8 +968,8 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $sql = "DELETE FROM $table
-                WHERE 
-                    session_id = ".intval($session_id)." AND 
+                WHERE
+                    session_id = ".intval($session_id)." AND
                     access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql, 'ASSOC');
 
@@ -992,8 +991,8 @@ class UrlManager
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $urlId = (int) $urlId;
 
-        $sql = "SELECT user_id 
-                FROM $table 
+        $sql = "SELECT user_id
+                FROM $table
                 WHERE access_url_id = $urlId";
         $result = Database::query($sql);
         $existing_users = [];
@@ -1087,7 +1086,7 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
 
-        $sql = "SELECT usergroup_id FROM $table 
+        $sql = "SELECT usergroup_id FROM $table
                 WHERE access_url_id = ".intval($urlId);
         $result = Database::query($sql);
         $existingItems = [];
@@ -1121,8 +1120,8 @@ class UrlManager
     public static function updateUrlRelCourseCategory($list, $urlId)
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql = "SELECT course_category_id 
-                FROM $table 
+        $sql = "SELECT course_category_id
+                FROM $table
                 WHERE access_url_id = ".intval($urlId);
         $result = Database::query($sql);
         $existingItems = [];
@@ -1171,7 +1170,7 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
-        $sql = "SELECT session_id FROM $table 
+        $sql = "SELECT session_id FROM $table
                 WHERE access_url_id=".intval($urlId);
         $result = Database::query($sql);
         $existing_sessions = [];
@@ -1211,8 +1210,8 @@ class UrlManager
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $table_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
-        $sql = "SELECT url, access_url_id 
-                FROM $table url_rel_user 
+        $sql = "SELECT url, access_url_id
+                FROM $table url_rel_user
                 INNER JOIN $table_url u
                 ON (url_rel_user.access_url_id = u.id)
                 WHERE user_id = ".intval($user_id);
@@ -1231,7 +1230,7 @@ class UrlManager
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
         $table_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
         $courseId = (int) $courseId;
-        $sql = "SELECT url, access_url_id FROM $table c 
+        $sql = "SELECT url, access_url_id FROM $table c
                 INNER JOIN $table_url u
                 ON (c.access_url_id = u.id)
                 WHERE c_id = $courseId";
@@ -1270,8 +1269,8 @@ class UrlManager
     {
         $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $table_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
-        $sql = "SELECT url, access_url_id 
-                FROM $table_url_rel_session url_rel_session 
+        $sql = "SELECT url, access_url_id
+                FROM $table_url_rel_session url_rel_session
                 INNER JOIN $table_url u
                 ON (url_rel_session.access_url_id = u.id)
                 WHERE session_id = ".intval($sessionId);
@@ -1289,7 +1288,7 @@ class UrlManager
     public static function get_url_id($url)
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
-        $sql = "SELECT id FROM $table 
+        $sql = "SELECT id FROM $table
                 WHERE url = '".Database::escape_string($url)."'";
         $result = Database::query($sql);
         $urlId = Database::result($result, 0, 0);
@@ -1313,10 +1312,10 @@ class UrlManager
             $needle = api_convert_encoding($needle, $charset, 'utf-8');
             $needle = Database::escape_string($needle);
             // search courses where username or firstname or lastname begins likes $needle
-            $sql = 'SELECT id, name 
+            $sql = 'SELECT id, name
                     FROM '.Database::get_main_table(TABLE_MAIN_CATEGORY).' u
-                    WHERE 
-                        name LIKE "'.$needle.'%" AND 
+                    WHERE
+                        name LIKE "'.$needle.'%" AND
                         (parent_id IS NULL or parent_id = 0)
                     ORDER BY name
                     LIMIT 11';
diff --git a/public/main/session/session_export.php b/public/main/session/session_export.php
index eb4d924169..02bc8700d5 100644
--- a/public/main/session/session_export.php
+++ b/public/main/session/session_export.php
@@ -154,7 +154,7 @@ if (isset($_POST['formSent'])) {
                 $sql = "SELECT u.username
                         FROM $tbl_session_course_user scu
                         INNER JOIN $tbl_user u
-                        ON u.user_id = scu.user_id
+                        ON u.id = scu.user_id
                         WHERE
                             scu.c_id = '{$rowCourses['c_id']}' AND
                             scu.session_id = '".$row['id']."' AND
@@ -187,7 +187,7 @@ if (isset($_POST['formSent'])) {
                             su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                         INNER JOIN $tbl_user u
                         ON
-                            scu.user_id = u.user_id AND
+                            scu.user_id = u.id AND
                             scu.c_id='".$rowCourses['c_id']."' AND
                             scu.session_id='".$row['id']."'";
 
diff --git a/public/main/ticket/tutor_report.lib.php b/public/main/ticket/tutor_report.lib.php
index 05243dca3b..096d65b826 100644
--- a/public/main/ticket/tutor_report.lib.php
+++ b/public/main/ticket/tutor_report.lib.php
@@ -154,10 +154,19 @@ function showResults($courseInfo, $weeksCount, $page)
     }
     $html .= '</tr>';
     $html .= $line;
-    $sql = "SELECT u.username , u.user_id , CONCAT(u.lastname,' ', u.firstname ) as fullname , rs.week_id , sr.work_ok ,sr.thread_ok , sr.quiz_ok , sr.pc_ok , rs.course_code
+    $sql = "SELECT
+                u.username,
+                u.id as user_id,
+                CONCAT(u.lastname,' ', u.firstname ) as fullname ,
+                rs.week_id , sr.work_ok ,
+                sr.thread_ok ,
+                sr.quiz_ok ,
+                sr.pc_ok ,
+                rs.course_code
             FROM $tableStudentsReport sr
             JOIN $tableWeeklyReport rs ON sr.week_report_id = rs.id
-            JOIN $tableUser u ON u.user_id = sr.user_id
+            JOIN $tableUser u
+            ON u.id = sr.user_id
             WHERE rs.course_code = '$course_code'
             ORDER BY u.lastname , u.username , rs.week_id
     ";
diff --git a/public/main/user/add_users_to_session.php b/public/main/user/add_users_to_session.php
index b488b11ffd..86ef53a842 100644
--- a/public/main/user/add_users_to_session.php
+++ b/public/main/user/add_users_to_session.php
@@ -140,6 +140,7 @@ if ('true' === $allowTutors) {
                             $order_clause;
                     break;
             }
+
             if (api_is_multiple_url_enabled()) {
                 $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                 $access_url_id = api_get_current_access_url_id();
@@ -187,7 +188,7 @@ if ('true' === $allowTutors) {
 
             $rs = Database::query($sql);
             $i = 0;
-            if ('single' == $type) {
+            if ('single' === $type) {
                 while ($user = Database::fetch_array($rs)) {
                     $i++;
                     if ($i <= 10) {
@@ -201,7 +202,7 @@ if ('true' === $allowTutors) {
                 $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
             } else {
                 $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
-                while ($user = Database :: fetch_array($rs)) {
+                while ($user = Database::fetch_array($rs)) {
                     $person_name = api_get_person_name($user['firstname'], $user['lastname']);
                     $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
                 }
@@ -286,11 +287,11 @@ if ('true' === $allowTutors) {
 
     $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
     if ($ajax_search) {
-        $sql = "SELECT u.user_id, lastname, firstname, username, session_id
+        $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                 FROM $tbl_user u
                 INNER JOIN $tbl_session_rel_user
                 ON
-                    $tbl_session_rel_user.user_id = u.user_id AND
+                    $tbl_session_rel_user.user_id = u.id AND
                     $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
                     $tbl_session_rel_user.session_id = ".intval($id_session)."
                 WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
@@ -299,11 +300,11 @@ if ('true' === $allowTutors) {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if (-1 != $access_url_id) {
-                $sql = "SELECT u.user_id, lastname, firstname, username, session_id
+                $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                         FROM $tbl_user u
                         INNER JOIN $tbl_session_rel_user
                         ON
-                            $tbl_session_rel_user.user_id = u.user_id AND
+                            $tbl_session_rel_user.user_id = u.id AND
                             $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
                             $tbl_session_rel_user.session_id = ".intval($id_session)."
                         INNER JOIN $tbl_user_rel_access_url url_user
@@ -357,49 +358,50 @@ if ('true' === $allowTutors) {
             $where_filter = '';
             if (api_is_multiple_url_enabled()) {
                 if (is_array($final_result) && count($final_result) > 0) {
-                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
+                    $where_filter = " AND u.id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
-                    $where_filter = " AND u.user_id  = -1";
+                    $where_filter = " AND u.id = -1";
                 }
             } else {
                 if (is_array($final_result) && count($final_result) > 0) {
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
+                    $where_filter = " WHERE u.id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
-                    $where_filter = " WHERE u.user_id  = -1";
+                    $where_filter = " WHERE u.id = -1";
                 }
             }
         }
 
         if ($use_extra_fields) {
-            $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
+            $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                     FROM $tbl_user u
                     LEFT JOIN $tbl_session_rel_user
-                    ON $tbl_session_rel_user.user_id = u.user_id AND
+                    ON $tbl_session_rel_user.user_id = u.id AND
                     $tbl_session_rel_user.session_id = '$id_session' AND
                     $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                     $where_filter AND u.status<>".DRH." AND u.status<>6
                     $order_clause";
         } else {
-            $sql = "SELECT  user_id, lastname, firstname, username, session_id
+            $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                     FROM $tbl_user u
                     LEFT JOIN $tbl_session_rel_user
-                    ON $tbl_session_rel_user.user_id = u.user_id AND
+                    ON $tbl_session_rel_user.user_id = u.id AND
                     $tbl_session_rel_user.session_id = '$id_session' AND
                     $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                     WHERE u.status <> ".DRH." AND u.status<>6
                     $order_clause";
         }
+
         if (api_is_multiple_url_enabled()) {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if (-1 != $access_url_id) {
-                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
+                $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                         FROM $tbl_user u
                         LEFT JOIN $tbl_session_rel_user
                         ON
-                            $tbl_session_rel_user.user_id = u.user_id AND
+                            $tbl_session_rel_user.user_id = u.id AND
                             $tbl_session_rel_user.session_id = '$id_session' AND
                             $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                         INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
@@ -437,11 +439,11 @@ if ('true' === $allowTutors) {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if (-1 != $access_url_id) {
-                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
+                $sql = "SELECT u.id as user_id, lastname, firstname, username, session_id
                         FROM $tbl_user u
                         LEFT JOIN $tbl_session_rel_user
                         ON
-                            $tbl_session_rel_user.user_id = u.user_id AND
+                            $tbl_session_rel_user.user_id = u.id AND
                             $tbl_session_rel_user.session_id = '$id_session' AND
                             $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                         INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
diff --git a/public/main/user/resume_session.php b/public/main/user/resume_session.php
index 6a40156a44..02f18620ec 100644
--- a/public/main/user/resume_session.php
+++ b/public/main/user/resume_session.php
@@ -314,18 +314,18 @@ if ('true' === $allowTutors) {
         $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 
         if ($multiple_url_is_on) {
-            $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
+            $sql = "SELECT u.id as user_id, lastname, firstname, username, access_url_id
                     FROM $tbl_user u
                     INNER JOIN $tbl_session_rel_user su
-                    ON u.user_id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
-                    LEFT OUTER JOIN $table_access_url_user uu ON (uu.user_id = u.user_id)
+                    ON u.id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
+                    LEFT OUTER JOIN $table_access_url_user uu ON (uu.user_id = u.id)
                     WHERE su.session_id = $id_session AND (access_url_id = $url_id OR access_url_id is null )
                     $order_clause";
         } else {
-            $sql = "SELECT u.user_id, lastname, firstname, username
+            $sql = "SELECT u.id as user_id, lastname, firstname, username
                     FROM $tbl_user u
                     INNER JOIN $tbl_session_rel_user su
-                    ON u.user_id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
+                    ON u.id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
                     AND su.session_id = ".$id_session.$order_clause;
         }
 
@@ -336,7 +336,8 @@ if ('true' === $allowTutors) {
         foreach ($users as $user) {
             $user_link = '';
             if (!empty($user['user_id'])) {
-                $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
+                $user_link = '<a
+                    href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
                     api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']), ENT_QUOTES, $charset).' ('.$user['username'].')</a>';
             }
 
diff --git a/public/main/work/work.lib.php b/public/main/work/work.lib.php
index 7b9e12c751..0ff88f4fb7 100644
--- a/public/main/work/work.lib.php
+++ b/public/main/work/work.lib.php
@@ -1495,7 +1495,7 @@ function getAllWorkListStudent(
         }
 
         if ($withResults) {
-            $whereCondition = " AND u.user_id = $userId ";
+            $whereCondition = " AND u.id = $userId ";
             $workList = get_work_user_list(
                 0,
                 1000,
diff --git a/public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php b/public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
index ee09a58a32..a4c5db5a1c 100644
--- a/public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
+++ b/public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
@@ -1217,7 +1217,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
         }
         $queueTable = Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE);
         $userTable = Database::get_main_table(TABLE_MAIN_USER);
-        $userJoinTable = $queueTable.' q INNER JOIN '.$userTable.' u ON q.user_id = u.user_id';
+        $userJoinTable = $queueTable.' q INNER JOIN '.$userTable.' u ON q.user_id = u.id';
         $where = [
             'where' => [
                 'q.session_id = ?' => [
diff --git a/public/plugin/courselegal/CourseLegalPlugin.php b/public/plugin/courselegal/CourseLegalPlugin.php
index ed104cac51..3cd9f03899 100644
--- a/public/plugin/courselegal/CourseLegalPlugin.php
+++ b/public/plugin/courselegal/CourseLegalPlugin.php
@@ -303,7 +303,7 @@ class CourseLegalPlugin extends Plugin
         $userTable = Database::get_main_table(TABLE_MAIN_USER);
         $sql = "SELECT *
                 FROM $table s INNER JOIN $userTable u
-                ON u.user_id = s.user_id
+                ON u.id = s.user_id
                 WHERE c_id = $courseId AND session_id = $sessionId ";
 
         if (!empty($order)) {
diff --git a/public/plugin/sepe/src/configuration.php b/public/plugin/sepe/src/configuration.php
index 99ef5ebf7a..458675e13e 100644
--- a/public/plugin/sepe/src/configuration.php
+++ b/public/plugin/sepe/src/configuration.php
@@ -15,9 +15,12 @@ if (api_is_platform_admin()) {
     $tUser = Database::get_main_table(TABLE_MAIN_USER);
     $tApi = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
     $login = 'SEPE';
-    $sql = "SELECT a.api_key AS api 
-            FROM $tUser u, $tApi a 
-            WHERE u.username='".$login."' and u.user_id = a.user_id AND a.api_service = 'dokeos';";
+    $sql = "SELECT a.api_key AS api
+            FROM $tUser u, $tApi a
+            WHERE
+                u.username='".$login."' AND
+                u.id = a.user_id AND
+                .api_service = 'dokeos';";
     $result = Database::query($sql);
     if (Database::num_rows($result) > 0) {
         $tmp = Database::fetch_assoc($result);
diff --git a/public/plugin/sepe/ws/service.php b/public/plugin/sepe/ws/service.php
index 7419aecbb9..76f2a59c61 100644
--- a/public/plugin/sepe/ws/service.php
+++ b/public/plugin/sepe/ws/service.php
@@ -86,24 +86,22 @@ function authenticate($WSUser, $WSKey)
     $tUser = Database::get_main_table(TABLE_MAIN_USER);
     $tApi = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
     $login = Database::escape_string($WSUser);
-    $sql = "SELECT u.user_id, u.status FROM $tUser u, $tApi a 
-            WHERE 
-                u.username='".$login."' AND  
-                u.user_id = a.user_id AND 
-                a.api_service = 'dokeos' AND 
+    $sql = "SELECT u.id as user_id, u.status FROM $tUser u, $tApi a
+            WHERE
+                u.username='".$login."' AND
+                u.id = a.user_id AND
+                a.api_service = 'dokeos' AND
                 a.api_key='".$WSKey."'";
     $result = Database::query($sql);
 
     if (Database::num_rows($result) > 0) {
         $row = Database::fetch_row($result);
-        if ('4' == $row[1]) { //UserManager::is_admin($row[0])) {
+        if ('4' == $row[1]) {
             return true;
-        } else {
-            return false;
         }
-    } else {
-        return false;
     }
+
+    return false;
 }
 
 $doc = new DOMDocument();