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

Risky: move many api_get_course_info() calls to api_get_course_info_by_id() and remove many useless and resource-consuming function calls

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent 4a13818a21
commit c37f395103
42 changed files with 114 additions and 106 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. 3
      main/admin/course_information.php
  2. 4
      main/admin/session_import.php
  3. 14
      main/admin/teacher_time_report.php
  4. 2
      main/admin/user_information.php
  5. 6
      main/admin/user_move_stats.php
  6. 2
      main/announcements/announcements.php
  7. 2
      main/course_info/infocours.php
  8. 5
      main/coursecopy/copy_course_session_selected.php
  9. 5
      main/document/show_content.php
  10. 14
      main/exercice/TestCategory.php
  11. 4
      main/exercice/exercise.php
  12. 7
      main/forum/download.php
  13. 2
      main/forum/forumfunction.inc.php
  14. 4
      main/gradebook/exercise_jump.php
  15. 2
      main/gradebook/lib/GradebookUtils.php
  16. 2
      main/gradebook/lib/be/category.class.php
  17. 2
      main/inc/ajax/course.ajax.php
  18. 4
      main/inc/ajax/exercise.ajax.php
  19. 4
      main/inc/lib/AnnouncementManager.php
  20. 4
      main/inc/lib/agenda.lib.php
  21. 4
      main/inc/lib/api.lib.php
  22. 14
      main/inc/lib/attendance.lib.php
  23. 4
      main/inc/lib/banner.lib.php
  24. 4
      main/inc/lib/blog.lib.php
  25. 2
      main/inc/lib/fileUpload.lib.php
  26. 2
      main/inc/lib/groupmanager.lib.php
  27. 22
      main/inc/lib/link.lib.php
  28. 8
      main/inc/lib/search/tool_processors/link_processor.class.php
  29. 6
      main/inc/lib/search/tool_processors/quiz_processor.class.php
  30. 16
      main/inc/lib/sessionmanager.lib.php
  31. 4
      main/newscorm/learnpath.class.php
  32. 2
      main/survey/survey.lib.php
  33. 2
      main/tracking/courseLog.php
  34. 2
      main/tracking/course_log_resources.php
  35. 2
      main/tracking/course_log_tools.php
  36. 6
      main/user/user.php
  37. 2
      main/work/upload.php
  38. 2
      main/work/upload_from_template.php
  39. 14
      main/work/work.lib.php
  40. 4
      main/work/work.php
  41. 4
      user_portal.php
  42. 2
      whoisonlinesession.php

3
main/admin/course_information.php
Unescape View File

@ -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)) {

4
main/admin/session_import.php
Unescape View File

@ -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,

14
main/admin/teacher_time_report.php
Unescape View File

@ -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
)
);
}
}

2
main/admin/user_information.php
Unescape View File

@ -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'],

6
main/admin/user_move_stats.php
Unescape View File

@ -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'];
}

2
main/announcements/announcements.php
Unescape View File

@ -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);

2
main/course_info/infocours.php
Unescape View File

@ -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 &&

5
main/coursecopy/copy_course_session_selected.php
Unescape View File

@ -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)) {

5
main/document/show_content.php
Unescape View File

@ -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)) {

14
main/exercice/TestCategory.php
Unescape View File

@ -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,

4
main/exercice/exercise.php
Unescape View File

@ -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

7
main/forum/download.php
Unescape View File

@ -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,

2
main/forum/forumfunction.inc.php
Unescape View File

@ -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'];

4
main/gradebook/exercise_jump.php
Unescape View File

@ -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']);

2
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -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'],

2
main/gradebook/lib/be/category.class.php
Unescape View File

@ -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);

2
main/inc/ajax/course.ajax.php
Unescape View File

@ -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'].'<br />';
}
} else {

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

@ -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?

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

@ -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');

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

@ -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']);

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

@ -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) {

14
main/inc/lib/attendance.lib.php
Unescape View File

@ -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';

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

@ -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);

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

@ -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);

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

@ -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');

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

@ -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'];

22
main/inc/lib/link.lib.php
Unescape View File

@ -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']);

8
main/inc/lib/search/tool_processors/link_processor.class.php
Unescape View File

@ -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

6
main/inc/lib/search/tool_processors/quiz_processor.class.php
Unescape View File

@ -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)) {

16
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -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)
{

4
main/newscorm/learnpath.class.php
Unescape View File

@ -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')) {

2
main/survey/survey.lib.php
Unescape View File

@ -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();

2
main/tracking/courseLog.php
Unescape View File

@ -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;

2
main/tracking/course_log_resources.php
Unescape View File

@ -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;

2
main/tracking/course_log_tools.php
Unescape View File

@ -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;

6
main/user/user.php
Unescape View File

@ -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();

2
main/work/upload.php
Unescape View File

@ -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)) {

2
main/work/upload_from_template.php
Unescape View File

@ -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)) {

14
main/work/work.lib.php
Unescape View File

@ -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';

4
main/work/work.php
Unescape View File

@ -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();

4
user_portal.php
Unescape View File

@ -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);

2
whoisonlinesession.php
Unescape View File

@ -111,7 +111,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
echo " </td>
<td align='center'>
";
$courseInfo = api_get_course_info($student_online['c_id']);
$courseInfo = api_get_course_info_by_id($student_online['c_id']);
echo $courseInfo['title'];
echo " </td>
<td align='center'>

Write Preview
Loading…
Cancel
Save