From aaa19118c4383516dbfb335380c207b41019b243 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 27 Jul 2020 08:42:55 +0200
Subject: [PATCH] Performance: Replace user.user_id with user.id

---
 main/inc/lib/sessionmanager.lib.php | 16 ++++++++--------
 main/user/subscribe_user.php        | 21 ++++++++++-----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 7cf585ee90..71089637e7 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -425,7 +425,7 @@ class SessionManager
                 LEFT JOIN $tbl_session_category sc
                 ON s.session_category_id = sc.id
                 INNER JOIN $tbl_user u
-                ON s.id_coach = u.user_id
+                ON s.id_coach = u.id
                 $courseCondition
                 $extraJoin
                 $where $where_condition ) as session_table";
@@ -833,9 +833,9 @@ class SessionManager
             $order = " ORDER BY ".$options['order'];
         }
 
-        $sql = "SELECT u.user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
+        $sql = "SELECT u.id as user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
                 FROM $session_course_user s
-                INNER JOIN $user u ON u.user_id = s.user_id
+                INNER JOIN $user u ON u.id = s.user_id
                 $where
                 $order
                 $limit";
@@ -8150,7 +8150,7 @@ class SessionManager
                        LEFT JOIN  $tbl_session_category sc
                        ON s.session_category_id = sc.id
                        INNER JOIN $tbl_user u
-                       ON s.id_coach = u.user_id
+                       ON s.id_coach = u.id
                        INNER JOIN $sessionCourseUserTable scu
                        ON s.id = scu.session_id
                        INNER JOIN $courseTable c
@@ -8167,7 +8167,7 @@ class SessionManager
                                LEFT JOIN  $tbl_session_category sc
                                ON s.session_category_id = sc.id
                                INNER JOIN $tbl_user u
-                               ON s.id_coach = u.user_id
+                               ON s.id_coach = u.id
                                INNER JOIN $table_access_url_rel_session ar
                                ON ar.session_id = s.id $where ";
             }
@@ -8733,7 +8733,7 @@ class SessionManager
                 access_start_date,
                 access_end_date,
                 s.visibility,
-                u.user_id,
+                u.id as user_id,
                 $injectExtraFields
                 c.title as course_title,
                 s.id ";
@@ -8782,7 +8782,7 @@ class SessionManager
                     LEFT JOIN $tbl_session_category sc
                     ON (s.session_category_id = sc.id)
                     INNER JOIN $tbl_user u
-                    ON (s.id_coach = u.user_id)
+                    ON (s.id_coach = u.id)
                     $where
                     $limit
         ";
@@ -8804,7 +8804,7 @@ class SessionManager
                     LEFT JOIN $tbl_session_category sc
                     ON (s.session_category_id = sc.id)
                     INNER JOIN $tbl_user u
-                    ON (s.id_coach = u.user_id)
+                    ON (s.id_coach = u.id)
                     INNER JOIN $table_access_url_rel_session ar
                     ON (ar.session_id = s.id AND ar.access_url_id = $access_url_id)
                     $where
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index c6ad2bdff8..951011cb8e 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt*/
 
 use Chamilo\CoreBundle\Entity\ExtraField;
@@ -7,8 +8,6 @@ use ExtraField as ExtraFieldModel;
 /**
  * This script allows teachers to subscribe existing users
  * to their course.
- *
- * @package chamilo.user
  */
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_USER;
@@ -237,7 +236,7 @@ function get_number_of_users()
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
-                        u.user_id = cu.user_id AND
+                        u.id = cu.user_id AND
                         c_id = '".api_get_course_int_id()."' AND
                         session_id ='".$sessionId."'
                     WHERE
@@ -253,10 +252,10 @@ function get_number_of_users()
                             FROM $user_table u
                             LEFT JOIN $tbl_session_rel_course_user cu
                             ON
-                                u.user_id = cu.user_id AND cu.c_id = '".api_get_course_int_id()."' AND
+                                u.id = cu.user_id AND cu.c_id = '".api_get_course_int_id()."' AND
                                 session_id ='".$sessionId."'
                             INNER JOIN  $tbl_url_rel_user as url_rel_user
-                            ON (url_rel_user.user_id = u.user_id)
+                            ON (url_rel_user.user_id = u.id)
                             WHERE
                                 cu.user_id IS NULL AND
                                 access_url_id= $url_access_id AND
@@ -269,7 +268,7 @@ function get_number_of_users()
             $sql = "SELECT COUNT(u.id)
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
-                    ON u.user_id = cu.user_id and c_id='".api_get_course_int_id()."'
+                    ON u.id = cu.user_id and c_id='".api_get_course_int_id()."'
                     WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 
             if (api_is_multiple_url_enabled()) {
@@ -280,9 +279,9 @@ function get_number_of_users()
                     $sql = "SELECT COUNT(u.id)
                         FROM $user_table u
                         LEFT JOIN $course_user_table cu
-                        ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'
+                        ON u.id = cu.user_id AND c_id='".api_get_course_int_id()."'
                         INNER JOIN  $tbl_url_rel_user as url_rel_user
-                        ON (url_rel_user.user_id = u.user_id)
+                        ON (url_rel_user.user_id = u.id)
                         WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
                 }
             }
@@ -294,7 +293,7 @@ function get_number_of_users()
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
-                        u.user_id = cu.user_id AND
+                        u.id = cu.user_id AND
                         c_id='".api_get_course_int_id()."' AND
                         session_id ='".$sessionId."'
                     WHERE
@@ -310,7 +309,7 @@ function get_number_of_users()
                             FROM $user_table u
                             LEFT JOIN $tbl_session_rel_course_user cu
                             ON
-                                u.user_id = cu.user_id AND
+                                u.id = cu.user_id AND
                                 c_id='".api_get_course_int_id()."' AND
                                 session_id ='".$sessionId."'
                             INNER JOIN $tbl_url_rel_user as url_rel_user
@@ -354,7 +353,7 @@ function get_number_of_users()
                     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                     $sql = "SELECT COUNT(u.id)
                             FROM $user_table u
-                            LEFT JOIN $course_user_table cu 
+                            LEFT JOIN $course_user_table cu
                             ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'
                             INNER JOIN $tbl_url_rel_user as url_rel_user
                             ON (url_rel_user.user_id = u.id)