Fix time appearing as UTC. Set to local - fixes CT#7862

main/auth/my_progress.php

@@ -67,7 +67,7 @@ if (!empty($course_user_list)) {
         }
         $course_info = api_get_course_info($result['course_code']);
         $course_image = '<img src="'.$course_info['course_image'].'">';
-        $dates .= '<li><a href="#'.$login.'">'.api_get_utc_datetime($login).'</a></li>';
+        $dates .= '<li><a href="#'.$login.'">'.api_get_local_time($login).'</a></li>';
         $issues .= '<li id ="'.$login.'">
                         <div class="row">
                             <div class="span2"><div class="thumbnail">'.$course_image.'</div>

main/dropbox/dropbox_functions.inc.php

@@ -519,22 +519,48 @@ function display_add_form($dropbox_unid, $viewReceivedCategory, $viewSentCategor
             );
         }
 
-        $hideCoach = api_get_configuration_value('dropbox_hide_course_coach');
+        $complete_user_list2 = CourseManager::get_coach_list_from_course_code(
-        if ($hideCoach == false) {
+            $course_info['code'],
-            $complete_user_list2 = CourseManager::get_coach_list_from_course_code(
+            api_get_session_id()
-                $course_info['code'],
+        );
-                api_get_session_id()
+
+        $generalCoachList = array();
+        $courseCoachList = array();
+        foreach ($complete_user_list2 as $coach) {
+            if ($coach['type'] == 'general_coach') {
+                $generalCoachList[] = $coach;
+            } else {
+                $courseCoachList[] = $coach;
+            }
+        }
+
+        $hideCourseCoach = api_get_configuration_value('dropbox_hide_course_coach');
+        if ($hideCourseCoach == false) {
+            $complete_user_list_for_dropbox = array_merge(
+                $complete_user_list_for_dropbox,
+                $courseCoachList
             );
+        }
+        $hideGeneralCoach = api_get_configuration_value('dropbox_hide_general_coach');
+
+        if ($hideGeneralCoach == false) {
             $complete_user_list_for_dropbox = array_merge(
                 $complete_user_list_for_dropbox,
-                $complete_user_list2
+                $generalCoachList
             );
         }
+
     } else {
         if (api_get_setting('dropbox_allow_student_to_student') == 'true' || $_user['status'] != STUDENT) {
-            $complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], api_get_session_id());
+            $complete_user_list_for_dropbox = CourseManager:: get_user_list_from_course_code(
+                $course_info['code'],
+                api_get_session_id()
+            );
         } else {
-            $complete_user_list_for_dropbox = CourseManager :: get_teacher_list_from_course_code($course_info['code'], false);
+            $complete_user_list_for_dropbox = CourseManager:: get_teacher_list_from_course_code(
+                $course_info['code'],
+                false
+            );
         }
     }
 
@@ -542,7 +568,10 @@ function display_add_form($dropbox_unid, $viewReceivedCategory, $viewSentCategor
         foreach ($complete_user_list_for_dropbox as $k => $e) {
             $complete_user_list_for_dropbox[$k] = $e + array('lastcommafirst' => api_get_person_name($e['firstname'], $e['lastname']));
         }
-        $complete_user_list_for_dropbox = TableSort::sort_table($complete_user_list_for_dropbox, 'lastcommafirst');
+        $complete_user_list_for_dropbox = TableSort::sort_table(
+            $complete_user_list_for_dropbox,
+            'lastcommafirst'
+        );
     }
 
     /*
@@ -569,7 +598,6 @@ function display_add_form($dropbox_unid, $viewReceivedCategory, $viewSentCategor
         }
     }
 
-
     /*
     * Show groups
     */

main/inc/lib/course.lib.php

@@ -1723,8 +1723,11 @@ class CourseManager
         $users = array();
 
         // We get the coach for the given course in a given session.
-        $sql = 'SELECT id_user FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
+        $sql = 'SELECT id_user FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).'
-               ' WHERE id_session="'.$session_id.'" AND course_code="'.$course_code.'" AND status = 2';
+                WHERE
+                    id_session="'.$session_id.'" AND
+                    course_code="'.$course_code.'" AND
+                    status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['id_user']);
@@ -1732,7 +1735,9 @@ class CourseManager
             $user_info['role'] = $user['role'];
             $user_info['tutor_id'] = $user['tutor_id'];
             $user_info['email'] = $user['email'];
+            $user_info['type'] = 'course_coach';
             $users[$user['id_user']] = $user_info;
+
         }
 
         $table = Database::get_main_table(TABLE_MAIN_SESSION);
@@ -1745,6 +1750,7 @@ class CourseManager
         $user_info['role'] = $user['role'];
         $user_info['tutor_id'] = $user['tutor_id'];
         $user_info['email'] = $user['email'];
+        $user_info['type'] = 'general_coach';
         $users[$session_id_coach] = $user_info;
 
         return $users;

main/install/configuration.dist.php

@@ -307,6 +307,8 @@ $_configuration['system_stable']     = NEW_VERSION_STABLE;
 //$_configuration['hide_certificate_export_link'] = false;
 // Hide session course coach in dropbox sent to user list
 // $_configuration['dropbox_hide_course_coach'] = false;
+// Hide general session coach in dropbox sent to user list
+// $_configuration['dropbox_hide_general_coach'] = false;
 // Show Default view and Session view link in My Courses tab
 //$_configuration['my_courses_view_by_session'] = false;
 // Allow agenda events coloring