From d27389ea49b1f91fbe2e83641071686aae53f149 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 22 Apr 2015 15:24:24 +0200 Subject: [PATCH] Fix queries. --- main/admin/course_list.php | 30 +++++++++++-------- main/admin/subscribe_user2course.php | 18 ----------- .../add_courses_to_session_functions.lib.php | 28 ++++++++++------- main/inc/lib/exercise.lib.php | 4 +-- main/inc/lib/login.lib.php | 2 +- main/inc/lib/myspace.lib.php | 12 ++++---- main/inc/lib/usermanager.lib.php | 2 +- main/mySpace/coaches.php | 4 +-- main/mySpace/reussite.php | 4 +-- 9 files changed, 48 insertions(+), 56 deletions(-) diff --git a/main/admin/course_list.php b/main/admin/course_list.php index 52b862246d..03e8a5f079 100755 --- a/main/admin/course_list.php +++ b/main/admin/course_list.php @@ -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 = Database::get_main_table(TABLE_MAIN_SESSION); - $sql = "SELECT c.code AS col0, - c.title AS col1, - c.code AS col2, - c.course_language AS col3, - c.category_code AS col4, - c.subscribe AS col5, - c.unsubscribe AS col6, - c.code AS col7, - c.visibility AS col8, - c.directory as col9, - c.visual_code + $sql = "SELECT + c.code AS col0, + c.title AS col1, + c.code AS col2, + c.course_language AS col3, + c.category_code AS col4, + c.subscribe AS col5, + c.unsubscribe AS col6, + c.code AS col7, + c.visibility AS col8, + c.directory as col9, + c.visual_code FROM $course_table c - INNER JOIN $session_rel_course r ON c.code = r.course_code - INNER JOIN $session s ON r.session_id = s.id + INNER JOIN $session_rel_course r + 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'])) { @@ -206,6 +209,7 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction } return $courses; } + /** * Filter to display the edit-buttons */ diff --git a/main/admin/subscribe_user2course.php b/main/admin/subscribe_user2course.php index d2452413b5..0eea831bb9 100755 --- a/main/admin/subscribe_user2course.php +++ b/main/admin/subscribe_user2course.php @@ -226,24 +226,6 @@ $result = Database::query($sql); $db_courses = Database::store_result($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"; - } -} ?>
code; - $courseInfo = api_get_course_info($row->code); - $courseId = $courseInfo['real_id']; + $courseId = $row->c_id; $return .= ''; // course code $return .= ' '.$row->title.''; @@ -1775,12 +1774,11 @@ class MySpace // getting all the courses of the session $sql = "SELECT * FROM $tbl_course AS c 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."';"; $result = Database::query($sql); while ($row = Database::fetch_object($result)) { - $courseInfo = api_get_course_info($row->code); - $courseId = $courseInfo['real_id']; + $courseId = $row->c_id; $csv_row = array(); $csv_row[] = $session_title; $csv_row[] = $row->title; diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 8fc7e7a78a..90b453505e 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -4541,7 +4541,7 @@ class UserManager INNER JOIN '.$table_session_course_user.' sru ON sru.user_id=u.user_id WHERE - sru.course_code="'.Database::escape_string($courseCode).'" AND + sru.c_id="'.$courseId.'" AND sru.status=2'; $rs = Database::query($sql); $row = Database::fetch_array($rs); diff --git a/main/mySpace/coaches.php b/main/mySpace/coaches.php index 321b2ab860..fab9fb5fd2 100755 --- a/main/mySpace/coaches.php +++ b/main/mySpace/coaches.php @@ -61,7 +61,7 @@ if (isset($_GET["id_student"])) { srcru.user_id=user_id AND srcru.status=2 ".$order_clause; } 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 $tbl_user as user, $tbl_session_rel_course_user as srcu, @@ -69,7 +69,7 @@ if (isset($_GET["id_student"])) { $tbl_course as c WHERE 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.user_id='".api_get_user_id()."' AND srcu.user_id = user.user_id AND diff --git a/main/mySpace/reussite.php b/main/mySpace/reussite.php index a930999bca..d12f93568e 100755 --- a/main/mySpace/reussite.php +++ b/main/mySpace/reussite.php @@ -44,10 +44,10 @@ if (!empty($_GET['session'])) { if (Database::num_rows($result_session) > 0) { echo ''; 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 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']." ORDER BY title ASC";
'.get_lang('Session').''.get_lang('MoyenneTest').''.get_lang('MoyenneExamen').'