Exercise: Fix oral recording type handling & prevent duplicate feedback audio - refs #7121

Author: christianbeeznest

public/main/inc/ajax/record_audio_rtc.ajax.php

@@ -85,9 +85,22 @@
 
     $em->persist($node);
 
+    // Force a distinct "original_name" for attempt vs feedback.
+    // WebRTC uploads often reuse the same client filename for both recordings, which makes
+    // attempt and feedback indistinguishable in DB. We build a stable filename from $title.
+    $ext = (string) pathinfo((string) $originalName, PATHINFO_EXTENSION);
+    $ext = $ext !== '' ? strtolower($ext) : 'webm';
+
+    $safeBaseName = $title !== '' ? $title : (string) pathinfo((string) $originalName, PATHINFO_FILENAME);
+    $safeBaseName = api_replace_dangerous_char($safeBaseName);
+    $safeBaseName = disable_dangerous_file($safeBaseName);
+
+    $forcedOriginalName = $safeBaseName.'.'.$ext;
+
+    // "true" => test mode, do not enforce HTTP upload checks (consistent with current behavior).
     $uploadedFile = new UploadedFile(
         $tmpName,
-        $originalName,
+        $forcedOriginalName,
         $mimeType,
         $errorCode,
         true

public/main/inc/lib/exercise_show_functions.lib.php

@@ -253,35 +253,32 @@ public static function display_oral_expression_answer(
             return;
         }
 
-        // Student recorded answer(s)
-        // getOralFileAudio() ya NO debe incluir los ResourceNode usados en AttemptFeedback.
+        // Student recorded answer(s).
+        // getOralFileAudio() must NOT include ResourceNodes used by AttemptFeedback.
         $studentAudioHtml = ExerciseLib::getOralFileAudio($trackExerciseId, $questionId);
 
         if (!empty($studentAudioHtml)) {
             echo $studentAudioHtml;
         }
 
-        // Optional text answer written by the student
+        // Optional text answer written by the student.
         if (!empty($answer)) {
             echo Display::tag('p', Security::remove_XSS($answer));
         }
 
-        // Teacher correction: comments and audio feedback
+        // Teacher correction must NOT be rendered here.
+        // It is rendered in the feedback section (FCK) inside exercise_show.php.
+        // We only compute these values to decide whether to show the "Not corrected yet" warning.
         $comment = Event::get_comments($trackExerciseId, $questionId);
+
+        // Use wrap=false for consistency with the feedback area.
         $teacherAudio = ExerciseLib::getOralFeedbackAudio(
             $trackExerciseId,
-            $questionId
+            $questionId,
+            false
         );
 
-        if (!empty($teacherAudio)) {
-            echo $teacherAudio;
-        }
-
-        if (!empty($comment)) {
-            echo Display::tag('p', Security::remove_XSS($comment));
-        }
-
-        // Optional "not corrected yet" warning
+        // Optional "not corrected yet" warning.
         if (
             $showAlertIfNotCorrected &&
             !$questionScore &&

src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php

@@ -124,7 +124,7 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $
                 $question = $questionRepo->findOneBy(['resourceNode' => $resourceNode]);
                 if ($question) {
                     // Check if it's a Hotspot-type question
-                    if (\in_array($question->getType(), [6, 7, 8, 20], true)) { // HOT_SPOT, HOT_SPOT_ORDER, HOT_SPOT_DELINEATION, ANNOTATION
+                    if (\in_array($question->getType(), [6, 7, 8, 20, 13], true)) { // HOT_SPOT, HOT_SPOT_ORDER, HOT_SPOT_DELINEATION, ANNOTATION
                         $rel = $this->entityManager
                             ->getRepository(CQuizRelQuestion::class)
                             ->findOneBy(['question' => $question])