From 9fd6bba6864a840aab9d79c9477e9fa71fbd1a09 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 7 Dec 2016 12:27:04 +0100 Subject: [PATCH] Rename function CourseManager::get_user_in_course_status to getUserInCourseStatus Use course id + instead of course code. --- main/admin/user_information.php | 8 +++++++- main/document/remote.php | 6 +++--- main/gradebook/lib/fe/displaygradebook.php | 3 +-- main/gradebook/lib/fe/resulttable.class.php | 3 +-- .../lib/gradebook_data_generator.class.php | 1 - main/inc/lib/agenda.lib.php | 4 ++-- main/inc/lib/attendance.lib.php | 4 ++-- main/inc/lib/course.lib.php | 15 +++++++-------- main/inc/lib/social.lib.php | 10 ++++++---- main/inc/lib/usermanager.lib.php | 19 ++++++++++--------- main/inc/lib/userportal.lib.php | 3 ++- 11 files changed, 41 insertions(+), 35 deletions(-) diff --git a/main/admin/user_information.php b/main/admin/user_information.php index 13130916fe..ccc8746106 100755 --- a/main/admin/user_information.php +++ b/main/admin/user_information.php @@ -129,7 +129,13 @@ if (isset($_GET['action'])) { case 'unsubscribe': $courseCode = empty($_GET['course_code']) ? '' : intval($_GET['course_code']); $sessionId = empty($_GET['id_session']) ? 0 : intval($_GET['id_session']); - if (CourseManager::get_user_in_course_status($userId, $courseCode) == STUDENT) { + $courseInfo = api_get_course_info($courseCode); + + if (empty($courseInfo)) { + break; + } + + if (CourseManager::getUserInCourseStatus($userId, $courseInfo['real_id']) == STUDENT) { CourseManager::unsubscribe_user($userId, $courseCode, $sessionId); Display::addFlash(Display::return_message(get_lang('UserUnsubscribed'))); } else { diff --git a/main/document/remote.php b/main/document/remote.php index 2b40fa51f8..864c8ac101 100755 --- a/main/document/remote.php +++ b/main/document/remote.php @@ -24,13 +24,13 @@ $cidReq = str_replace($seek, $destroy, $_REQUEST["cidReq"]); $cidReq = Security::remove_XSS($cidReq); $user_id = api_get_user_id(); $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document'; -$_course = CourseManager::get_course_information($cidReq); -if ($_course == null) { +$_course = api_get_course_info($cidReq); +if (empty($_course)) { die ("problem when fetching course information"); } // stupid variable initialisation for old version of DocumentManager functions. $_course['path'] = $_course['directory']; -$is_manager = (CourseManager::get_user_in_course_status($user_id, $cidReq) == COURSEMANAGER); +$is_manager = (CourseManager::getUserInCourseStatus($user_id, $_course['real_id']) == COURSEMANAGER); if ($debug > 0) { error_log($coursePath, 0); } diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index 2c4daee95a..8c7308f7d6 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -229,12 +229,11 @@ class DisplayGradebook $certificateLinkInfo = null ) { $userId = api_get_user_id(); - $courseCode = api_get_course_id(); $courseId = api_get_course_int_id(); $sessionId = api_get_session_id(); // Student. - $status = CourseManager::get_user_in_course_status($userId, $courseCode); + $status = CourseManager::getUserInCourseStatus($userId, $courseId); if (!empty($sessionId)) { $sessionStatus = SessionManager::get_user_status_in_course_session( diff --git a/main/gradebook/lib/fe/resulttable.class.php b/main/gradebook/lib/fe/resulttable.class.php index 9d976b6fe7..72e31ad942 100755 --- a/main/gradebook/lib/fe/resulttable.class.php +++ b/main/gradebook/lib/fe/resulttable.class.php @@ -137,9 +137,8 @@ class ResultTable extends SortableTable return $sortable_data; } - private function build_edit_column ($item) + private function build_edit_column($item) { - $status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id()); $locked_status = $this->evaluation->get_locked(); if (api_is_allowed_to_edit(null, true) && $locked_status == 0) { //api_is_course_admin() diff --git a/main/gradebook/lib/gradebook_data_generator.class.php b/main/gradebook/lib/gradebook_data_generator.class.php index f7425d84ca..d7217d4802 100755 --- a/main/gradebook/lib/gradebook_data_generator.class.php +++ b/main/gradebook/lib/gradebook_data_generator.class.php @@ -87,7 +87,6 @@ class GradebookDataGenerator $ignore_score_color = false, $studentList = array() ) { - //$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id()); // do some checks on count, redefine if invalid value if (!isset($count)) { $count = count($this->items) - $start; diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index de6d9fb250..481aeb310d 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -2865,8 +2865,8 @@ class Agenda $TABLEAGENDA = Database :: get_course_table(TABLE_AGENDA); $TABLE_ITEMPROPERTY = Database :: get_course_table(TABLE_ITEM_PROPERTY); - $group_memberships = GroupManager :: get_group_ids($array_course_info["real_id"], $user_id); - $course_user_status = CourseManager::get_user_in_course_status($user_id, $array_course_info["code"]); + $group_memberships = GroupManager::get_group_ids($array_course_info['real_id'], $user_id); + $course_user_status = CourseManager::getUserInCourseStatus($user_id, $array_course_info['real_id']); // if the user is administrator of that course we show all the agenda items if ($course_user_status == '1') { //echo "course admin"; diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index bad66e7f50..55a13b7cec 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -676,9 +676,9 @@ class Attendance $current_session_id ); } else { - $user_status_in_course = CourseManager::get_user_in_course_status( + $user_status_in_course = CourseManager::getUserInCourseStatus( $uid, - $current_course_id + $currentCourseIntId ); } diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index d4cf71400a..bd73894e19 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -265,17 +265,17 @@ class CourseManager /** * Returns the status of a user in a course, which is COURSEMANAGER or STUDENT. * @param int $user_id - * @param string $course_code + * @param int $courseId * * @return int|bool the status of the user in that course (or false if the user is not in that course) */ - public static function get_user_in_course_status($user_id, $course_code) + public static function getUserInCourseStatus($user_id, $courseId) { - $courseInfo = api_get_course_info($course_code); - $courseId = $courseInfo['real_id']; + $courseId = (int) $courseId; if (empty($courseId)) { return false; } + $result = Database::fetch_array( Database::query( "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " @@ -2695,7 +2695,6 @@ class CourseManager $sql = "SELECT DISTINCT(course.code), course.id as real_id FROM $tbl_course course"; } else { - $with_special_courses = $without_special_courses = ''; if (!empty($special_course_list)) { $sc_string = '"' . implode('","', $special_course_list) . '"'; @@ -3989,7 +3988,7 @@ class CourseManager $entityManager = Database::getManager(); $user_id = api_get_user_id(); $course_info = api_get_course_info_by_id($course['real_id']); - $status_course = CourseManager::get_user_in_course_status($user_id, $course_info['code']); + $status_course = CourseManager::getUserInCourseStatus($user_id, $course_info['real_id']); $course_info['status'] = empty($session_id) ? $status_course : STUDENT; $course_info['id_session'] = $session_id; $objUser = $entityManager->find('ChamiloUserBundle:User', $user_id); @@ -4009,9 +4008,9 @@ class CourseManager return ''; } - $user_in_course_status = CourseManager::get_user_in_course_status( + $user_in_course_status = CourseManager::getUserInCourseStatus( api_get_user_id(), - $course_info['code'] + $course_info['real_id'] ); $is_coach = api_is_coach($course_info['id_session'], $course_info['real_id']); diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index b7001dd92c..cfbbc29140 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -492,10 +492,12 @@ class SocialManager extends UserManager $course_directory = $my_course['course_info']['directory']; $course_title = $my_course['course_info']['title']; $course_access_settings = CourseManager :: get_access_settings($course_code); - $course_visibility = $course_access_settings['visibility']; - $user_in_course_status = CourseManager :: get_user_in_course_status(api_get_user_id(), $course_code); + $user_in_course_status = CourseManager::getUserInCourseStatus( + api_get_user_id(), + $my_course['real_id'] + ); //$valor = api_get_settings_params(); $course_path = api_get_path(SYS_COURSE_PATH).$course_directory; // course path @@ -526,7 +528,7 @@ class SocialManager extends UserManager if ($course_visibility != COURSE_VISIBILITY_HIDDEN && ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER) ) { - $result .= '' . $course_title . ''; + $result .= '' . $course_title . ''; } else { $result .= $course_title." ".get_lang('CourseClosed'); } @@ -536,7 +538,6 @@ class SocialManager extends UserManager $session = ''; if (!empty($my_course['session_name']) && !empty($my_course['id_session'])) { - // Request for the name of the general coach $sql = 'SELECT lastname, firstname FROM '.$tbl_session.' ts @@ -561,6 +562,7 @@ class SocialManager extends UserManager } } } + $my_course['id_session'] = isset($my_course['id_session']) ? $my_course['id_session'] : 0; $output = array( $my_course['user_course_cat'], diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 1ae76e50b8..a5ef393a3c 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -2489,7 +2489,8 @@ class UserManager return $extraField->getFieldInfoByFieldId($fieldId); } - /** Get extra user data by value + /** + * Get extra user data by value * @param string $variable the internal variable name of the field * @param string $value the internal value of the field * @param bool $all_visibility @@ -2547,12 +2548,12 @@ class UserManager /** * Get extra user data by field variable - * @param string field variable + * @param string $variable field variable * @return array data */ - public static function get_extra_user_data_by_field_variable($field_variable) + public static function get_extra_user_data_by_field_variable($variable) { - $extra_information_by_variable = self::get_extra_field_information_by_name($field_variable); + $extra_information_by_variable = self::get_extra_field_information_by_name($variable); $field_id = intval($extra_information_by_variable['id']); $extraField = new ExtraFieldValue('user'); @@ -2571,14 +2572,14 @@ class UserManager /** * Get extra user data tags by field variable * - * @param string field variable - * @return array data + * @param string $variable field variable + * @return array */ - public static function get_extra_user_data_for_tags($field_variable) + public static function get_extra_user_data_for_tags($variable) { - $extra_information_by_variable = self::get_extra_field_tags_information_by_name($field_variable); + $data = self::get_extra_field_tags_information_by_name($variable); - return $extra_information_by_variable; + return $data; } /** diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 67b4ee4b07..df2d894963 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -1122,6 +1122,7 @@ class IndexManager // Load sessions in category $session_categories = UserManager::get_sessions_by_category($user_id, false); } + $html = ''; // Showing history title if ($load_history) { @@ -1366,7 +1367,7 @@ class IndexManager if ($session_now >= $allowed_time && $allowedEndTime) { if (api_get_setting('hide_courses_in_sessions') === 'false') { - $c = CourseManager:: get_logged_user_course_html( + $c = CourseManager::get_logged_user_course_html( $course, $session_id, 'session_course_item'