Upgrade 1-11.38

main/exercise/fill_blanks.class.php

@@ -404,6 +404,8 @@ class FillBlanks extends Question
 
         // remove starting and ending space and  
         $answer = api_preg_replace("/\xc2\xa0/", " ", $answer);
+        // remove invisible Unicode characters introduced by word processors
+        $answer = self::stripInvisibleChars($answer);
 
         // start and end separator
         $blankStartSeparator = self::getStartSeparator($form->getSubmitValue('select_separator'));
@@ -748,13 +750,13 @@ class FillBlanks extends Question
                     $listSeveral
                 );
                 //$studentAnswer = htmlspecialchars($studentAnswer);
-                $result = in_array($studentAnswer, $listSeveral);
+                $result = in_array(self::trimOption($studentAnswer), $listSeveral);
                 break;
             case self::FILL_THE_BLANK_STANDARD:
             default:
                 $correctAnswer = api_html_entity_decode($correctAnswer);
                 //$studentAnswer = htmlspecialchars($studentAnswer);
-                $result = $studentAnswer == self::trimOption($correctAnswer);
+                $result = self::trimOption($studentAnswer) == self::trimOption($correctAnswer);
                 break;
         }
 
@@ -824,15 +826,14 @@ class FillBlanks extends Question
         $listDetails = explode(':', $listArobaseSplit[0]);
 
         // < number of item after the ::[score]:[size]:[separator_id]@ , here there are 3
+        $listWeightings = explode(',', $listDetails[0]);
         if (count($listDetails) < 3) {
-            $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = [];
             for ($i = 0; $i < count($listWeightings); $i++) {
                 $listSizeOfInput[] = 200;
             }
             $blankSeparatorNumber = 0; // 0 is [...]
         } else {
-            $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = explode(',', $listDetails[1]);
             $blankSeparatorNumber = $listDetails[2];
         }
@@ -1258,8 +1259,6 @@ class FillBlanks extends Question
      * @param int    $feedbackType
      * @param bool   $resultsDisabled
      * @param bool   $showTotalScoreAndUserChoices
-     *
-     * @return string
      */
     public static function getHtmlAnswer(
         $answer,
@@ -1269,7 +1268,7 @@ class FillBlanks extends Question
         $resultsDisabled = false,
         $showTotalScoreAndUserChoices = false,
         $exercise
-    ) {
+    ): string {
         $hideExpectedAnswer = false;
         $hideUserSelection = false;
         if (!$exercise->showExpectedChoiceColumn()) {
@@ -1411,10 +1410,8 @@ class FillBlanks extends Question
      * Check if a answer is correct by its text.
      *
      * @param string $answerText
-     *
-     * @return bool
      */
-    public static function isCorrect($answerText)
+    public static function isCorrect($answerText): bool
     {
         $answerInfo = self::getAnswerInfo($answerText, true);
         $correctAnswerList = $answerInfo['words'];
@@ -1433,10 +1430,8 @@ class FillBlanks extends Question
      * Clear the answer entered by student.
      *
      * @param string $answer
-     *
-     * @return string
      */
-    public static function clearStudentAnswer($answer)
+    public static function clearStudentAnswer($answer): string
     {
         $answer = htmlentities(api_utf8_encode($answer), ENT_QUOTES);
         $answer = str_replace('&#039;', '&#39;', $answer); // fix apostrophe
@@ -1447,7 +1442,23 @@ class FillBlanks extends Question
     }
 
     /**
-     * Removes double spaces between words.
+     * Strips invisible/problematic Unicode characters introduced by word
+     * processors such as Microsoft Word.
+     * U+00A0 is normalised to a regular space; all others are removed.
+     */
+    private static function stripInvisibleChars(string $text): string
+    {
+        $text = str_replace("\u{00A0}", ' ', $text); // Non-Breaking Space → space
+
+        return str_replace(
+            ["\u{00AD}", "\u{200B}", "\u{200C}", "\u{200D}", "\u{2060}", "\u{FEFF}"],
+            '',
+            $text
+        );
+    }
+
+    /**
+     * Strips invisible characters and normalises whitespace.
      *
      * @param string $text
      *
@@ -1456,7 +1467,8 @@ class FillBlanks extends Question
     private static function trimOption($text)
     {
         $text = trim($text);
+        $text = self::stripInvisibleChars($text);
 
-        return preg_replace("/\s+/", ' ', $text);
+        return preg_replace("/\s+/", ' ', trim($text));
     }
 }