Minor corrections

main/inc/lib/urlmanager.lib.php

@@ -603,6 +603,18 @@ class UrlManager
 		$url_list = Database::store_result($result);
 		return $url_list;
 	}
+	
+   public static function get_access_url_from_session($session_id) {
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url  = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $sql = "SELECT url, access_url_id FROM $table_url_rel_session url_rel_session INNER JOIN $table_url u
+                ON (url_rel_session.access_url_id = u.id)
+                WHERE session_id = ".Database::escape_string($session_id);
+        $result = Database::query($sql);
+        $url_list = Database::store_result($result);
+        return $url_list;
+    }
+    
 
 	/**
 	 *

user_portal.php

@@ -91,7 +91,7 @@ define('CONFVAL_dateFormatForInfosFromCourses', get_lang('dateFormatLong'));
 define("CONFVAL_limitPreviewTo", SCRIPTVAL_NewEntriesOfTheDayOfLastLogin);
 
 // This is the main function to get the course list.
-$personal_course_list = UserManager::get_personal_session_course_list($_user['user_id']);
+$personal_course_list = UserManager::get_personal_session_course_list(api_get_user_id());
 
 // Check if a user is enrolled only in one course for going directly to the course after the login.
 if (api_get_setting('go_to_course_after_login') == 'true') {
@@ -230,7 +230,7 @@ $visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUD
 SystemAnnouncementManager :: display_announcements($visibility, $announcement);
 
 if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['include'])) {
-    include ('./home/'.$_GET['include']);
+    include './home/'.$_GET['include'];
     $pageIncluded = true;
 } else {
 
@@ -240,20 +240,20 @@ if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['in
     // for the current user.
 
     if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-        $courses_tree = UserManager::get_sessions_by_category($_user['user_id'], true, true);
+        $courses_tree = UserManager::get_sessions_by_category(api_get_user_id(), true, true);
     } else {
-        $courses_tree = UserManager::get_sessions_by_category($_user['user_id'], true);
+        $courses_tree = UserManager::get_sessions_by_category(api_get_user_id(), true);
     }
     foreach ($courses_tree as $cat => $sessions) {
         $courses_tree[$cat]['details'] = SessionManager::get_session_category($cat);
         if ($cat == 0) {
-            $courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id($_user['user_id'], false);
+            $courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id(api_get_user_id(), false);
         }
         $courses_tree[$cat]['sessions'] = array_flip(array_flip($sessions));
         if (count($courses_tree[$cat]['sessions']) > 0) {
             foreach ($courses_tree[$cat]['sessions'] as $k => $s_id) {
                 $courses_tree[$cat]['sessions'][$k] = array('details' => SessionManager::fetch($s_id));
-                $courses_tree[$cat]['sessions'][$k]['courses'] = UserManager::get_courses_list_by_session($_user['user_id'], $s_id);
+                $courses_tree[$cat]['sessions'][$k]['courses'] = UserManager::get_courses_list_by_session(api_get_user_id(), $s_id);
             }
         }
     }