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

Fix queries.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent cec228364e
commit d27389ea49
9 changed files with 48 additions and 56 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. 30
      main/admin/course_list.php
  2. 18
      main/admin/subscribe_user2course.php
  3. 28
      main/inc/lib/add_courses_to_session_functions.lib.php
  4. 4
      main/inc/lib/exercise.lib.php
  5. 2
      main/inc/lib/login.lib.php
  6. 12
      main/inc/lib/myspace.lib.php
  7. 2
      main/inc/lib/usermanager.lib.php
  8. 4
      main/mySpace/coaches.php
  9. 4
      main/mySpace/reussite.php

30
main/admin/course_list.php
Unescape View File

@ -170,20 +170,23 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
$session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); $session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$session = Database::get_main_table(TABLE_MAIN_SESSION); $session = Database::get_main_table(TABLE_MAIN_SESSION);
$sql = "SELECT c.code AS col0, $sql = "SELECT
c.title AS col1, c.code AS col0,
c.code AS col2, c.title AS col1,
c.course_language AS col3, c.code AS col2,
c.category_code AS col4, c.course_language AS col3,
c.subscribe AS col5, c.category_code AS col4,
c.unsubscribe AS col6, c.subscribe AS col5,
c.code AS col7, c.unsubscribe AS col6,
c.visibility AS col8, c.code AS col7,
c.directory as col9, c.visibility AS col8,
c.visual_code c.directory as col9,
c.visual_code
FROM $course_table c FROM $course_table c
INNER JOIN $session_rel_course r ON c.code = r.course_code INNER JOIN $session_rel_course r
INNER JOIN $session s ON r.session_id = s.id ON c.id = r.c_id
INNER JOIN $session s
ON r.session_id = s.id
"; ";
if (isset($_GET['session_id']) && !empty($_GET['session_id'])) { if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
@ -206,6 +209,7 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
} }
return $courses; return $courses;
} }
/** /**
* Filter to display the edit-buttons * Filter to display the edit-buttons
*/ */

18
main/admin/subscribe_user2course.php
Unescape View File

@ -226,24 +226,6 @@ $result = Database::query($sql);
$db_courses = Database::store_result($result); $db_courses = Database::store_result($result);
unset($result); unset($result);
if (api_is_multiple_url_enabled()) {
$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sqlNbCours = " SELECT course_rel_user.course_code, course.title
FROM $tbl_course_user as course_rel_user
INNER JOIN $tbl_course as course
ON course.id = course_rel_user.c_id
INNER JOIN $tbl_course_rel_access_url course_rel_url
ON (course_rel_url.c_id = course.id)
WHERE
access_url_id = $access_url_id AND
course_rel_user.user_id='".api_get_user_id()."' AND
course_rel_user.status='1'
ORDER BY course.title";
}
}
?> ?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;"> <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
<?php <?php

28
main/inc/lib/add_courses_to_session_functions.lib.php
Unescape View File

@ -45,14 +45,18 @@ class AddCourseToSession
if ($type=='single') { if ($type=='single') {
// search users where username or firstname or lastname begins likes $needle // search users where username or firstname or lastname begins likes $needle
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.session_id $sql = 'SELECT
FROM '.$tbl_course.' course course.code,
LEFT JOIN '.$tbl_session_rel_course.' session_rel_course course.visual_code,
ON course.code = session_rel_course.course_code course.title,
AND session_rel_course.session_id = '.intval($id_session).' session_rel_course.session_id
WHERE FROM '.$tbl_course.' course
course.visual_code LIKE "'.$needle.'%" OR LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
course.title LIKE "'.$needle.'%"'; ON course.id = session_rel_course.c_id
AND session_rel_course.session_id = '.intval($id_session).'
WHERE
course.visual_code LIKE "'.$needle.'%" OR
course.title LIKE "'.$needle.'%"';
} else { } else {
$sql = 'SELECT course.code, course.visual_code, course.title $sql = 'SELECT course.code, course.visual_code, course.title
FROM '.$tbl_course.' course FROM '.$tbl_course.' course
@ -67,10 +71,14 @@ class AddCourseToSession
if ($access_url_id != -1){ if ($access_url_id != -1){
if ($type=='single') { if ($type=='single') {
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.session_id $sql = 'SELECT
course.code,
course.visual_code,
course.title,
session_rel_course.session_id
FROM '.$tbl_course.' course FROM '.$tbl_course.' course
LEFT JOIN '.$tbl_session_rel_course.' session_rel_course LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
ON course.code = session_rel_course.course_code ON course.id = session_rel_course.c_id
AND session_rel_course.session_id = '.intval($id_session).' AND session_rel_course.session_id = '.intval($id_session).'
INNER JOIN '.$tbl_course_rel_access_url.' url_course INNER JOIN '.$tbl_course_rel_access_url.' url_course
ON (url_course.c_id = course.id) ON (url_course.c_id = course.id)

4
main/inc/lib/exercise.lib.php
Unescape View File

@ -2843,7 +2843,7 @@ class ExerciseLib
e.session_id = a.session_id e.session_id = a.session_id
) )
INNER JOIN $courseTable c INNER JOIN $courseTable c
ON (c.code = a.course_code) ON (c.id = a.c_id)
$courseCondition $courseCondition
WHERE WHERE
exe_exo_id = $exercise_id AND exe_exo_id = $exercise_id AND
@ -3007,7 +3007,7 @@ class ExerciseLib
e.session_id = a.session_id e.session_id = a.session_id
) )
INNER JOIN $courseTable c INNER JOIN $courseTable c
ON c.code = a.course_code ON c.id = a.c_id
$courseCondition $courseCondition
WHERE WHERE
exe_exo_id = $exercise_id AND exe_exo_id = $exercise_id AND

2
main/inc/lib/login.lib.php
Unescape View File

@ -564,7 +564,7 @@ class Login
FROM $tbl_session session, $tbl_session_course_user session_rcru FROM $tbl_session session, $tbl_session_course_user session_rcru
WHERE WHERE
session_rcru.session_id = session.id AND session_rcru.session_id = session.id AND
session_rcru.course_code = '$_cid' AND session_rcru.c_id = '$_real_cid' AND
session_rcru.user_id = '$user_id' AND session_rcru.user_id = '$user_id' AND
session_rcru.session_id = $session_id AND session_rcru.session_id = $session_id AND
session_rcru.status = 2"; session_rcru.status = 2";

12
main/inc/lib/myspace.lib.php
Unescape View File

@ -1404,7 +1404,7 @@ class MySpace
FROM $tbl_user AS u FROM $tbl_user AS u
INNER JOIN $tbl_course_rel_user AS cu INNER JOIN $tbl_course_rel_user AS cu
ON cu.user_id = u.user_id ON cu.user_id = u.user_id
WHERE cu.course_code = '".$course_code."'"; WHERE cu.c_id = '".$courseId."'";
$result = Database::query($sql); $result = Database::query($sql);
$time_spent = 0; $time_spent = 0;
$progress = 0; $progress = 0;
@ -1615,13 +1615,12 @@ class MySpace
// getting all the courses of the user // getting all the courses of the user
$sql = "SELECT * FROM $tbl_course AS c $sql = "SELECT * FROM $tbl_course AS c
INNER JOIN $tbl_session_rel_course AS sc INNER JOIN $tbl_session_rel_course AS sc
ON sc.course_code = c.code ON sc.c_id = c.id
WHERE sc.session_id = '".$session_id."';"; WHERE sc.session_id = '".$session_id."';";
$result = Database::query($sql); $result = Database::query($sql);
while ($row = Database::fetch_object($result)) { while ($row = Database::fetch_object($result)) {
$courseCode = $row->code; $courseCode = $row->code;
$courseInfo = api_get_course_info($row->code); $courseId = $row->c_id;
$courseId = $courseInfo['real_id'];
$return .= '<tr>'; $return .= '<tr>';
// course code // course code
$return .= ' <td width="157px" >'.$row->title.'</td>'; $return .= ' <td width="157px" >'.$row->title.'</td>';
@ -1775,12 +1774,11 @@ class MySpace
// getting all the courses of the session // getting all the courses of the session
$sql = "SELECT * FROM $tbl_course AS c $sql = "SELECT * FROM $tbl_course AS c
INNER JOIN $tbl_session_rel_course AS sc INNER JOIN $tbl_session_rel_course AS sc
ON sc.course_code = c.code ON sc.c_id = c.id
WHERE sc.session_id = '".$session_id."';"; WHERE sc.session_id = '".$session_id."';";
$result = Database::query($sql); $result = Database::query($sql);
while ($row = Database::fetch_object($result)) { while ($row = Database::fetch_object($result)) {
$courseInfo = api_get_course_info($row->code); $courseId = $row->c_id;
$courseId = $courseInfo['real_id'];
$csv_row = array(); $csv_row = array();
$csv_row[] = $session_title; $csv_row[] = $session_title;
$csv_row[] = $row->title; $csv_row[] = $row->title;

2
main/inc/lib/usermanager.lib.php
Unescape View File

@ -4541,7 +4541,7 @@ class UserManager
INNER JOIN '.$table_session_course_user.' sru INNER JOIN '.$table_session_course_user.' sru
ON sru.user_id=u.user_id ON sru.user_id=u.user_id
WHERE WHERE
sru.course_code="'.Database::escape_string($courseCode).'" AND sru.c_id="'.$courseId.'" AND
sru.status=2'; sru.status=2';
$rs = Database::query($sql); $rs = Database::query($sql);
$row = Database::fetch_array($rs); $row = Database::fetch_array($rs);

4
main/mySpace/coaches.php
Unescape View File

@ -61,7 +61,7 @@ if (isset($_GET["id_student"])) {
srcru.user_id=user_id AND srcru.user_id=user_id AND
srcru.status=2 ".$order_clause; srcru.status=2 ".$order_clause;
} else { } else {
$sql_coachs = "SELECT DISTINCT user_id as id_coach, $tbl_user.user_id, lastname, firstname $sql_coachs = "SELECT DISTINCT user_id as id_coach, user.user_id, lastname, firstname
FROM FROM
$tbl_user as user, $tbl_user as user,
$tbl_session_rel_course_user as srcu, $tbl_session_rel_course_user as srcu,
@ -69,7 +69,7 @@ if (isset($_GET["id_student"])) {
$tbl_course as c $tbl_course as c
WHERE WHERE
c.id = course_rel_user.c_id AND c.id = course_rel_user.c_id AND
c.code = srcu.course_code AND c.id = srcu.c_id AND
course_rel_user.status='1' AND course_rel_user.status='1' AND
course_rel_user.user_id='".api_get_user_id()."' AND course_rel_user.user_id='".api_get_user_id()."' AND
srcu.user_id = user.user_id AND srcu.user_id = user.user_id AND

4
main/mySpace/reussite.php
Unescape View File

@ -44,10 +44,10 @@ if (!empty($_GET['session'])) {
if (Database::num_rows($result_session) > 0) { if (Database::num_rows($result_session) > 0) {
echo '<table class="data_table"><tr><th>'.get_lang('Session').'</th><th>'.get_lang('MoyenneTest').'</th><th>'.get_lang('MoyenneExamen').'</th></tr>'; echo '<table class="data_table"><tr><th>'.get_lang('Session').'</th><th>'.get_lang('MoyenneTest').'</th><th>'.get_lang('MoyenneExamen').'</th></tr>';
while ($session = Database::fetch_array($result_session)) { while ($session = Database::fetch_array($result_session)) {
$sql_course = "SELECT title, code, id $sql_course = "SELECT title, code, course.id
FROM $tbl_course as course FROM $tbl_course as course
INNER JOIN $tbl_session_course AS rel_course INNER JOIN $tbl_session_course AS rel_course
ON course.code = rel_course.course_code ON course.id = rel_course.c_id
AND rel_course.session_id = ".$session['id']." AND rel_course.session_id = ".$session['id']."
ORDER BY title ASC"; ORDER BY title ASC";

Write Preview
Loading…
Cancel
Save