Improved course access link builder and used from course catalogue - refs #5240

main/inc/lib/course.lib.php

@@ -3844,6 +3844,9 @@ class CourseManager {
         if (!is_array($user_courses)) {
             // get the array of courses to which the user is subscribed
             $user_courses = CourseManager::get_courses_list_by_user_id($uid);
+            foreach ($user_courses as $k => $v) {
+                $user_courses[$k] = $v['real_id'];
+            }
         }
         $is_admin = api_is_platform_admin_by_id($uid);
         // Register button

main/template/default/auth/courses_categories.php

@@ -168,21 +168,16 @@ $stok = Security::get_token();
                     if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
                         echo '<a class="ajax btn" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" class="thickbox">'.get_lang('Description').'</a>';
                     }
-
+                    // Get access type for course button ("enter" or "register")
+                    $course['subscribe_allowed'] = $course['subscribe'];
+                    $access_type = CourseManager::get_access_link_by_user(api_get_user_id(),$course);
                     $sub_btn = '';
                     // Register button
-                    if (!api_is_anonymous() // Subscribe button
-                            && ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD || $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
-                            && $course['subscribe'] == SUBSCRIBE_ALLOWED
-                            && (!in_array($course['code'], $user_coursecodes) || empty($user_coursecodes))) {
+                    if (strcmp($access_type,'register')===0) {
                         $sub_btn = ' <a class="btn btn-primary" href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a>';
                     }
                     // Go To Course button (only if admin, if course public or if student already subscribed)
-                    if (empty($sub_btn) && (api_is_platform_admin() 
-			|| $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD 
-			|| (api_user_is_login() && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
-			|| in_array($course['code'], $user_coursecodes && $course['visibility'] != COURSE_VISIBILITY_CLOSED   )
-                    )) {
+                    if (empty($sub_btn)) {
                         echo ' <a class="btn btn-primary" href="'.  api_get_course_url($course['code']).'">'.get_lang('GoToCourse').'</a>';
                     }
                     // Print register button (if any)