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

Performance: Replace user.user_id with user.id

Browse Source
pull/3418/head
Julio Montoya 5 years ago
parent 6b1777b740
commit aaa19118c4
2 changed files with 18 additions and 19 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. 16
      main/inc/lib/sessionmanager.lib.php
  2. 21
      main/user/subscribe_user.php

16
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -425,7 +425,7 @@ class SessionManager
LEFT JOIN $tbl_session_category sc LEFT JOIN $tbl_session_category sc
ON s.session_category_id = sc.id ON s.session_category_id = sc.id
INNER JOIN $tbl_user u INNER JOIN $tbl_user u
ON s.id_coach = u.user_id ON s.id_coach = u.id
$courseCondition $courseCondition
$extraJoin $extraJoin
$where $where_condition ) as session_table"; $where $where_condition ) as session_table";
@ -833,9 +833,9 @@ class SessionManager
$order = " ORDER BY ".$options['order']; $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 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 $where
$order $order
$limit"; $limit";
@ -8150,7 +8150,7 @@ class SessionManager
LEFT JOIN $tbl_session_category sc LEFT JOIN $tbl_session_category sc
ON s.session_category_id = sc.id ON s.session_category_id = sc.id
INNER JOIN $tbl_user u INNER JOIN $tbl_user u
ON s.id_coach = u.user_id ON s.id_coach = u.id
INNER JOIN $sessionCourseUserTable scu INNER JOIN $sessionCourseUserTable scu
ON s.id = scu.session_id ON s.id = scu.session_id
INNER JOIN $courseTable c INNER JOIN $courseTable c
@ -8167,7 +8167,7 @@ class SessionManager
LEFT JOIN $tbl_session_category sc LEFT JOIN $tbl_session_category sc
ON s.session_category_id = sc.id ON s.session_category_id = sc.id
INNER JOIN $tbl_user u 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 INNER JOIN $table_access_url_rel_session ar
ON ar.session_id = s.id $where "; ON ar.session_id = s.id $where ";
} }
@ -8733,7 +8733,7 @@ class SessionManager
access_start_date, access_start_date,
access_end_date, access_end_date,
s.visibility, s.visibility,
u.user_id, u.id as user_id,
$injectExtraFields $injectExtraFields
c.title as course_title, c.title as course_title,
s.id "; s.id ";
@ -8782,7 +8782,7 @@ class SessionManager
LEFT JOIN $tbl_session_category sc LEFT JOIN $tbl_session_category sc
ON (s.session_category_id = sc.id) ON (s.session_category_id = sc.id)
INNER JOIN $tbl_user u INNER JOIN $tbl_user u
ON (s.id_coach = u.user_id) ON (s.id_coach = u.id)
$where $where
$limit $limit
"; ";
@ -8804,7 +8804,7 @@ class SessionManager
LEFT JOIN $tbl_session_category sc LEFT JOIN $tbl_session_category sc
ON (s.session_category_id = sc.id) ON (s.session_category_id = sc.id)
INNER JOIN $tbl_user u 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 INNER JOIN $table_access_url_rel_session ar
ON (ar.session_id = s.id AND ar.access_url_id = $access_url_id) ON (ar.session_id = s.id AND ar.access_url_id = $access_url_id)
$where $where

21
main/user/subscribe_user.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt*/ /* For licensing terms, see /license.txt*/
use Chamilo\CoreBundle\Entity\ExtraField; use Chamilo\CoreBundle\Entity\ExtraField;
@ -7,8 +8,6 @@ use ExtraField as ExtraFieldModel;
/** /**
* This script allows teachers to subscribe existing users * This script allows teachers to subscribe existing users
* to their course. * to their course.
*
* @package chamilo.user
*/ */
require_once __DIR__.'/../inc/global.inc.php'; require_once __DIR__.'/../inc/global.inc.php';
$current_course_tool = TOOL_USER; $current_course_tool = TOOL_USER;
@ -237,7 +236,7 @@ function get_number_of_users()
FROM $user_table u FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu LEFT JOIN $tbl_session_rel_course_user cu
ON ON
u.user_id = cu.user_id AND u.id = cu.user_id AND
c_id = '".api_get_course_int_id()."' AND c_id = '".api_get_course_int_id()."' AND
session_id ='".$sessionId."' session_id ='".$sessionId."'
WHERE WHERE
@ -253,10 +252,10 @@ function get_number_of_users()
FROM $user_table u FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu LEFT JOIN $tbl_session_rel_course_user cu
ON 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."' session_id ='".$sessionId."'
INNER JOIN $tbl_url_rel_user as url_rel_user 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 WHERE
cu.user_id IS NULL AND cu.user_id IS NULL AND
access_url_id= $url_access_id AND access_url_id= $url_access_id AND
@ -269,7 +268,7 @@ function get_number_of_users()
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u 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()."' ON u.id = cu.user_id and c_id='".api_get_course_int_id()."'
WHERE cu.user_id IS NULL AND u.status<>".DRH." "; WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
@ -280,9 +279,9 @@ function get_number_of_users()
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u 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()."' ON u.id = cu.user_id AND c_id='".api_get_course_int_id()."'
INNER JOIN $tbl_url_rel_user as url_rel_user 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 "; 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 FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu LEFT JOIN $tbl_session_rel_course_user cu
ON ON
u.user_id = cu.user_id AND u.id = cu.user_id AND
c_id='".api_get_course_int_id()."' AND c_id='".api_get_course_int_id()."' AND
session_id ='".$sessionId."' session_id ='".$sessionId."'
WHERE WHERE
@ -310,7 +309,7 @@ function get_number_of_users()
FROM $user_table u FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu LEFT JOIN $tbl_session_rel_course_user cu
ON ON
u.user_id = cu.user_id AND u.id = cu.user_id AND
c_id='".api_get_course_int_id()."' AND c_id='".api_get_course_int_id()."' AND
session_id ='".$sessionId."' session_id ='".$sessionId."'
INNER JOIN $tbl_url_rel_user as url_rel_user 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); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u 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()."' 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 INNER JOIN $tbl_url_rel_user as url_rel_user
ON (url_rel_user.user_id = u.id) ON (url_rel_user.user_id = u.id)

Write Preview
Loading…
Cancel
Save