diff --git a/main/admin/course_information.php b/main/admin/course_information.php index 7395550635..4a05150d0c 100755 --- a/main/admin/course_information.php +++ b/main/admin/course_information.php @@ -153,9 +153,8 @@ if (Database::num_rows($res) > 0) { } else { echo get_lang('NoUsersInCourse'); } -$courseInfo = api_get_course_info($course->code); -$session_list = SessionManager::get_session_by_course($courseInfo['real_id']); +$session_list = SessionManager::get_session_by_course($course->id); $url = api_get_path(WEB_CODE_PATH); if (!empty($session_list)) { diff --git a/main/admin/session_import.php b/main/admin/session_import.php index bddd3ca418..7ea9219c0a 100755 --- a/main/admin/session_import.php +++ b/main/admin/session_import.php @@ -380,8 +380,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { if ($vcourse['code'] == $course_code) { // Ignore, this has already been inserted. } else { - $course_info = api_get_course_info($course['code']); - $courseId = $course_info['real_id']; + $course_info = api_get_course_info_by_id($course['id']); + $courseId = $course['real_id']; $sql_course = "INSERT INTO $tbl_session_course SET c_id = $courseId, diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php index 223f08c3f3..0fcf143e97 100644 --- a/main/admin/teacher_time_report.php +++ b/main/admin/teacher_time_report.php @@ -187,7 +187,7 @@ if (!empty($selectedTeacher)) { if (!empty($courses)) { foreach ($courses as $course) { - $courseInfo = api_get_course_info($course['code']); + $courseInfo = api_get_course_info_by_id($course['real_id']); $totalTime = UserManager::getExpendedTimeInCourses( $selectedTeacher, @@ -219,11 +219,11 @@ if (!empty($selectedTeacher)) { 'name' => $session['name'] ); - $courseInfo = api_get_course_info($course['course_code']); + $courseInfo = api_get_course_info_by_id($course['c_id']); $totalTime = UserManager::getExpendedTimeInCourses( $selectedTeacher, - $course['real_id'], + $course['c_id'], $session['id'], $selectedFrom, $selectedUntil @@ -233,7 +233,7 @@ if (!empty($selectedTeacher)) { $timeReport->data[] = array( 'session' => $sessionData, 'course' => array( - 'id' => $courseInfo['real_id'], + 'id' => $course['c_id'], 'name' => $courseInfo['title'] ), 'coach' => $teacherData, @@ -249,7 +249,11 @@ if (empty($selectedCourse) && empty($selectedSession) && empty($selectedTeacher) 'username' => $teacher['username'], 'completeName' => $teacher['completeName'], ), - 'totalTime' => SessionManager::getTotalUserTimeInPlatform($teacher['user_id'], $selectedFrom, $selectedUntil) + 'totalTime' => SessionManager::getTotalUserTimeInPlatform( + $teacher['user_id'], + $selectedFrom, + $selectedUntil + ) ); } } diff --git a/main/admin/user_information.php b/main/admin/user_information.php index 58ce04a8aa..0dcda04cc8 100755 --- a/main/admin/user_information.php +++ b/main/admin/user_information.php @@ -137,7 +137,7 @@ if (count($sessions) > 0) { $csvContent[] = array($session_item['session_name']); $csvContent[] = $headerList; foreach ($session_item['courses'] as $my_course) { - $courseInfo = api_get_course_info($my_course['code']); + $courseInfo = api_get_course_info_by_id($my_course['real_id']); $sessionStatus = SessionManager::get_user_status_in_session( $user['user_id'], $courseInfo['real_id'], diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php index 8a4c5a5457..d6f8ab43df 100755 --- a/main/admin/user_move_stats.php +++ b/main/admin/user_move_stats.php @@ -669,7 +669,9 @@ if (!empty($user_list)) { if (is_array($course_list) && !empty($course_list)) { foreach ($course_list as $my_course) { - $key = $my_course['code'].'_'.$my_course['session_id']; + $courseInfo = api_get_course_info_by_id($my_course['c_id']); + $my_course['real_id'] = $my_course['c_id']; + $key = $courseInfo['code'].'_'.$my_course['session_id']; if (!in_array($key, $new_course_list)) { $my_course['not_registered'] = 1; @@ -679,7 +681,7 @@ if (!empty($user_list)) { } foreach ($course_list_registered as & $course) { - $courseInfo = api_get_course_info($course['code']); + $courseInfo = api_get_course_info_by_id($course['real_id']); $course['name'] = $courseInfo['name']; } diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index ba2cb60260..ccdf3a4049 100755 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -51,7 +51,7 @@ $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT); $tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY); $course_id = api_get_course_int_id(); -$_course = api_get_course_info(); +$_course = api_get_course_info_by_id($course_id); $group_id = api_get_group_id(); api_protect_course_group(GroupManager::GROUP_TOOL_ANNOUNCEMENT); diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php index da93a5ec6d..703f875abe 100755 --- a/main/course_info/infocours.php +++ b/main/course_info/infocours.php @@ -434,7 +434,7 @@ if ($form->validate() && is_settings_editable()) { isset($_configuration[$urlId]['hosting_limit_active_courses']) && $_configuration[$urlId]['hosting_limit_active_courses'] > 0 ) { - $courseInfo = api_get_course_info($course_code); + $courseInfo = api_get_course_info_by_id($courseId); // Check if if ($courseInfo['visibility'] == COURSE_VISIBILITY_HIDDEN && diff --git a/main/coursecopy/copy_course_session_selected.php b/main/coursecopy/copy_course_session_selected.php index 7b0685d763..d25e8e31ce 100644 --- a/main/coursecopy/copy_course_session_selected.php +++ b/main/coursecopy/copy_course_session_selected.php @@ -29,8 +29,9 @@ if (!api_is_coach()) { api_not_allowed(true); } -$courseCode = api_get_course_id(); -$courseInfo = api_get_course_info($courseCode); +$courseId = api_get_course_int_id(); +$courseInfo = api_get_course_info($courseId); +$courseCode = $courseInfo['code']; $sessionId = api_get_session_id(); if (empty($courseCode) OR empty($sessionId)) { diff --git a/main/document/show_content.php b/main/document/show_content.php index fcdeb86c59..925fd9a43d 100755 --- a/main/document/show_content.php +++ b/main/document/show_content.php @@ -14,8 +14,9 @@ $noPHP_SELF = true; $header_file = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; $document_id = intval($_GET['id']); -$course_info = api_get_course_info(); -$course_code = api_get_course_id(); +$courseId = api_get_course_int_id(); +$course_info = api_get_course_info_by_id($courseId); +$course_code = $course_info['code']; $session_id = api_get_session_id(); if (empty($course_info)) { diff --git a/main/exercice/TestCategory.php b/main/exercice/TestCategory.php index c647555128..59b58633ae 100644 --- a/main/exercice/TestCategory.php +++ b/main/exercice/TestCategory.php @@ -85,8 +85,8 @@ class TestCategory Database::query($sql); // add test_category in item_property table - $course_code = api_get_course_id(); - $course_info = api_get_course_info($course_code); + $course_id = api_get_course_int_id(); + $course_info = api_get_course_info_by_id($course_id); api_item_property_update( $course_info, TOOL_TEST_CATEGORY, @@ -117,13 +117,13 @@ class TestCategory if (Database::affected_rows($result) <= 0) { return false; } else { + $course_id = api_get_course_int_id(); // remove link between question and category $sql2 = "DELETE FROM $tbl_question_rel_cat - WHERE category_id=$v_id AND c_id=".api_get_course_int_id(); + WHERE category_id=$v_id AND c_id=".$course_id; Database::query($sql2); // item_property update - $course_code = api_get_course_id(); - $course_info = api_get_course_info($course_code); + $course_info = api_get_course_info_by_id($course_id); api_item_property_update( $course_info, TOOL_TEST_CATEGORY, @@ -151,8 +151,8 @@ class TestCategory return false; } else { // item_property update - $course_code = api_get_course_id(); - $course_info = api_get_course_info($course_code); + $course_id = api_get_course_int_id(); + $course_info = api_get_course_info_by_id($course_id); api_item_property_update( $course_info, TOOL_TEST_CATEGORY, diff --git a/main/exercice/exercise.php b/main/exercice/exercise.php index 0258cdee3c..5b1a41f8de 100644 --- a/main/exercice/exercise.php +++ b/main/exercice/exercise.php @@ -37,9 +37,9 @@ $is_allowedToEdit = api_is_allowed_to_edit(null, true); $is_tutor = api_is_allowed_to_edit(true); $is_tutor_course = api_is_course_tutor(); $courseInfo = api_get_course_info(); -$courseId = api_get_course_int_id(); -$userId = api_get_user_id(); +$courseId = $courseInfo['real_id']; $userInfo = api_get_user_info(); +$userId = $userInfo['id']; $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh( $userId, $courseInfo diff --git a/main/forum/download.php b/main/forum/download.php index c62d874e45..fa04e1694c 100755 --- a/main/forum/download.php +++ b/main/forum/download.php @@ -54,6 +54,7 @@ $tbl_forum_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT); $tbl_forum_post = Database::get_course_table(TABLE_FORUM_POST); $course_id = api_get_course_int_id(); +$courseInfo = api_get_course_info_by_id($course_id); // launch event Event::event_download($doc_url); @@ -71,13 +72,13 @@ $result = Database::query($sql); $row = Database::fetch_array($result); $forum_thread_visibility = api_get_item_visibility( - api_get_course_info($course_code), + $courseInfo, TOOL_FORUM_THREAD, $row['thread_id'], api_get_session_id() ); $forum_forum_visibility = api_get_item_visibility( - api_get_course_info($course_code), + $courseInfo, TOOL_FORUM, $row['forum_id'], api_get_session_id() @@ -86,7 +87,7 @@ $forum_forum_visibility = api_get_item_visibility( if ($forum_thread_visibility==1 && $forum_forum_visibility==1) { if (Security::check_abs_path( $full_file_name, - api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/forum/') + api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/upload/forum/') ) { DocumentManager::file_send_for_download( $full_file_name, diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index a2f4bfce13..c4951d28d8 100755 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -2240,7 +2240,7 @@ function count_number_of_forums_in_category($cat_id) */ function store_thread($current_forum, $values, $courseInfo = array(), $showMessage = true) { - $courseInfo = empty($courseInfo) ? api_get_course_info() :$courseInfo ; + $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo ; $_user = api_get_user_info(); $course_id = $courseInfo['real_id']; $courseCode = $courseInfo['code']; diff --git a/main/gradebook/exercise_jump.php b/main/gradebook/exercise_jump.php index 6d28faf6c8..26b35c22a3 100755 --- a/main/gradebook/exercise_jump.php +++ b/main/gradebook/exercise_jump.php @@ -14,8 +14,8 @@ require_once '../inc/global.inc.php'; api_block_anonymous_users(); $this_section=SECTION_COURSES; -$course_code = api_get_course_id(); -$course_info = api_get_course_info($course_code); +$course_id = api_get_course_int_id(); +$course_info = api_get_course_info_by_id($course_id); $course_title = $course_info['title']; $course_code = $return_result['code']; $gradebook = Security::remove_XSS($_GET['gradebook']); diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php index 21ed30f40e..47be580da5 100644 --- a/main/gradebook/lib/GradebookUtils.php +++ b/main/gradebook/lib/GradebookUtils.php @@ -1211,7 +1211,7 @@ class GradebookUtils continue; } - $courseInfo = api_get_course_info($course['code']); + $courseInfo = api_get_course_info_by_id($course['real_id']); $courseList[] = [ 'course' => $courseInfo['title'], diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index 00e1af6361..63ba04c8dd 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -288,7 +288,7 @@ class Category implements GradebookItem return $cats; } - $courseCode = api_get_course_info(api_get_course_id()); + $courseCode = api_get_course_info_by_id(api_get_course_int_id()); $courseCode = $courseCode['code']; $session_id = intval($session_id); diff --git a/main/inc/ajax/course.ajax.php b/main/inc/ajax/course.ajax.php index 278ef93483..9be4136fe7 100755 --- a/main/inc/ajax/course.ajax.php +++ b/main/inc/ajax/course.ajax.php @@ -28,7 +28,7 @@ switch ($action) { $list_course_all_info = CourseManager::get_courses_list_by_user_id($user_id, false); if (!empty($list_course_all_info)) { foreach ($list_course_all_info as $course_item) { - $course_info = api_get_course_info($course_item['code']); + $course_info = api_get_course_info_by_id($course_item['real_id']); echo $course_info['title'].'
'; } } else { diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index 435ed724a9..26a09d5341 100755 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -184,7 +184,7 @@ switch ($action) { } break; case 'update_question_order': - $course_info = api_get_course_info($course_code); + $course_info = api_get_course_info_by_id($course_id); $course_id = $course_info['real_id']; $exercise_id = isset($_REQUEST['exercise_id']) ? $_REQUEST['exercise_id'] : null; @@ -221,7 +221,7 @@ switch ($action) { } break; case 'save_exercise_by_now': - $course_info = api_get_course_info($course_code); + $course_info = api_get_course_info_by_id($course_id); $course_id = $course_info['real_id']; // Use have permissions? diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php index c27be50c7b..3a5994e339 100755 --- a/main/inc/lib/AnnouncementManager.php +++ b/main/inc/lib/AnnouncementManager.php @@ -1623,9 +1623,9 @@ class AnnouncementManager $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT); $tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY); - $course_id = api_get_course_int_id(); - $_course = api_get_course_info(); $session_id = api_get_session_id(); + $_course = api_get_course_info(); + $course_id = $_course['real_id']; $userId = api_get_user_id(); $condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id'); diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index cfdc6da2de..9e69db31a3 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -931,7 +931,7 @@ class Agenda $my_session_id = $session_item['session_id']; if (!empty($my_courses)) { foreach ($my_courses as $course_item) { - $courseInfo = api_get_course_info($course_item['code']); + $courseInfo = api_get_course_info_by_id($course_item['real_id']); $this->getCourseEvents($start, $end, $courseInfo, 0, $my_session_id); } } @@ -2953,7 +2953,7 @@ class Agenda // get agenda-items for every course $courses = api_get_user_courses($user_id,false); foreach ($courses as $id => $course) { - $c = api_get_course_info($course['code']); + $c = api_get_course_info_by_id($course['real_id']); //databases of the courses $t_a = Database :: get_course_table(TABLE_AGENDA, $course['db']); $t_ip = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course['db']); diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 2e7fb445d9..f0983aa9bb 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -1322,7 +1322,7 @@ function api_get_user_courses($userid, $fetch_session = true) $t_course = Database::get_main_table(TABLE_MAIN_COURSE); $t_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); - $sql = "SELECT cc.code code, cc.directory dir, cu.status status + $sql = "SELECT cc.id as real_id, cc.code code, cc.directory dir, cu.status status FROM $t_course cc, $t_course_user cu WHERE @@ -1406,7 +1406,7 @@ function _api_format_user($user, $add_password = false) $result['email'] = isset($user['mail'])? $user['mail'] : null; } $user_id = intval($user['user_id']); - $result['user_id'] = $user_id; + $result['user_id'] = $result['id'] = $user_id; $saveUserLastLogin = api_get_configuration_value('save_user_last_login'); if ($saveUserLastLogin) { diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index a59324080a..8aaccee51f 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -293,8 +293,8 @@ class Attendance $table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); $session_id = api_get_session_id(); $user_id = api_get_user_id(); - $course_code = api_get_course_id(); - $course_id = api_get_course_int_id(); + $course_code = $_course['code']; + $course_id = $_course['real_id']; $title_gradebook= Database::escape_string($this->attendance_qualify_title); $value_calification = 0; $weight_calification = floatval($this->attendance_weight); @@ -364,8 +364,8 @@ class Attendance $session_id = api_get_session_id(); $user_id = api_get_user_id(); $attendance_id = intval($attendance_id); - $course_code = api_get_course_id(); - $course_id = api_get_course_int_id(); + $course_code = $_course['code']; + $course_id = $_course['real_id']; $title_gradebook = Database::escape_string($this->attendance_qualify_title); $value_calification = 0; $weight_calification= floatval($this->attendance_weight); @@ -418,7 +418,7 @@ class Attendance $_course = api_get_course_info(); $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); $user_id = api_get_user_id(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; if (is_array($attendance_id)) { foreach ($attendance_id as $id) { $id = intval($id); @@ -456,7 +456,7 @@ class Attendance $_course = api_get_course_info(); $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); $user_id = api_get_user_id(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; if (is_array($attendance_id)) { foreach ($attendance_id as $id) { $id = intval($id); @@ -500,7 +500,7 @@ class Attendance $_course = api_get_course_info(); $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); $user_id = api_get_user_id(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; $status = intval($status); $action = 'visible'; diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index aee8ddda32..3c16d9cbc2 100755 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -201,7 +201,7 @@ function return_logo($theme) { function return_notification_menu() { $_course = api_get_course_info(); - $course_id = api_get_course_id(); + $course_id = $_course['code']; $user_id = api_get_user_id(); $html = ''; @@ -497,7 +497,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) $session_name = api_get_session_name($session_id); $_course = api_get_course_info(); $user_id = api_get_user_id(); - $course_id = api_get_course_id(); + $course_id = $_course['real_id']; /* Plugins for banner section */ $web_course_path = api_get_path(WEB_COURSE_PATH); diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index af9b366bec..2f00635e60 100755 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -282,7 +282,7 @@ class Blog { $_user = api_get_user_info(); $_course = api_get_course_info(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT); $upload_ok=true; @@ -2010,7 +2010,7 @@ class Blog $_course = api_get_course_info(); $is_western_name_order = api_is_western_name_order(); $session_id = api_get_session_id(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; $currentCourse = $_course['code']; $tbl_users = Database::get_main_table(TABLE_MAIN_USER); diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php index 974667dcb7..7c9ef7c5b3 100755 --- a/main/inc/lib/fileUpload.lib.php +++ b/main/inc/lib/fileUpload.lib.php @@ -1677,8 +1677,6 @@ function move_uploaded_file_collection_into_directory( */ function replace_img_path_in_html_file($original_img_path, $new_img_path, $html_file) { - $_course = api_get_course_info(); - // Open the file $fp = fopen($html_file, 'r'); diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php index b96552713a..6476a51baf 100755 --- a/main/inc/lib/groupmanager.lib.php +++ b/main/inc/lib/groupmanager.lib.php @@ -160,7 +160,7 @@ class GroupManager { $_course = api_get_course_info(); $session_id = api_get_session_id(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; $currentCourseRepository = $_course['path']; diff --git a/main/inc/lib/link.lib.php b/main/inc/lib/link.lib.php index 7a568c6f15..82cc361292 100755 --- a/main/inc/lib/link.lib.php +++ b/main/inc/lib/link.lib.php @@ -156,8 +156,8 @@ class Link extends Model global $msgErr; $ok = true; - $course_id = api_get_course_int_id(); $_course = api_get_course_info(); + $course_id = $_course['real_id']; $session_id = api_get_session_id(); if ($type == 'link') { @@ -231,8 +231,8 @@ class Link extends Model LIBRARY_PATH ) . 'specific_fields_manager.lib.php'; - $course_int_id = api_get_course_int_id(); - $courseid = api_get_course_id(); + $course_int_id = $_course['real_id']; + $courseCode = $_course['code']; $specific_fields = get_specific_field_list(); $ic_slide = new IndexableChunk(); @@ -251,7 +251,7 @@ class Link extends Model ); add_specific_field_value( $specific_field['id'], - $courseid, + $courseCode, TOOL_LINK, $link_id, $sterm @@ -263,10 +263,10 @@ class Link extends Model // Build the chunk to index. $ic_slide->addValue('title', $title); - $ic_slide->addCourseId($courseid); + $ic_slide->addCourseId($courseCode); $ic_slide->addToolId(TOOL_LINK); $xapian_data = array( - SE_COURSE_ID => $courseid, + SE_COURSE_ID => $courseCode, SE_TOOL_ID => TOOL_LINK, SE_DATA => array( 'link_id' => (int)$link_id @@ -320,7 +320,7 @@ class Link extends Model $sql, $tbl_se_ref, $course_int_id, - $courseid, + $courseCode, TOOL_LINK, $link_id, $did @@ -351,11 +351,11 @@ class Link extends Model $order = intval($order); $session_id = api_get_session_id(); $sql = "INSERT INTO " . $tbl_categories . " (c_id, category_title, description, display_order, session_id) - VALUES (" . $course_id . ", + VALUES ($course_id, '" . Database::escape_string($category_title) . "', '" . Database::escape_string($description) . "', '$order', - '$session_id' + $session_id )"; Database:: query($sql); $linkId = Database:: insert_id(); @@ -389,7 +389,7 @@ class Link extends Model $tbl_link = Database:: get_course_table(TABLE_LINK); $tbl_categories = Database:: get_course_table(TABLE_LINK_CATEGORY); - $course_id = api_get_course_int_id(); + $course_id = $courseInfo['real_id']; $id = intval($id); if (empty($id)) { @@ -508,8 +508,8 @@ class Link extends Model public static function editLink($id, $values = array()) { $tbl_link = Database:: get_course_table(TABLE_LINK); - $course_id = api_get_course_int_id(); $_course = api_get_course_info(); + $course_id = $_course['real_id']; $values['url'] = trim($values['url']); $values['title'] = trim($values['title']); diff --git a/main/inc/lib/search/tool_processors/link_processor.class.php b/main/inc/lib/search/tool_processors/link_processor.class.php index dc2b8fba1f..3518ff2fb6 100755 --- a/main/inc/lib/search/tool_processors/link_processor.class.php +++ b/main/inc/lib/search/tool_processors/link_processor.class.php @@ -40,10 +40,10 @@ class link_processor extends search_processor { public function process() { $results = array(); - foreach ($this->links as $courseid => $one_course_links) { - $course_info = api_get_course_info($courseid); + foreach ($this->links as $courseCode => $one_course_links) { + $course_info = api_get_course_info($courseCode); $search_show_unlinked_results = (api_get_setting('search_show_unlinked_results') == 'true'); - $course_visible_for_user = api_is_course_visible_for_user(NULL, $courseid); + $course_visible_for_user = api_is_course_visible_for_user(NULL, $courseCode); // can view course? if ($course_visible_for_user || $search_show_unlinked_results) { $result = NULL; @@ -53,7 +53,7 @@ class link_processor extends search_processor { if ($visibility) { // if one is visible let show the result for a course // also asume all data of this item like the data of the whole group of links(Ex. author) - list($thumbnail, $image, $name, $author, $url) = $this->get_information($courseid, $one_link['link_id']); + list($thumbnail, $image, $name, $author, $url) = $this->get_information($courseCode, $one_link['link_id']); $result_tmp = array( 'toolid' => TOOL_LINK, 'score' => $one_course_links['total_score'] / (count($one_course_links) - 1), // not count total_score array item diff --git a/main/inc/lib/search/tool_processors/quiz_processor.class.php b/main/inc/lib/search/tool_processors/quiz_processor.class.php index 8304c3fcd6..32019a0afc 100755 --- a/main/inc/lib/search/tool_processors/quiz_processor.class.php +++ b/main/inc/lib/search/tool_processors/quiz_processor.class.php @@ -106,8 +106,8 @@ class quiz_processor extends search_processor { /** * Get learning path information */ - private function get_information($course_id, $exercise_id) { - $course_information = api_get_course_info($course_id); + private function get_information($courseCode, $exercise_id) { + $course_information = api_get_course_info($courseCode); $course_id = $course_information['real_id']; if (!empty($course_information)) { @@ -118,9 +118,11 @@ class quiz_processor extends search_processor { $dk_result = Database::query($sql); //actually author isn't saved on exercise tool, but prepare for when it's ready + /* $sql = "SELECT insert_user_id FROM $item_property_table WHERE ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id LIMIT 1"; + */ $name = ''; if ($row = Database::fetch_array($dk_result)) { diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 2b48ef17b7..5e6c284cd1 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -2048,7 +2048,7 @@ class SessionManager foreach ($existingCourses as $existingCourse) { if (!in_array($existingCourse['c_id'], $courseList)) { - $courseInfo = api_get_course_info($existingCourse['c_id']); + $courseInfo = api_get_course_info_by_id($existingCourse['c_id']); $sql = "DELETE FROM $tbl_session_rel_course WHERE c_id = '" . $existingCourse['c_id'] . "' AND session_id = $sessionId"; @@ -2059,7 +2059,7 @@ class SessionManager Database::query($sql); CourseManager::remove_course_ranking( - $courseInfo['real_id'], + $existingCourse['c_id'], $sessionId ); @@ -2082,7 +2082,7 @@ class SessionManager if (!$exists) { //if the course isn't subscribed yet $sql = "INSERT INTO $tbl_session_rel_course (session_id, c_id) - VALUES ('$sessionId', '$courseId')"; + VALUES ($sessionId, $courseId)"; Database::query($sql); // We add the current course in the existing courses array, @@ -2095,22 +2095,22 @@ class SessionManager foreach ($user_list as $enreg_user) { $enreg_user_id = intval($enreg_user['user_id']); $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (session_id, c_id, user_id) - VALUES ($sessionId, '$courseId', $enreg_user_id)"; + VALUES ($sessionId, $courseId, $enreg_user_id)"; $result = Database::query($sql); if (Database::affected_rows($result)) { $nbr_users++; } } $sql = "UPDATE $tbl_session_rel_course - SET nbr_users=$nbr_users - WHERE session_id ='$sessionId' AND c_id='$courseId'"; + SET nbr_users = $nbr_users + WHERE session_id = $sessionId AND c_id = $courseId"; Database::query($sql); } } $sql = "UPDATE $tbl_session SET nbr_courses = $nbr_courses - WHERE id = '$sessionId'"; + WHERE id = $sessionId"; Database::query($sql); } @@ -5617,7 +5617,7 @@ class SessionManager /** * Get the courses list by a course coach * @param int $coachId The coach id - * @return array + * @return array (id, user_id, session_id, c_id, visibility, status, legal_agreement) */ public static function getCoursesListByCourseCoach($coachId) { diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index d4d31e053a..ad1378d804 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -8650,7 +8650,7 @@ class learnpath $selfUrl = api_get_self(); $courseIdReq = api_get_cidreq(); $course = api_get_course_info(); - $course_id = api_get_course_int_id(); + $course_id = $course['real_id']; $tbl_link = Database::get_course_table(TABLE_LINK); $linkCategoryTable = Database::get_course_table(TABLE_LINK_CATEGORY); $moveEverywhereIcon = Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY); @@ -8836,7 +8836,7 @@ class learnpath public function scorm_export() { $_course = api_get_course_info(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; // Remove memory and time limits as much as possible as this might be a long process... if (function_exists('ini_set')) { diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php index f2d72e4ede..9418bc95e2 100755 --- a/main/survey/survey.lib.php +++ b/main/survey/survey.lib.php @@ -4380,7 +4380,7 @@ class SurveyUtil public static function getSurveyList($user_id) { $_course = api_get_course_info(); - $course_id = api_get_course_int_id(); + $course_id = $_course['real_id']; $user_id = intval($user_id); $sessionId = api_get_session_id(); diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 1df74df498..53d2e94774 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -12,7 +12,7 @@ require_once '../inc/global.inc.php'; $current_course_tool = TOOL_TRACKING; $courseInfo = api_get_course_info(api_get_course_id()); -$courseCode = api_get_course_id(); +$courseCode = $courseInfo['code']; $from_myspace = false; $from = isset($_GET['from']) ? $_GET['from'] : null; diff --git a/main/tracking/course_log_resources.php b/main/tracking/course_log_resources.php index 43385a16a8..147dce4e12 100755 --- a/main/tracking/course_log_resources.php +++ b/main/tracking/course_log_resources.php @@ -11,7 +11,7 @@ $pathopen = isset($_REQUEST['pathopen']) ? $_REQUEST['pathopen'] : null; // Including the global initialization file require_once '../inc/global.inc.php'; $current_course_tool = TOOL_TRACKING; -$course_info = api_get_course_info(api_get_course_id()); +$course_info = api_get_course_info(); $from_myspace = false; $from = isset($_GET['from']) ? $_GET['from'] : null; diff --git a/main/tracking/course_log_tools.php b/main/tracking/course_log_tools.php index 9715db4e90..bd0c176e4b 100755 --- a/main/tracking/course_log_tools.php +++ b/main/tracking/course_log_tools.php @@ -12,7 +12,7 @@ $pathopen = isset($_REQUEST['pathopen']) ? $_REQUEST['pathopen'] : null; require_once '../inc/global.inc.php'; $current_course_tool = TOOL_TRACKING; -$course_info = api_get_course_info(api_get_course_id()); +$course_info = api_get_course_info(); $from_myspace = false; $from = isset($_GET['from']) ? $_GET['from'] : null; diff --git a/main/user/user.php b/main/user/user.php index df281068f5..b04e579918 100755 --- a/main/user/user.php +++ b/main/user/user.php @@ -38,8 +38,8 @@ $is_western_name_order = api_is_western_name_order(); $sort_by_first_name = api_sort_by_first_name(); $course_info = api_get_course_info(); $user_id = api_get_user_id(); -$courseCode = api_get_course_id(); -$courseId = api_get_course_int_id(); +$courseCode = $course_info['code']; +$courseId = $course_info['real_id']; //Can't auto unregister from a session if (!empty($sessionId)) { @@ -617,7 +617,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $course_info = api_get_course_info(); $sessionId = api_get_session_id(); - $course_code = api_get_course_id(); + $course_code = $course_info['code']; $a_users = array(); diff --git a/main/work/upload.php b/main/work/upload.php index c288e8dad1..edfa4cd6d5 100755 --- a/main/work/upload.php +++ b/main/work/upload.php @@ -20,8 +20,8 @@ $course_id = api_get_course_int_id(); $user_id = api_get_user_id(); $userInfo = api_get_user_info(); $session_id = api_get_session_id(); -$course_code = api_get_course_id(); $course_info = api_get_course_info(); +$course_code = $course_info['code']; $group_id = api_get_group_id(); if (empty($work_id)) { diff --git a/main/work/upload_from_template.php b/main/work/upload_from_template.php index f8c082ef5a..72bb694632 100755 --- a/main/work/upload_from_template.php +++ b/main/work/upload_from_template.php @@ -21,8 +21,8 @@ $course_id = api_get_course_int_id(); $user_id = api_get_user_id(); $userInfo = api_get_user_info(); $session_id = api_get_session_id(); -$course_code = api_get_course_id(); $course_info = api_get_course_info(); +$course_code = $course_info['code']; $group_id = api_get_group_id(); if (empty($work_id)) { diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 5c3fcfb8ae..2639697028 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -552,8 +552,8 @@ function display_student_publications_list( $session_id = api_get_session_id(); $condition_session = api_get_session_condition($session_id); - $course_id = api_get_course_int_id(); - $course_info = api_get_course_info(api_get_course_id()); + $course_info = api_get_course_info(); + $course_id = $course_info['real_id']; $sort_params = array(); @@ -1557,9 +1557,9 @@ function get_count_work($work_id, $onlyMeUserId = null, $notMeUserId = null) $session_id = api_get_session_id(); $condition_session = api_get_session_condition($session_id, true, false, 'work.session_id'); - $course_id = api_get_course_int_id(); $group_id = api_get_group_id(); - $course_info = api_get_course_info(api_get_course_id()); + $course_info = api_get_course_info(); + $course_id = $course_info['real_id']; $work_id = intval($work_id); if (!empty($group_id)) { @@ -1635,7 +1635,7 @@ function getWorkListStudent( $workTable = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $workTableAssignment = Database::get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT); $courseInfo = api_get_course_info(); - $course_id = api_get_course_int_id(); + $course_id = $courseInfo['real_id']; $session_id = api_get_session_id(); $condition_session = api_get_session_condition($session_id); $group_id = api_get_group_id(); @@ -2123,9 +2123,9 @@ function get_work_user_list( $user_table = Database::get_main_table(TABLE_MAIN_USER); $session_id = api_get_session_id(); - $course_id = api_get_course_int_id(); $group_id = api_get_group_id(); - $course_info = api_get_course_info(api_get_course_id()); + $course_info = api_get_course_info(); + $course_id = $course_info['real_id']; $work_id = intval($work_id); $column = !empty($column) ? Database::escape_string($column) : 'sent_date'; diff --git a/main/work/work.php b/main/work/work.php index f26bb4973d..e21e4db815 100755 --- a/main/work/work.php +++ b/main/work/work.php @@ -14,8 +14,8 @@ api_protect_course_script(true); require_once 'work.lib.php'; -$course_id = api_get_course_int_id(); $course_info = api_get_course_info(); +$course_id = $course_info['real_id']; $user_id = api_get_user_id(); $id_session = api_get_session_id(); @@ -33,7 +33,7 @@ $_course = api_get_course_info(); /* Constants and variables */ $tool_name = get_lang('StudentPublications'); -$course_code = api_get_course_id(); +$course_code = $_course['code']; $session_id = api_get_session_id(); $group_id = api_get_group_id(); diff --git a/user_portal.php b/user_portal.php index 7c3df816a6..d016f996da 100755 --- a/user_portal.php +++ b/user_portal.php @@ -54,7 +54,7 @@ if (api_get_setting('go_to_course_after_login') == 'true') { // Session only has 1 course. if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) { $courseCode = $sessionInfo['courses'][0]['code']; - $courseInfo = api_get_course_info($courseCode); + $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']); $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id']; header('Location:'.$courseUrl); exit; @@ -77,7 +77,7 @@ if (api_get_setting('go_to_course_after_login') == 'true') { $courses = CourseManager::get_courses_list_by_user_id($userId); if (!empty($courses) && isset($courses[0]) && isset($courses[0]['code'])) { - $courseInfo = api_get_course_info($courses[0]['code']); + $courseInfo = api_get_course_info_by_id($courses[0]['real_id']); if (!empty($courseInfo)) { $courseUrl = $courseInfo['course_public_url']; header('Location:'.$courseUrl); diff --git a/whoisonlinesession.php b/whoisonlinesession.php index 2b80a5debc..5599e146aa 100755 --- a/whoisonlinesession.php +++ b/whoisonlinesession.php @@ -111,7 +111,7 @@ Display::display_header(get_lang('UserOnlineListSession')); echo " "; - $courseInfo = api_get_course_info($student_online['c_id']); + $courseInfo = api_get_course_info_by_id($student_online['c_id']); echo $courseInfo['title']; echo "