Merge pull request #7248 from christianbeeznest/GH-3201

Exercise: Fix quiz admin redirects, hotspot flow, and flash message translations - refs #3201

Author: christianbeeznest

public/main/exercise/admin.php

@@ -379,10 +379,16 @@
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'build/libs/select2/js/select2.min.js"></script>';
 $htmlHeadXtra[] = '<script>$(function(){ if ($.fn.select2){ $(".ch-select2").select2({width:"100%"}); } });</script>';
 
-if (isset($_GET['message'])) {
-    if (in_array($_GET['message'], ['ExerciseStored', 'ItemUpdated', 'ItemAdded'])) {
-        Display::addFlash(Display::return_message(get_lang($_GET['message']), 'confirmation'));
-    }
+$messageMap = [
+    'ExerciseStored' => 'Exercise stored',
+    'ItemUpdated' => 'Item updated',
+    'ItemAdded' => 'Item added',
+];
+
+if (isset($_GET['message']) && isset($messageMap[$_GET['message']])) {
+    Display::addFlash(
+        Display::return_message(get_lang($messageMap[$_GET['message']]), 'confirmation')
+    );
 }
 
 Display::display_header($nameTools, 'Exercise');
@@ -619,11 +625,16 @@
 
 if (isset($_GET['hotspotadmin'])) {
     if (!is_object($objQuestion)) {
-        $objQuestion = Question::read($_GET['hotspotadmin']);
+        $objQuestion = Question::read((int) $_GET['hotspotadmin']);
     }
     if (!$objQuestion) {
         api_not_allowed();
     }
+
+    // If we already processed POST above, don't process it again here (avoid double-save).
+    $hotspot_skip_processing = !empty($hotspotAlreadyProcessed);
+    $hotspot_skip_display = false;
+
     require 'hotspot_admin.inc.php';
 }
 

public/main/exercise/hotspot_admin.inc.php

@@ -20,6 +20,9 @@
 $answerType = $objQuestion->selectType();
 
 $debug = 0;
+$hotspot_skip_processing = $hotspot_skip_processing ?? false;
+$hotspot_skip_display = $hotspot_skip_display ?? false;
+
 
 $reponse = $_REQUEST['reponse'] ?? null;
 $comment = $_REQUEST['comment'] ?? null;
@@ -76,7 +79,7 @@
 $buttonBack = isset($_POST['buttonBack']) ? true : false;
 $nbrAnswers = isset($_POST['nbrAnswers']) ? (int) $_POST['nbrAnswers'] : 0;
 
-if ($submitAnswers || $buttonBack) {
+if (!$hotspot_skip_processing && ($submitAnswers || $buttonBack)) {
     if (in_array($answerType, [HOT_SPOT, HOT_SPOT_COMBINATION])) {
         if ($debug > 0) {
             echo '$submitAnswers or $buttonBack was set'."<br />\n";
@@ -181,8 +184,7 @@
             $editQuestion = $objQuestion->iid;
             unset($modifyAnswers);
             $redirect = $hotspot_admin_url.'&message=ItemUpdated';
-            echo '<meta http-equiv="refresh" content="0;url='.htmlspecialchars($redirect, ENT_QUOTES).'">';
-            echo '<script>top.location.replace("'.addslashes($redirect).'");</script>';
+            api_location($redirect);
             exit;
         }
 
@@ -382,13 +384,16 @@
             $editQuestion = $objQuestion->iid;
             unset($modifyAnswers);
             $redirect = $hotspot_admin_url.'&message=ItemUpdated';
-            echo '<meta http-equiv="refresh" content="0;url='.htmlspecialchars($redirect, ENT_QUOTES).'">';
-            echo '<script>top.location.replace("'.addslashes($redirect).'");</script>';
+            api_location($redirect);
             exit;
         }
     }
 }
 
+if ($hotspot_skip_display) {
+    return;
+}
+
 echo Display::page_header(get_lang('Question').': '.$objQuestion->selectTitle());
 
 if (isset($modifyAnswers)) {

public/main/exercise/question_admin.inc.php

@@ -80,7 +80,15 @@
         }
 
         if (in_array($objQuestion->type, [HOT_SPOT, HOT_SPOT_COMBINATION, HOT_SPOT_DELINEATION])) {
-            echo '<script>window.location.href="admin.php?exerciseId='.$exerciseId.'&page='.$page.'&hotspotadmin='.$objQuestion->id.'&'.api_get_cidreq().'"</script>';
+            $qid = (int) ($objQuestion->iid ?? 0);
+
+            $url = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'
+                .api_get_cidreq()
+                .'&exerciseId='.(int) $exerciseId
+                .'&page='.(int) $page
+                .'&hotspotadmin='.$qid;
+
+            api_location($url);
             exit;
         }
 

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

@@ -1641,7 +1641,7 @@ class="window window_left_question window{$questionId}_question">
             $hotspotColor = 0;
             if (HOT_SPOT_DELINEATION != $answerType) {
                 $answerList = '
-        <div class="p-4 rounded-md border border-gray-25">
+        <div class="card p-4 rounded-md border border-gray-25">
             <h5 class="font-bold text-lg mb-2 text-primary">'.get_lang('Image zones').'</h5>
             <ol class="list-decimal ml-6 space-y-2 text-primary">
         ';
@@ -1667,13 +1667,13 @@ class="window window_left_question window{$questionId}_question">
             if ($freeze) {
                 $relPath = api_get_path(WEB_CODE_PATH);
                 echo "
+        <div class=\"w-100\">
+                $answerList
+            </div>
         <div class=\"flex space-x-4\">
-            <div class=\"w-3/4\">
+            <div class=\"w-100\">
                 <div id=\"hotspot-preview-$questionId\" class=\"bg-gray-10 w-full bg-center bg-no-repeat bg-contain border border-gray-25\"></div>
             </div>
-            <div class=\"w-1/4\">
-                $answerList
-            </div>
         </div>
         <script>
             new ".(in_array($answerType, [HOT_SPOT, HOT_SPOT_COMBINATION]) ? "HotspotQuestion" : "DelineationQuestion")."({
@@ -1702,12 +1702,15 @@ class="window window_left_question window{$questionId}_question">
         <input type="hidden" name="hidden_hotspot_id" value="$questionId" />
         <div class="exercise_questions">
             $questionDescription
+            <div class="mb-4">
+              $answerList
+            </div>
             <div class="flex space-x-4">
 HOTSPOT;
             }
 
             $relPath = api_get_path(WEB_CODE_PATH);
-            $s .= "<div class=\"w-3/4\">
+            $s .= "<div>
            <div class=\"hotspot-image bg-gray-10 border border-gray-25 bg-center bg-no-repeat bg-contain\"></div>
             <script>
                 $(function() {
@@ -1722,9 +1725,6 @@ class="window window_left_question window{$questionId}_question">
                 });
             </script>
         </div>
-        <div class=\"w-1/4\">
-            $answerList
-        </div>
     ";
 
             echo <<<HOTSPOT