Remove function get_access_settings , api_get_course_info gives the same result.

main/course_info/infocours.php

@@ -33,9 +33,7 @@ $is_allowedToEdit = $is_courseAdmin || $is_platformAdmin;
 
 $course_code = api_get_course_id();
 $courseId = api_get_course_int_id();
-$course_access_settings = CourseManager::get_access_settings($course_code);
 
-//LOGIC FUNCTIONS
 function is_settings_editable()
 {
     return isset($GLOBALS['course_info_is_editable']) && $GLOBALS['course_info_is_editable'];
@@ -677,8 +675,8 @@ $values['course_language'] = $_course['language'];
 $values['department_name'] = $_course['extLink']['name'];
 $values['department_url'] = $_course['extLink']['url'];
 $values['visibility'] = $_course['visibility'];
-$values['subscribe'] = $course_access_settings['subscribe'];
-$values['unsubscribe'] = $course_access_settings['unsubscribe'];
+$values['subscribe'] = $_course['subscribe'];
+$values['unsubscribe'] = $_course['unsubscribe'];
 $values['course_registration_password'] = $all_course_information['registration_code'];
 $values['legal'] = $all_course_information['legal'];
 $values['activate_legal'] = $all_course_information['activate_legal'];

main/inc/lib/course.lib.php

@@ -240,28 +240,6 @@ class CourseManager
         return $data;
     }
 
-    /**
-     * Returns the access settings of the course:
-     * which visibility;
-     * whether subscribing is allowed;
-     * whether unsubscribing is allowed.
-     *
-     * @param string $course_code , the course code
-     * @todo for more consistency: use course_info call from database API
-     * @return array with int fields "visibility", "subscribe", "unsubscribe"
-     * @assert ('') === false
-     */
-    public static function get_access_settings($course_code)
-    {
-        return Database::fetch_array(
-            Database::query(
-                "SELECT visibility, subscribe, unsubscribe
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE code = '" . Database::escape_string($course_code) . "'"
-            )
-        );
-    }
-
     /**
      * Returns the status of a user in a course, which is COURSEMANAGER or STUDENT.
      * @param   int $user_id
@@ -3988,12 +3966,14 @@ 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::getUserInCourseStatus($user_id, $course_info['real_id']);
-        $course_info['status'] = empty($session_id) ? $status_course : STUDENT;
+
+        $user_in_course_status = CourseManager::getUserInCourseStatus(
+            $user_id,
+            $course_info['real_id']
+        );
+
+        $course_info['status'] = empty($session_id) ? $user_in_course_status : STUDENT;
         $course_info['id_session'] = $session_id;
-        $objUser = $entityManager->find('ChamiloUserBundle:User', $user_id);
-        $objCourse = $entityManager->find('ChamiloCoreBundle:Course', $course['real_id']);
-        $objSession = $entityManager->find('ChamiloCoreBundle:Session', $session_id);
         $now = date('Y-m-d h:i:s');
 
         // Table definitions
@@ -4001,18 +3981,12 @@ class CourseManager
         $tbl_session = Database:: get_main_table(TABLE_MAIN_SESSION);
         $tbl_session_category = Database:: get_main_table(TABLE_MAIN_SESSION_CATEGORY);
 
-        $course_access_settings = CourseManager::get_access_settings($course_info['code']);
-        $course_visibility = $course_access_settings['visibility'];
+        $course_visibility = $course_info['visibility'];
 
         if ($course_visibility == COURSE_VISIBILITY_HIDDEN) {
             return '';
         }
 
-        $user_in_course_status = CourseManager::getUserInCourseStatus(
-            api_get_user_id(),
-            $course_info['real_id']
-        );
-
         $is_coach = api_is_coach($course_info['id_session'], $course_info['real_id']);
 
         // Display course entry.
@@ -4191,6 +4165,10 @@ class CourseManager
             );
 
             if (api_get_setting('allow_skills_tool') === 'true') {
+                $objUser = $entityManager->find('ChamiloUserBundle:User', $user_id);
+                $objCourse = $entityManager->find('ChamiloCoreBundle:Course', $course['real_id']);
+                $objSession = $entityManager->find('ChamiloCoreBundle:Session', $session_id);
+
                 $skill = $entityManager
                     ->getRepository('ChamiloCoreBundle:Skill')
                     ->getLastByUser($objUser, $objCourse, $objSession);

main/inc/lib/social.lib.php

@@ -487,12 +487,9 @@ class SocialManager extends UserManager
         // Table definitions
         $main_user_table = Database :: get_main_table(TABLE_MAIN_USER);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-
-        $course_code = $my_course['code'];
         $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'];
+        $course_visibility = $my_course['course_info']['visibility'];
 
         $user_in_course_status = CourseManager::getUserInCourseStatus(
             api_get_user_id(),