Julio Montoya 10 anni fa
parent
commit
d27389ea49

+ 17 - 13
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
  */

+ 0 - 18
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";
-    }
-}
 ?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
 <?php

+ 18 - 10
main/inc/lib/add_courses_to_session_functions.lib.php

@@ -45,14 +45,18 @@ class AddCourseToSession
 
 			if ($type=='single') {
 				// 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
-					FROM '.$tbl_course.' course
-					LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
-						ON course.code = session_rel_course.course_code
-						AND session_rel_course.session_id = '.intval($id_session).'
-					WHERE
-						course.visual_code LIKE "'.$needle.'%" OR
-						course.title LIKE "'.$needle.'%"';
+				$sql = 'SELECT
+							course.code,
+						 	course.visual_code,
+						 	course.title,
+						 	session_rel_course.session_id
+						FROM '.$tbl_course.' course
+						LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
+							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 {
 				$sql = 'SELECT course.code, course.visual_code, course.title
 						FROM '.$tbl_course.' course
@@ -67,10 +71,14 @@ class AddCourseToSession
 				if ($access_url_id != -1){
 
 					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
 								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).'
 								INNER JOIN '.$tbl_course_rel_access_url.' url_course
 								ON (url_course.c_id = course.id)

+ 2 - 2
main/inc/lib/exercise.lib.php

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

+ 1 - 1
main/inc/lib/login.lib.php

@@ -564,7 +564,7 @@ class Login
                                 FROM $tbl_session session, $tbl_session_course_user session_rcru
                                 WHERE
                                    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.session_id  = $session_id AND
                                    session_rcru.status = 2";

+ 5 - 7
main/inc/lib/myspace.lib.php

@@ -1404,7 +1404,7 @@ class MySpace
                     FROM $tbl_user AS u
                     INNER JOIN $tbl_course_rel_user AS cu
                     ON cu.user_id = u.user_id
-                    WHERE cu.course_code = '".$course_code."'";
+                    WHERE cu.c_id = '".$courseId."'";
             $result = Database::query($sql);
             $time_spent = 0;
             $progress = 0;
@@ -1615,13 +1615,12 @@ class MySpace
         // getting all the courses of the user
         $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)) {
             $courseCode = $row->code;
-            $courseInfo = api_get_course_info($row->code);
-            $courseId = $courseInfo['real_id'];
+            $courseId = $row->c_id;
             $return .= '<tr>';
             // course code
             $return .= '    <td width="157px" >'.$row->title.'</td>';
@@ -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;

+ 1 - 1
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);

+ 2 - 2
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

+ 2 - 2
main/mySpace/reussite.php

@@ -44,10 +44,10 @@ if (!empty($_GET['session'])) {
 	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>';
 		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";