From 4d7d5c72c3749e1d7f24e5bfd34299551b746ab3 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 20 Oct 2021 17:48:45 -0500
Subject: [PATCH 1/2] UniqueAnswerImage header shows UniqueAnswer header

---
 main/exercise/UniqueAnswerImage.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/main/exercise/UniqueAnswerImage.php b/main/exercise/UniqueAnswerImage.php
index 118373cb23..46cb44f2aa 100644
--- a/main/exercise/UniqueAnswerImage.php
+++ b/main/exercise/UniqueAnswerImage.php
@@ -425,29 +425,4 @@ class UniqueAnswerImage extends UniqueAnswer
         $this->updateWeighting($questionWeighting);
         $this->save($exercise);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function return_header(Exercise $exercise, $counter = null, $score = [])
-    {
-        if ($exercise->showExpectedChoice()) {
-            $header = '<table class="'.$this->question_table_class.'">
-			<tr>
-				<th>'.get_lang('Choice').'</th>';
-            if ($exercise->showExpectedChoiceColumn()) {
-                $header .= '<th>'.get_lang('ExpectedChoice').'</th>';
-            }
-            $header .= '<th>'.get_lang('Answer').'</th>';
-            $header .= '<th>'.get_lang('Status').'</th>';
-            if (false === $exercise->hideComment) {
-                $header .= '<th>'.get_lang('Comment').'</th>';
-            }
-            $header .= '</tr>';
-        } else {
-            $header = parent::return_header($exercise, $counter, $score);
-        }
-
-        return $header;
-    }
 }

From ad0963d19a872b731d4e939e16cb041ff1c6cff8 Mon Sep 17 00:00:00 2001
From: NicoDucou <nicolas@ldd.fr>
Date: Thu, 21 Oct 2021 11:37:32 +0200
Subject: [PATCH 2/2] SSO: fix CAS skip force redirect to use the configuration
 variable and not a specific path

---
 main/inc/local.inc.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index fb4f9d9acb..7f9c347827 100755
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -281,9 +281,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
 
         $load = true;
         if (isset($cas['skip_force_redirect_in'])) {
-            $skipCas = [
-                '/main/webservices/',
-            ];
+            $skipCas = $cas['skip_force_redirect_in'];
             foreach ($skipCas as $folder) {
                 if (false !== strpos($_SERVER['REQUEST_URI'], $folder)) {
                     $load = false;