Merge remote-tracking branch 'origin/master'

Author: AngelFQC

assets/vue/composables/sidebarMenu.js

@@ -257,6 +257,31 @@ export function useSidebarMenu() {
       }
     }
 
+    {
+      const roles = securityStore.user?.roles || []
+      const isQuestionManager =
+        securityStore.isAdmin ||
+        roles.includes("ROLE_QUESTION_MANAGER")
+
+      if (isQuestionManager) {
+        const questionAdminItems = [
+          {
+            label: t("Questions"),
+            url: "/main/admin/questions.php",
+            icon: "mdi mdi-comment-question-outline",
+            class: "pl-4",
+          },
+        ]
+
+        items.push({
+          icon: "mdi mdi-comment-question-outline",
+          label: t("Question manager"),
+          items: questionAdminItems,
+          expanded: isActive({ items: questionAdminItems }),
+        })
+      }
+    }
+
     if (showTabs.value.includes("session_admin") && (securityStore.isAdmin || securityStore.isSessionAdmin)) {
       const sessionAdminItems = [
         {

public/main/admin/questions.php

@@ -18,7 +18,14 @@
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-api_protect_admin_script();
+$user = api_get_current_user();
+
+if (!api_is_platform_admin() && (!$user || !$user->hasRole('ROLE_QUESTION_MANAGER'))) {
+    api_not_allowed(true);
+    return false;
+}
+
+api_block_inactive_user();
 
 Session::erase('objExercise');
 Session::erase('objQuestion');
@@ -376,9 +383,14 @@
         exit;
 }
 
+$backUrl = Container::getRouter()->generate('admin');
+if ($user->hasRole('ROLE_QUESTION_MANAGER')) {
+    $backUrl = Container::getRouter()->generate('index');
+}
+
 $actionsLeft = Display::url(
     Display::return_icon('back.png', get_lang('Administration'), [], ICON_SIZE_MEDIUM),
-    Container::getRouter()->generate('admin'),
+    $backUrl,
 );
 
 $exportUrl = '/main/admin/questions.php?'.http_build_query(['action' => 'export_pdf', ...$params]);

public/main/exercise/exercise_reminder.php

@@ -50,7 +50,7 @@
 
 if ($time_control) {
     // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
+    $time_left = api_strtotime($clock_expired_time, 'UTC') - time();
     $htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left);
 }
 

public/main/exercise/exercise_submit.php

@@ -431,11 +431,11 @@
 
         $clock_expired_time = api_get_utc_datetime($expected_time, false, true);
         if ($debug) {
-            error_log('5.3. $expected_time '.$clock_expired_time);
+            error_log('5.3. $expected_time '.$clock_expired_time->format('Y-m-d H:i:s'));
         }
 
         //Sessions  that contain the expired time
-        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
+        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time->format('Y-m-d H:i:s');
         if ($debug) {
             error_log(
                 '5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key]

public/main/exercise/overview.php

@@ -69,7 +69,7 @@
 $htmlHeadXtra[] = api_get_build_js('legacy_exercise.js');
 if ($time_control) {
     // Get time left for expiring time
-    $time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
+    $time_left = api_strtotime($clock_expired_time, 'UTC') - time();
     /*$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
     $htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
@@ -145,7 +145,7 @@
 );
 
 if ($time_control && !empty($exercise_stat_info['exe_id']) && !empty($clock_expired_time)) {
-    $time_left_check = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
+    $time_left_check = api_strtotime($clock_expired_time, 'UTC') - time();
     if ($time_left_check <= 0) {
         $result_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?'
             . api_get_cidreq()

public/main/inc/lib/exercise.lib.php

@@ -2030,8 +2030,12 @@ public static function get_session_time_control_key(
             $lp_id,
             $lp_item_id
         );
-        if (isset($_SESSION['expired_time']) && isset($_SESSION['expired_time'][$time_control_key])) {
-            $return_value = $_SESSION['expired_time'][$time_control_key];
+	if (isset($_SESSION['expired_time']) && isset($_SESSION['expired_time'][$time_control_key])) {
+            if ($_SESSION['expired_time'][$time_control_key] instanceof DateTimeInterface) {
+                $return_value = $_SESSION['expired_time'][$time_control_key]->format('Y-m-d H:i:s');
+            } else {
+                $return_value = $_SESSION['expired_time'][$time_control_key];
+            }
         }
 
         return $return_value;
@@ -5602,12 +5606,12 @@ public static function getOralFeedbackAudio(int $attemptId, int $questionId): st
             return '';
         }
 
-        $html = '';
-
         $assetRepo = Container::getAssetRepository();
+        $html = '';
 
+        // Keep only the latest audio feedback to avoid duplicated players
         foreach ($qAttempt->getAttemptFeedbacks() as $attemptFeedback) {
-            $html .= Display::tag(
+            $html = Display::tag(
                 'audio',
                 '',
                 [

src/CoreBundle/Enums/ObjectIcon.php

@@ -156,4 +156,7 @@ enum ObjectIcon: string
     case CATALOGUE = 'bookmark-multiple-outline';
 
     case EVENT_REMINDER = 'alarm';
+    // Question icon
+    case QUESTION = 'comment-question-outline';
+
 }