Browse Source

Merge branch 'chamilo10'

Julio Montoya 11 years ago
parent
commit
4e7bb7d4f5
2 changed files with 17 additions and 10 deletions
  1. 7 7
      main/admin/user_information.php
  2. 10 3
      main/inc/lib/sessionmanager.lib.php

+ 7 - 7
main/admin/user_information.php

@@ -103,21 +103,21 @@ if (count($sessions) > 0) {
         $id_session = $session_item['session_id'];
 
         foreach ($session_item['courses'] as $my_course) {
-            $course_info = api_get_course_info($my_course['code']);
+            $courseInfo = api_get_course_info_by_id($my_course['id']);
             $row = array();
-            $row[] = $my_course['code'];
-            $row[] = $course_info['title'];
+            $row[] = $courseInfo['code'];
+            $row[] = $courseInfo['title'];
             //$row[] = $my_course['status'] == STUDENT ? get_lang('Student') : get_lang('Teacher');
 
-            $roles = api_detect_user_roles($user['user_id'], $my_course['real_id'], $id_session);
+            $roles = api_detect_user_roles($user['user_id'], $courseInfo['real_id'], $id_session);
             $row[] = api_get_roles_to_string($roles);
-            $tools = '<a href="course_information.php?code='.$course_info['code'].'&id_session='.$id_session.'">'.Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
-                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course_info['path'].'?id_session='.$id_session.'">'.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>';
+            $tools = '<a href="course_information.php?code='.$courseInfo['code'].'&id_session='.$id_session.'">'.Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
+                    '<a href="'.api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'?id_session='.$id_session.'">'.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>';
 
             $row[] = $tools;
             $data[] = $row;
         }
-        $dates = array_filter(array($session_item['date_start'], $session_item['date_end']));
+        $dates = SessionManager::parse_session_dates($session_item);
         echo Display::page_subheader($session_item['session_name'], ' '.implode(' - ', $dates));
 
         Display :: display_sortable_table($header, $data, array (), array(), array ('user_id' => intval($_GET['user_id'])));

+ 10 - 3
main/inc/lib/sessionmanager.lib.php

@@ -2873,10 +2873,17 @@ class SessionManager
      * @params array An array with all the session dates
      * @return string
      */
-    static function parse_session_dates($session_info) {
+    static function parse_session_dates($session_info)
+    {
         //This will clean the variables if 0000-00-00 00:00:00 the variable will be empty
-        $start_date = api_get_local_time($session_info['display_start_date'], null, null, true);
-        $end_date = api_get_local_time($session_info['display_end_date'], null, null, true);
+        $start_date = null;
+        $end_date = null;
+        if (isset($session_info['display_start_date'])) {
+            $start_date = api_get_local_time($session_info['display_start_date'], null, null, true);
+        }
+        if (isset($session_info['display_end_date'])) {
+            $end_date = api_get_local_time($session_info['display_end_date'], null, null, true);
+        }
         $msg_date = null;
         if (!empty($start_date) && !empty($end_date)) {
             //$msg_date = get_lang('From').' '.$start_date.' '.get_lang('To').' '.$end_date;