From b6816b467a3b7e0372449b9c5c86b0bc7f74f687 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 30 Sep 2016 19:09:11 +0200
Subject: [PATCH] Use user.id

---
 main/inc/lib/course.lib.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index a89c209de5..e38266b1be 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1359,11 +1359,13 @@ class CourseManager
             $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
             $sql .= " LEFT JOIN ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " as session_course_user
                       ON
-                        user.user_id = session_course_user.user_id AND
+                        user.id = session_course_user.user_id AND
                         $sessionCondition
-                        INNER JOIN $course_table course ON session_course_user.c_id = course.id AND
+                        INNER JOIN $course_table course 
+                        ON session_course_user.c_id = course.id AND
                         $courseCondition
-                        INNER JOIN $sessionTable session ON session_course_user.session_id = session.id
+                        INNER JOIN $sessionTable session 
+                        ON session_course_user.session_id = session.id
                    ";
             $where[] = ' session_course_user.c_id IS NOT NULL ';
 
@@ -1382,14 +1384,14 @@ class CourseManager
                                 course.title,
                                 course.code,
                                 course_rel_user.status as status_rel,
-                                user.user_id,
+                                user.id as user_id,
                                 user.email,
                                 course_rel_user.is_tutor,
                                 user.*  ';
                 } else {
                     $sql = 'SELECT DISTINCT
                                 course_rel_user.status as status_rel,
-                                user.user_id,
+                                user.id as user_id,
                                 user.email,
                                 course_rel_user.is_tutor,
                                 user.*  ';
@@ -1398,12 +1400,13 @@ class CourseManager
 
             $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user '
                   . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
-                        ON user.user_id = course_rel_user.user_id AND
+                      ON 
+                        user.id = course_rel_user.user_id AND
                         course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . '  '
                   . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
 
             if (!empty($course_code)) {
-                $sql .= ' AND course_rel_user.c_id="' . $courseId . '"';
+                $sql .= ' AND course_rel_user.c_id = "' . $courseId . '"';
             }
             $where[] = ' course_rel_user.c_id IS NOT NULL ';
 
@@ -1416,7 +1419,7 @@ class CourseManager
         $multiple_access_url = api_get_multiple_access_url();
         if ($multiple_access_url) {
             $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER) . ' au
-                      ON (au.user_id = user.user_id) ';
+                      ON (au.user_id = user.id) ';
         }
 
         $extraFieldWasAdded = false;
@@ -1427,7 +1430,7 @@ class CourseManager
                     $fieldValuesTable = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
                     $sql .= ' LEFT JOIN '.$fieldValuesTable.' as ufv
                             ON (
-                                user.user_id = ufv.item_id AND
+                                user.id = ufv.item_id AND
                                 (field_id = '.$extraFieldInfo['id'].' OR field_id IS NULL)
                             )';
                     $extraFieldWasAdded = true;
@@ -1457,7 +1460,7 @@ class CourseManager
         if (!empty($userIdList)) {
             $userIdList = array_map('intval', $userIdList);
             $userIdList = implode('","', $userIdList);
-            $sql .= ' AND user.user_id IN ("' . $userIdList . '")';
+            $sql .= ' AND user.id IN ("' . $userIdList . '")';
         }
 
         if (isset($filterByActive)) {