Replace course_rel_user.course_code with course_rel_user.c_id

main/admin/course_edit.php

@@ -34,6 +34,7 @@
 // Get all course categories
 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 $course_code = $courseInfo['code'];
+$courseId = $courseInfo['real_id'];
 
 // Get course teachers
 $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -43,7 +44,7 @@
         WHERE
             course_user.status='1' AND
             course_user.user_id=user.user_id AND
-            course_user.course_code='" . $course_code . "'" .
+            course_user.c_id ='" . $courseId . "'" .
         $order_clause;
 $res = Database::query($sql);
 $course_teachers = array();
@@ -370,17 +371,18 @@
     }
 
     $sql = "INSERT IGNORE INTO " . $course_user_table . " SET
-                course_code = '" . Database::escape_string($course_code) . "',
-                user_id = '" . $tutor_id . "',
-                status = '1',
-                role = '',
-                tutor_id='0',
-                sort='0',
-                user_course_cat='0'";
+            c_id = " . $courseInfo['real_id'] . ",
+            user_id = '" . $tutor_id . "',
+            status = '1',
+            role = '',
+            tutor_id='0',
+            sort='0',
+            user_course_cat='0'";
     Database::query($sql);
 
     if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) {
-        $sql = "UPDATE $course_table SET add_teachers_to_sessions_courses = '$addTeacherToSessionCourses'
+        $sql = "UPDATE $course_table SET
+                add_teachers_to_sessions_courses = '$addTeacherToSessionCourses'
                 WHERE id = " . $courseInfo['real_id'];
         Database::query($sql);
     }

main/admin/course_information.php

@@ -78,6 +78,7 @@ function get_course_usage($course_code, $session_id = 0)
 $sql = "SELECT * FROM $table_course WHERE code = '".$code."'";
 $res = Database::query($sql);
 $course = Database::fetch_object($res);
+$courseId = $course->id;
 $tool_name = $course->title.' ('.$course->visual_code.')';
 Display::display_header($tool_name);
 ?>
@@ -111,8 +112,10 @@ function get_course_usage($course_code, $session_id = 0)
         ON u.user_id = url_rel_user.user_id
         AND url_rel_user.access_url_id = ".intval(api_get_current_access_url_id());
 }
-$sql .= " WHERE cu.user_id = u.user_id AND cu.course_code = '".$code."'
-        AND cu.relation_type <> ".COURSE_RELATION_TYPE_RRHH;
+$sql .= " WHERE
+            cu.user_id = u.user_id AND
+            cu.c_id = '".$courseId."' AND
+            cu.relation_type <> ".COURSE_RELATION_TYPE_RRHH;
 $res = Database::query($sql);
 $is_western_name_order = api_is_western_name_order();
 if (Database::num_rows($res) > 0) {

main/admin/course_user_import.php

@@ -86,14 +86,17 @@ function save_data($users_courses)
         $res = Database::query($sql);
         $db_subscriptions = array();
         while ($obj = Database::fetch_object($res)) {
-            $db_subscriptions[$obj->course_code] = $obj->status;
+            $db_subscriptions[$obj->c_id] = $obj->status;
         }
 
         $to_subscribe   = array_diff(array_keys($csv_subscriptions), array_keys($db_subscriptions));
         $to_unsubscribe = array_diff(array_keys($db_subscriptions), array_keys($csv_subscriptions));
 
         if ($_POST['subscribe']) {
-            foreach ($to_subscribe as $course_code) {
+            foreach ($to_subscribe as $courseId) {
+                $courseInfo = api_get_course_info_by_id($courseId);
+                $course_code = $courseInfo['code'];
+
                 if (CourseManager :: course_exists($course_code)) {
                     CourseManager::subscribe_user(
                         $user_id,
@@ -108,7 +111,10 @@ function save_data($users_courses)
         }
 
         if ($_POST['unsubscribe']) {
-            foreach ($to_unsubscribe as $course_code) {
+            foreach ($to_unsubscribe as $courseId) {
+                $courseInfo = api_get_course_info_by_id($courseId);
+                $course_code = $courseInfo['code'];
+
                 if (CourseManager :: course_exists($course_code)) {
                     CourseManager::unsubscribe_user($user_id, $course_code);
                     $course_info = CourseManager::get_course_information($course_code);

main/admin/course_user_import_by_email.php

@@ -90,14 +90,16 @@ function save_data($users_courses)
         $res = Database::query($sql);
         $db_subscriptions = array();
         while ($obj = Database::fetch_object($res)) {
-            $db_subscriptions[$obj->course_code] = $obj->status;
+            $db_subscriptions[$obj->c_id] = $obj->status;
         }
 
         $to_subscribe   = array_diff(array_keys($csv_subscriptions), array_keys($db_subscriptions));
         $to_unsubscribe = array_diff(array_keys($db_subscriptions), array_keys($csv_subscriptions));
 
         if ($_POST['subscribe']) {
-            foreach ($to_subscribe as $course_code) {
+            foreach ($to_subscribe as $courseId) {
+                $courseInfo = api_get_course_info_by_id($courseId);
+                $course_code = $courseInfo['code'];
                 if (CourseManager :: course_exists($course_code)) {
                     $course_info = CourseManager::get_course_information($course_code);
                     $inserted_in_course[$course_code] = $course_info['title'];
@@ -113,7 +115,9 @@ function save_data($users_courses)
         }
 
         if ($_POST['unsubscribe']) {
-            foreach ($to_unsubscribe as $course_code) {
+            foreach ($to_unsubscribe as $courseId) {
+                $courseInfo = api_get_course_info_by_id($courseId);
+                $course_code = $courseInfo['code'];
                 if (CourseManager :: course_exists($course_code)) {
                     CourseManager::unsubscribe_user($user_id, $course_code);
                     $course_info = CourseManager::get_course_information($course_code);

main/admin/dashboard_add_courses_to_user.php

@@ -156,7 +156,7 @@ function remove_item(origin) {
 $msg = '';
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
     $courses_list = $_POST['CoursesList'];
-    $affected_rows = CourseManager::suscribe_courses_to_hr_manager($user_id,$courses_list);
+    $affected_rows = CourseManager::subscribeCoursesToDrhManager($user_id, $courses_list);
     if ($affected_rows)	{
         $msg = get_lang('AssignedCoursesHaveBeenUpdatedSuccessfully');
     }

main/admin/subscribe_user2course.php

@@ -233,7 +233,7 @@ function validate_filter() {
         $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.code = course_rel_user.course_code
+            ON course.id = course_rel_user.c_id
             INNER JOIN $tbl_course_rel_access_url course_rel_url
             ON (course_rel_url.course_code= course.code)
             WHERE

main/admin/user_export.php

@@ -59,6 +59,8 @@
 	$export = $form->exportValues();
 	$file_type = $export['file_type'];
 	$course_code = Database::escape_string($export['course_code']);
+	$courseInfo = api_get_course_info($course_code);
+	$courseId = $courseInfo['real_id'];
 
 	$sql = "SELECT  u.user_id 	AS UserId,
 					u.lastname 	AS LastName,
@@ -71,7 +73,12 @@
 					u.official_code	AS OfficialCode,
 					u.phone		AS Phone";
 	if (strlen($course_code) > 0) {
-		$sql .= " FROM $user_table u, $course_user_table cu WHERE u.user_id = cu.user_id AND course_code = '$course_code' AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." ORDER BY lastname,firstname";
+		$sql .= " FROM $user_table u, $course_user_table cu
+					WHERE
+						u.user_id = cu.user_id AND
+						cu.c_id = '$courseId' AND
+						cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
+					ORDER BY lastname,firstname";
 		$filename = 'export_users_'.$course_code.'_'.date('Y-m-d_H-i-s');
 	} else {
 		global $_configuration;

main/admin/user_information.php

@@ -258,9 +258,11 @@
 /**
  * Show the courses in which this user is subscribed
  */
-$sql = 'SELECT * FROM '.$table_course_user.' cu, '.$table_course.' c'.
-    ' WHERE cu.user_id = '.$user['user_id'].' AND cu.course_code = c.code '.
-    ' AND cu.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' ';
+$sql = 'SELECT * FROM '.$table_course_user.' cu, '.$table_course.' c
+        WHERE
+            cu.user_id = '.$user['user_id'].' AND
+            cu.c_id = c.id AND
+            cu.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' ';
 $res = Database::query($sql);
 if (Database::num_rows($res) > 0) {
     $header = array(
@@ -283,14 +285,15 @@
     $data = array();
     $courseToolInformationTotal = null;
     while ($course = Database::fetch_object($res)) {
-        $courseInfo = api_get_course_info($course->code);
+        $courseInfo = api_get_course_info_by_id($course->c_id);
+        $courseCode = $courseInfo['code'];
         $courseToolInformation = null;
 
-        $tools = '<a href="course_information.php?code='.$course->code.'">'.Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
+        $tools = '<a href="course_information.php?code='.$courseCode.'">'.Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
             '<a href="'.api_get_path(WEB_COURSE_PATH).$course->directory.'">'.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>' .
-            '<a href="course_edit.php?course_code='.$course->code.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+            '<a href="course_edit.php?course_code='.$courseCode.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
         if ($course->status == STUDENT) {
-            $tools .= '<a href="user_information.php?action=unsubscribe&course_code='.$course->code.'&user_id='.$user['user_id'].'">'.
+            $tools .= '<a href="user_information.php?action=unsubscribe&course_code='.$courseCode.'&user_id='.$user['user_id'].'">'.
                 Display::return_icon('delete.png', get_lang('Delete')).'</a>';
         }
 
@@ -309,7 +312,7 @@
         );
 
         $row = array(
-            Display::url($course->code, $courseInfo['course_public_url']),
+            Display::url($courseCode, $courseInfo['course_public_url']),
             $course->title,
             $course->status == STUDENT ? get_lang('Student') : get_lang('Teacher'),
             $timeSpent,

main/auth/courses_controller.php

@@ -245,7 +245,10 @@ public function add_course_category($category_title)
      */
     public function change_course_category($course_code, $category_id)
     {
-        $result = $this->model->store_changecoursecategory($course_code, $category_id);
+        $courseInfo = api_get_course_info($course_code);
+        $courseId = $courseInfo['id'];
+
+        $result = $this->model->store_changecoursecategory($courseId, $category_id);
         $message = '';
         if ($result) {
             $message = get_lang('EditCourseCategorySucces');

main/chat/chat_whoisonline.php

@@ -12,6 +12,7 @@
 require_once '../inc/global.inc.php';
 
 $course = api_get_course_id();
+$courseInfo = api_get_course_info();
 $group_id = api_get_group_id();
 $session_id = api_get_session_id();
 $user_id = api_get_user_id();
@@ -54,7 +55,7 @@
 				  		t1.user_id=t2.user_id AND
 				  		t3.user_id=t2.user_id AND
 						t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
-						t3.course_code = '".$_course['sysCode']."' AND
+						t3.c_id = '".$courseInfo['id']."' AND
 						t2.last_connection>'".$date_inter."' $extra_condition
 						ORDER BY username";
         $result = Database::query($query);

main/course_info/infocours.php

@@ -31,6 +31,7 @@
 $is_allowedToEdit = $is_courseAdmin || $is_platformAdmin;
 
 $course_code = api_get_course_id();
+$courseId = api_get_course_int_id();
 $course_access_settings = CourseManager:: get_access_settings($course_code);
 
 //LOGIC FUNCTIONS
@@ -62,7 +63,7 @@ function is_settings_editable() {
 $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
 $s_sql_course_titular = "SELECT DISTINCT username, lastname, firstname
     FROM $tbl_user as user, $tbl_course_user as course_rel_user
-    WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND course_code='".$course_code."'
+    WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND c_id ='".$courseId."'
     ORDER BY ".$target_name." ASC";
 $q_result_titulars = Database::query($s_sql_course_titular);
 

main/coursecopy/copy_course.php

@@ -86,22 +86,23 @@
     $course_info = api_get_course_info();
     $sql = 'SELECT *
             FROM '.$table_c.' c, '.$table_cu.' cu
-            WHERE cu.course_code = c.code';
+            WHERE cu.c_id = c.id';
     if (!api_is_platform_admin()) {
         $sql .= ' AND cu.status=1 ';
     }
     $sql .= ' AND
         target_course_code IS NULL AND
         cu.user_id = '.$user_info['user_id'].' AND
-        c.code != '."'".$course_info['sysCode']."'".'
+        c.c_id != '."'".$course_info['id']."'".'
     ORDER BY title ASC';
     $res = Database::query($sql);
     if (Database::num_rows($res) == 0) {
         Display::display_normal_message(get_lang('NoDestinationCoursesAvailable'));
     } else {
         $options = array();
         while ($obj = Database::fetch_object($res)) {
-            $options[$obj->code] = $obj->title;
+            $courseInfo = api_get_course_info_by_id($obj->c_id);
+            $options[$courseInfo['code']] = $obj->title;
         }
 
         $form = new FormValidator('copy_course', 'post', 'copy_course.php?'.api_get_cidreq());

main/exercice/question_pool.php

@@ -269,8 +269,7 @@ function confirm_your_choice() {
     if (api_is_platform_admin()) {
         $courseInfo = api_get_course_info();
         if (!empty($course_list)) {
-            $courseIdList = array_keys($course_list);
-            if (!in_array($courseInfo['real_id'], $courseIdList)) {
+            if (!in_array($courseInfo['real_id'], $course_list)) {
                 $course_list = array_merge($course_list, array($courseInfo));
             }
         } else {

main/forum/viewthread_flat.inc.php

@@ -79,7 +79,7 @@
                 }
             }
 
-            $user_status = api_get_status_of_user_in_course($row['user_id'], api_get_course_id());
+            $user_status = api_get_status_of_user_in_course($row['user_id'], api_get_course_int_id());
             $current_qualify_thread = show_qualify('1', $row['poster_id'],$_GET['thread']);
 
             if (api_is_allowed_to_edit(null,true) && $origin != 'learnpath') {

main/forum/viewthread_nested.inc.php

@@ -92,7 +92,7 @@
     }
 
     $userinf = api_get_user_info($post['user_id']);
-    $user_status = api_get_status_of_user_in_course($post['user_id'],api_get_course_id());
+    $user_status = api_get_status_of_user_in_course($post['user_id'], api_get_course_int_id());
     if (api_is_allowed_to_edit(null,true)) {
         //if ($count>0 && $user_status!=1) {
         if ($count>0) {

main/forum/viewthread_threaded.inc.php

@@ -313,7 +313,7 @@
 $userinf = api_get_user_info($rows[$display_post_id]['user_id']);
 $user_status = api_get_status_of_user_in_course(
     $rows[$display_post_id]['user_id'],
-    api_get_course_id()
+    api_get_course_int_id()
 );
 if (api_is_allowed_to_edit(null, true)) {
     if ($post_id > $post_minor) {

main/gradebook/lib/GradebookUtils.php

@@ -942,25 +942,27 @@ public static function score_badges($list_values)
 
     /**
      * returns users within a course given by param
-     * @param int $course_id
+     * @param string $courseCode
      */
-    public static function get_users_in_course($course_id)
+    public static function get_users_in_course($courseCode)
     {
         $tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
         $tbl_session_course_user = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
         $tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
         $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname ASC' : ' ORDER BY lastname, firstname ASC';
 
         $current_session = api_get_session_id();
-        $course_id = Database::escape_string($course_id);
+        $courseCode = Database::escape_string($courseCode);
+        $courseInfo = api_get_course_info($courseCode);
+        $courseId = $courseInfo['id'];
 
         if (!empty($current_session)) {
             $sql = "SELECT user.user_id, user.username, lastname, firstname, official_code
                     FROM $tbl_session_course_user as scru, $tbl_user as user
                     WHERE
                         scru.id_user=user.user_id AND
                         scru.status=0  AND
-                        scru.course_code='$course_id' AND
+                        scru.course_code='$courseCode' AND
                         id_session ='$current_session'
                     $order_clause
                     ";
@@ -970,8 +972,8 @@ public static function get_users_in_course($course_id)
                     WHERE
                         course_rel_user.user_id=user.user_id AND
                         course_rel_user.status='.STUDENT.' AND
-                        course_rel_user.course_code = "'.$course_id.'" '.
-                $order_clause;
+                        course_rel_user.c_id = "'.$courseId.'" '.
+                    $order_clause;
         }
 
         $result = Database::query($sql);
@@ -1082,8 +1084,8 @@ public static function find_students($mask= '')
         if (!api_is_platform_admin()) {
             $sql .= ' AND user.user_id = cru.user_id AND
                       cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' AND
-                      cru.course_code in (
-                            SELECT course_code FROM '.$tbl_cru . '
+                      cru.c_id in (
+                            SELECT c_id FROM '.$tbl_cru . '
                             WHERE
                                 user_id = ' . api_get_user_id() . ' AND
                                 status = ' . COURSEMANAGER . '