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

Minor - Format code - refs BT#12875

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent f99813dc5a
commit 037aae36c9
2 changed files with 31 additions and 21 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. 35
      main/inc/lib/course.lib.php
  2. 7
      main/user/user.php

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

@ -1677,34 +1677,41 @@ class CourseManager
// variable initialisation // variable initialisation
$session_id = intval($session_id); $session_id = intval($session_id);
$course_code = Database::escape_string($course_code); $course_code = Database::escape_string($course_code);
$tblUser = Database::get_main_table(TABLE_MAIN_USER);
$tblSessionUser = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tblCourseUser = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$tblUrlUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$courseInfo = api_get_course_info($course_code); $courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['real_id']; $courseId = $courseInfo['real_id'];
$sql = 'SELECT DISTINCT count(user.id) as count $sql = "
FROM ' . Database::get_main_table(TABLE_MAIN_USER).' as user '; SELECT DISTINCT count(user.id) as count
FROM $tblUser as user
";
$where = array(); $where = array();
if (!empty($session_id)) { if (!empty($session_id)) {
$sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).' as session_course_user $sql .= "
ON LEFT JOIN $tblSessionUser as session_course_user
user.user_id = session_course_user.user_id AND ON user.user_id = session_course_user.user_id
session_course_user.c_id = "' . $courseId.'" AND AND session_course_user.c_id = $courseId
session_course_user.session_id = ' . $session_id; AND 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 ';
} else { } else {
$sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user $sql .= "
ON LEFT JOIN $tblCourseUser as course_rel_user
user.user_id = course_rel_user.user_id AND ON user.user_id = course_rel_user.user_id
course_rel_user.relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND AND course_rel_user.relation_type <> ".COURSE_RELATION_TYPE_RRHH."
course_rel_user.c_id = ' . $courseId; 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 ';
} }
$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 $tblUrlUser au ON (au.user_id = user.user_id) ";
ON (au.user_id = user.user_id) ';
} }
$sql .= ' WHERE '.implode(' OR ', $where); $sql .= ' WHERE '.implode(' OR ', $where);

7
main/user/user.php
Unescape View File

@ -217,8 +217,11 @@ if (api_is_allowed_to_edit(null, true)) {
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au '; $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au ';
} }
$sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id "; $sql .= "
$sql .= ' AND session_id = '.$sessionId; WHERE c_id = $courseId
AND session_course_user.user_id = user.user_id
AND session_id = $sessionId
";
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$sql .= " AND user.user_id = au.user_id AND access_url_id = $current_access_url_id "; $sql .= " AND user.user_id = au.user_id AND access_url_id = $current_access_url_id ";

Write Preview
Loading…
Cancel
Save