chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use user.id

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 683301b581
commit b6816b467a
1 changed files with 13 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      main/inc/lib/course.lib.php

23
main/inc/lib/course.lib.php
Unescape View File

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

Write Preview
Loading…
Cancel
Save