From 4935f93d7763d2974bea05b5930b48c627032c8f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 10 Apr 2015 08:55:45 +0200 Subject: [PATCH] Replace id with real_id. Because "id" is the "course code" ... --- main/admin/session_course_user_list.php | 2 +- main/admin/session_list.php | 3 +- main/auth/courses_controller.php | 4 +- main/chat/chat_whoisonline.php | 2 +- main/gradebook/lib/GradebookUtils.php | 2 +- main/gradebook/lib/be/category.class.php | 2 +- main/gradebook/lib/be/evaluation.class.php | 2 +- main/gradebook/lib/be/exerciselink.class.php | 6 +-- main/gradebook/lib/fe/displaygradebook.php | 2 +- main/inc/ajax/course.ajax.php | 4 +- main/inc/lib/api.lib.php | 2 +- main/inc/lib/auth.lib.php | 47 +++++++++++--------- main/inc/lib/course.lib.php | 29 ++++++------ main/inc/lib/document.lib.php | 2 +- main/inc/lib/myspace.lib.php | 4 +- main/inc/lib/tracking.lib.php | 2 +- main/inc/lib/usermanager.lib.php | 2 +- main/webservices/registration.soap.php | 5 ++- 18 files changed, 65 insertions(+), 57 deletions(-) diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php index 76809db05a..37670da4cb 100755 --- a/main/admin/session_course_user_list.php +++ b/main/admin/session_course_user_list.php @@ -24,7 +24,7 @@ if (empty($id_session )) { $course_code = Database::escape_string(trim($_GET['course_code'])); $courseInfo = api_get_course_info($course_code); -$courseId = $courseInfo['id']; +$courseId = $courseInfo['real_id']; $page = isset($_GET['page']) ? intval($_GET['page']) : null; $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; diff --git a/main/admin/session_list.php b/main/admin/session_list.php index da7ebc2de4..41b3f4f890 100755 --- a/main/admin/session_list.php +++ b/main/admin/session_list.php @@ -49,8 +49,9 @@ $courseId = isset($_GET['course_id']) ? $_GET['course_id'] : null; if (!empty($courseId)) { $courseInfo = api_get_course_info_by_id($courseId); $parents = getParentsToString($courseInfo['categoryCode']); - $courseList[] = array('id' => $courseInfo['id'], 'text' => $parents.$courseInfo['title']); + $courseList[] = array('id' => $courseInfo['code'], 'text' => $parents.$courseInfo['title']); } + $sessionFilter->addElement('select_ajax', 'course_name', get_lang('SearchCourse'), null, array('url' => $url, 'defaults' => $courseList)); $url = api_get_self(); $actions = ' diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php index 5070c0fec0..5cf4ddaea6 100755 --- a/main/auth/courses_controller.php +++ b/main/auth/courses_controller.php @@ -246,9 +246,9 @@ class CoursesController public function change_course_category($course_code, $category_id) { $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; - $result = $this->model->store_changecoursecategory($courseId, $category_id); + $result = $this->model->updateCourseCategory($courseId, $category_id); $message = ''; if ($result) { $message = get_lang('EditCourseCategorySucces'); diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php index d9efa3eb83..86f38f164d 100755 --- a/main/chat/chat_whoisonline.php +++ b/main/chat/chat_whoisonline.php @@ -56,7 +56,7 @@ if (!empty($course)) { t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND - t3.c_id = '".$courseInfo['id']."' AND + t3.c_id = '".$courseInfo['real_id']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username"; $result = Database::query($query); diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php index ddca492fc4..da75c3f7d2 100644 --- a/main/gradebook/lib/GradebookUtils.php +++ b/main/gradebook/lib/GradebookUtils.php @@ -954,7 +954,7 @@ class GradebookUtils $current_session = api_get_session_id(); $courseCode = Database::escape_string($courseCode); $courseInfo = api_get_course_info($courseCode); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if (!empty($current_session)) { $sql = "SELECT user.user_id, user.username, lastname, firstname, official_code diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index c85e9c1abd..84764db1fa 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -776,7 +776,7 @@ class Category implements GradebookItem $parent = Category::load($parent); $code = $parent[0]->get_course_code(); $courseInfo = api_get_course_info($code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if (isset($code) && $code != '0') { $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $sql .= ' AND user_id IN ( diff --git a/main/gradebook/lib/be/evaluation.class.php b/main/gradebook/lib/be/evaluation.class.php index d8dcd26f28..5db1937e2e 100755 --- a/main/gradebook/lib/be/evaluation.class.php +++ b/main/gradebook/lib/be/evaluation.class.php @@ -442,7 +442,7 @@ class Evaluation implements GradebookItem $parent = Category::load($parent); $code = $parent[0]->get_course_code(); $courseInfo = api_get_course_info($code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if (isset($code) && $code != '0') { $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index 9af1eab7ef..ff3c0c231d 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -305,10 +305,10 @@ class ExerciseLink extends AbstractLink $user_id = api_get_user_id(); $course_code = $this->get_course_code(); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; - $status_user=api_get_status_of_user_in_course($user_id, $courseId); - $session_id =api_get_session_id(); + $status_user = api_get_status_of_user_in_course($user_id, $courseId); + $session_id = api_get_session_id(); $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$this->get_ref_id().'&type='.$this->get_type(); if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user!=1) { diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index 3922bee2f2..a0620eac59 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -304,7 +304,7 @@ class DisplayGradebook $user_id = api_get_user_id(); $course_code = $my_category['course_code']; $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $status_user = api_get_status_of_user_in_course($user_id, $courseId); diff --git a/main/inc/ajax/course.ajax.php b/main/inc/ajax/course.ajax.php index 9c3820f913..278ef93483 100755 --- a/main/inc/ajax/course.ajax.php +++ b/main/inc/ajax/course.ajax.php @@ -84,9 +84,9 @@ switch ($action) { } $results[] = array( - 'id' => $courseInfo['id'], + 'id' => $courseInfo['code'], 'text' => $title - ); + ); } echo json_encode($results); } else { diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 9bfb3d36aa..d116d10b50 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -5350,7 +5350,7 @@ function api_is_course_visible_for_user($userid = null, $cid = null) { $cid = Database::escape_string($cid); $courseInfo = api_get_course_info($cid); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; global $is_platformAdmin; diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php index e9f60c2505..9ab7eae920 100755 --- a/main/inc/lib/auth.lib.php +++ b/main/inc/lib/auth.lib.php @@ -168,18 +168,18 @@ class Auth } /** - * stores the changes in a course category (moving a course to a different course category) - * @param string $courseId + * stores the changes in a course category + * (moving a course to a different course category) + * @param int $courseId * @param int Category id * @return bool True if it success */ - public function store_changecoursecategory($courseId, $newcategory) + public function updateCourseCategory($courseId, $newcategory) { $courseId = intval($courseId); $newcategory = intval($newcategory); $current_user = api_get_user_id(); - $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER); $max_sort_value = api_max_sort_value($newcategory, $current_user); $sql = "UPDATE $TABLECOURSUSER SET @@ -239,24 +239,24 @@ class Auth } if (count($target_course) > 0 && count($source_course) > 0) { - - $courseInfo = api_get_course_info($source_course['code']); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; + + $sql = "UPDATE $TABLECOURSUSER + SET sort='" . $target_course['sort'] . "' + WHERE + c_id = '" . $courseId . "' AND + user_id = '" . $current_user_id . "' AND + relation_type<>" . COURSE_RELATION_TYPE_RRHH; + $result1 = Database::query($sql); + + $sql = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "' + WHERE + c_id ='" . $courseId . "' AND + user_id='" . $current_user_id . "' AND + relation_type<>" . COURSE_RELATION_TYPE_RRHH; + $result2 = Database::query($sql); - $sql_update1 = "UPDATE $TABLECOURSUSER - SET sort='" . $target_course['sort'] . "' - WHERE - c_id = '" . $courseId . "' AND - user_id = '" . $current_user_id . "' AND - relation_type<>" . COURSE_RELATION_TYPE_RRHH; - $sql_update2 = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "' - WHERE - c_id ='" . $courseId . "' AND - user_id='" . $current_user_id . "' AND - relation_type<>" . COURSE_RELATION_TYPE_RRHH; - $result1 = Database::query($sql_update2); - $result2 = Database::query($sql_update1); if (Database::affected_rows($result1) && Database::affected_rows($result2)) { $result = true; } @@ -395,13 +395,16 @@ class Auth $result = true; $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; // we check (once again) if the user is not course administrator // because the course administrator cannot unsubscribe himself // (s)he can only delete the course $sql = "SELECT * FROM $tbl_course_user - WHERE user_id='" . $current_user_id . "' AND c_id ='" . $courseId . "' AND status='1' "; + WHERE + user_id='" . $current_user_id . "' AND + c_id ='" . $courseId . "' AND + status='1' "; $result_check = Database::query($sql); $number_of_rows = Database::num_rows($result_check); if ($number_of_rows > 0) { diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 5b9128c168..a6643c44d6 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -323,7 +323,7 @@ class CourseManager public static function get_user_in_course_status($user_id, $course_code) { $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $result = Database::fetch_array( Database::query( @@ -545,7 +545,7 @@ class CourseManager $course_code = Database::escape_string($course_code); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $courseCode = $courseInfo['code']; $userCourseCategoryId = intval($userCourseCategoryId); @@ -1010,7 +1010,7 @@ class CourseManager return false; } - $courseId = intval($courseInfo['id']); + $courseId = intval($courseInfo['real_id']); $table = Database::get_main_table(TABLE_MAIN_COURSE_USER); $sql = "SELECT * FROM $table @@ -1051,7 +1051,7 @@ class CourseManager $condition_course = ''; if (isset($course_code)) { $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $condition_course = ' AND c_id = ' . $courseId; } @@ -1111,15 +1111,17 @@ class CourseManager } $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $result = Database::query( 'SELECT status FROM ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' WHERE c_id="' . $courseId . '" and user_id="' . $user_id . '"' ); + if (Database::num_rows($result) > 0) { return Database::result($result, 0, 'status') == 1; } + return false; } @@ -1616,15 +1618,16 @@ class CourseManager $course_code = Database::escape_string($course_code); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $sql = 'SELECT DISTINCT count(*) as count FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user '; $where = array(); if (!empty($session_id)) { $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . ' as session_course_user - ON user.user_id = session_course_user.user_id - AND session_course_user.c_id = "' . $courseId . '" - AND session_course_user.session_id = ' . $session_id; + ON + user.user_id = session_course_user.user_id AND + session_course_user.c_id = "' . $courseId . '" AND + session_course_user.session_id = ' . $session_id; $where[] = ' session_course_user.c_id IS NOT NULL '; } else { @@ -1729,7 +1732,7 @@ class CourseManager $session_id = intval($session_id); $course_code = Database::escape_string($course_code); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $students = array(); @@ -3166,7 +3169,7 @@ class CourseManager if (is_array($courses_list)) { foreach ($courses_list as $course_code) { $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $sql = "INSERT IGNORE INTO $tbl_course_rel_user(c_id, user_id, status, relation_type) VALUES('$courseId', $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')"; $result = Database::query($sql); @@ -4354,7 +4357,7 @@ class CourseManager $session_id = intval($session_id); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; // Course legal $enabled = api_get_plugin_setting('courselegal', 'tool_enable'); @@ -4415,7 +4418,7 @@ class CourseManager $session_id = intval($session_id); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if (empty($session_id)) { $table = Database::get_main_table(TABLE_MAIN_COURSE_USER); diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php index 7569360600..f53792b7ca 100755 --- a/main/inc/lib/document.lib.php +++ b/main/inc/lib/document.lib.php @@ -3231,7 +3231,7 @@ class DocumentManager $tbl_doc = Database::get_course_table(TABLE_DOCUMENT); $tbl_item_prop = Database::get_course_table(TABLE_ITEM_PROPERTY); - $condition_session = " AND (session_id = '$session_id' OR id_session = '0' )"; + $condition_session = " AND (session_id = '$session_id' OR session_id = '0' )"; $add_folder_filter = null; if (!empty($filter_by_folder)) { diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index 3df04cb783..c76cd0dfb3 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -1239,7 +1239,7 @@ class MySpace { $course_code = $row[0]; $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; // the table header $return = ''; @@ -2110,7 +2110,7 @@ class MySpace while ($row_course = Database::fetch_row($res)) { $course_code = $row_course[0]; $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $avg_assignments_in_course = $avg_messages_in_course = $nb_students_in_course = $avg_progress_in_course = $avg_score_in_course = $avg_time_spent_in_course = $avg_score_in_exercise = 0; // students directly subscribed to the course diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index e18a37cb57..cdb85340b6 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3494,7 +3494,7 @@ class Tracking $now = api_get_utc_datetime(); $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if ($session_id != 0) { $inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index d2b565e773..600d71acff 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -4515,7 +4515,7 @@ class UserManager $table_user = Database::get_main_table(TABLE_MAIN_USER); $table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); $table_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; $courseCode = $courseInfo['code']; if ($session == 0 || is_null($session)) { diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index 48c8a3432d..664ca21518 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -4286,13 +4286,14 @@ function WSUnsubscribeUserFromCourse($params) { $course_code = $row_course[0]; $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['id']; + $courseId = $courseInfo['real_id']; if (empty($course_code)) { $results[] = 0; continue; } else { - $sql = "SELECT code FROM $table_course WHERE code ='$course_code' AND visibility = '0'"; + $sql = "SELECT code FROM $table_course + WHERE code ='$course_code' AND visibility = '0'"; $resul = Database::query($sql); $r_check_code = Database::fetch_row($resul); if (!empty($r_check_code[0])) {