فهرست منبع

Minor - cosmetic changes

Julio Montoya 12 سال پیش
والد
کامیت
42af2880f3
4فایلهای تغییر یافته به همراه13 افزوده شده و 22 حذف شده
  1. 0 1
      main/auth/my_progress.php
  2. 3 3
      main/inc/lib/banner.lib.php
  3. 4 3
      main/inc/lib/template.lib.php
  4. 6 15
      main/inc/lib/tracking.lib.php

+ 0 - 1
main/auth/my_progress.php

@@ -50,7 +50,6 @@ require_once api_get_path(SYS_CODE_PATH).'mySpace/myspace.lib.php';
 
 $user_id = api_get_user_id();
 
-// Code to 
 $course_user_list = CourseManager::get_courses_list_by_user_id($user_id);
 $dates = $issues = '';
 

+ 3 - 3
main/inc/lib/banner.lib.php

@@ -257,8 +257,8 @@ function return_navigation_array() {
         }
 
         // Reporting
-        if (api_get_setting('show_tabs', 'reporting') == 'true') {
-            if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+        if (api_get_setting('show_tabs', 'reporting') == 'true') {            
+            if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {                
                 $navigation['session_my_space'] = $possible_tabs['session_my_space'];
             } else {
                 $navigation['session_my_space'] = $possible_tabs['session_my_progress'];
@@ -325,7 +325,7 @@ function return_navigation_array() {
 function return_menu() {
     $navigation         = return_navigation_array();
     $navigation         = $navigation['navigation'];
-
+    
     // Displaying the tabs
 
     $lang = ''; //el for "Edit Language"

+ 4 - 3
main/inc/lib/template.lib.php

@@ -587,11 +587,12 @@ class Template {
         $this->assign('bug_notification_link', $bug_notification_link);
 
         $notification = return_notification_menu();
-        $menu = return_menu();
-        $breadcrumb = return_breadcrumb($interbreadcrumb, $language_file, $nameTools);
-
         $this->assign('notification_menu', $notification);
+        
+        $menu = return_menu();
         $this->assign('menu', $menu);
+        
+        $breadcrumb = return_breadcrumb($interbreadcrumb, $language_file, $nameTools);
         $this->assign('breadcrumb', $breadcrumb);
 
         $extra_header = null;

+ 6 - 15
main/inc/lib/tracking.lib.php

@@ -2113,10 +2113,10 @@ class Tracking {
 			$tbl_course		            = Database :: get_main_table(TABLE_MAIN_COURSE);
 			$tbl_session		        = Database :: get_main_table(TABLE_MAIN_SESSION);
 			$tbl_course_user            = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-			$tbl_access_rel_course      = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+			$tbl_access_rel_course      = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);            
 			$tbl_session_course_user    = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 			$tbl_access_rel_session     = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-			$tbl_access_rel_course      = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+			
 			$user_id                    = intval($user_id);
 
 			// get course list
@@ -2130,19 +2130,11 @@ class Tracking {
 			}
 
 			$rs = Database::query($sql);
-			$courses = $course_in_session = $temp_course_in_session = array();
-			
-			$courses = array();
+			$courses = $course_in_session = $temp_course_in_session = array();			
 			while($row = Database :: fetch_array($rs, 'ASSOC')) {
 				$courses[$row['code']] = $row['title'];
 			}
-				
-			/*
-			if (!empty($courses)) {
-				//sort need to be improved
-				sort($courses);
-			}*/
-			
+						
 			// Get the list of sessions where the user is subscribed as student
 			if ($_configuration['multiple_access_urls']) {
 				$sql = 'SELECT DISTINCT cu.course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a  ON(a.session_id = cu.id_session) INNER JOIN '.$tbl_session.' s  ON(s.id = a.session_id) 
@@ -2162,9 +2154,8 @@ class Tracking {
 			}			
 			foreach($simple_session_array as $my_session_id => $session_name) {
 				$course_list = $temp_course_in_session[$my_session_id]['course_list'];
-				$my_course_data = array();
-				
-				foreach($course_list as $course_data) {
+				$my_course_data = array();				
+				foreach ($course_list as $course_data) {
 					$my_course_data[$course_data['id']] = $course_data['title'];
 				}
 				$my_course_data = utf8_sort($my_course_data);