Whispeak: Fix condition for authentify on exercise - refs BT#16007

plugin/whispeakauth/authentify.php

@@ -16,9 +16,15 @@ $showForm = !$userId;
 $lpItemInfo = ChamiloSession::read(WhispeakAuthPlugin::SESSION_LP_ITEM, []);
 /** @var learnpath $oLp */
 $oLp = ChamiloSession::read('oLP', null);
+/** @var array $lpQuestionInfo */
 $lpQuestionInfo = ChamiloSession::read(WhispeakAuthPlugin::SESSION_QUIZ_QUESTION, []);
+/** @var Exercise $objExercise */
+$objExercise = ChamiloSession::read('objExercise', null);
 
-$showHeader = (empty($lpItemInfo) && empty($oLp)) && empty($lpQuestionInfo);
+$isAuthOnLp = !empty($lpItemInfo) && !empty($oLp);
+$isAuthOnQuiz = !empty($lpQuestionInfo) && !empty($objExercise);
+
+$showFullPage = !$isAuthOnLp && !$isAuthOnQuiz;
 
 if (ChamiloSession::read(WhispeakAuthPlugin::SESSION_AUTH_PASSWORD, false)) {
     ChamiloSession::erase(WhispeakAuthPlugin::SESSION_AUTH_PASSWORD);
@@ -58,7 +64,7 @@ if ($userId) {
     if (empty($wsid)) {
         $message = Display::return_message($plugin->get_lang('SpeechAuthNotEnrolled'), 'warning');
 
-        if (!empty($lpQuestionInfo)) {
+        if (!empty($lpQuestionInfo) && empty($lpItemInfo)) {
             echo $message;
         } else {
             Display::addFlash($message);
@@ -70,7 +76,7 @@ if ($userId) {
     }
 }
 
-if (!empty($lpQuestionInfo)) {
+if (!empty($lpQuestionInfo) && empty($lpItemInfo)) {
     echo api_get_js('rtc/RecordRTC.js');
     echo api_get_js_simple(api_get_path(WEB_PLUGIN_PATH).'whispeakauth/assets/js/RecordAudio.js');
 } else {
@@ -83,14 +89,14 @@ $sampleText = '';
 try {
     $sampleText = WhispeakAuthRequest::authenticateSentence($plugin);
 } catch (Exception $exception) {
-    if ($showHeader) {
+    if ($showFullPage) {
         api_not_allowed(
             true,
             Display::return_message($exception->getMessage(), 'error')
         );
     }
 
-    if (!$showHeader && $oLp) {
+    if (!$showFullPage && $oLp) {
         api_not_allowed(
             false,
             Display::return_message($exception->getMessage(), 'error')
@@ -103,9 +109,9 @@ try {
 ChamiloSession::write(WhispeakAuthPlugin::SESSION_SENTENCE_TEXT, $sampleText);
 
 $template = new Template(
-    !$showHeader ? '' : $plugin->get_title(),
-    $showHeader,
-    $showHeader,
+    !$showFullPage ? '' : $plugin->get_title(),
+    $showFullPage,
+    $showFullPage,
     false,
     true,
     false
@@ -115,7 +121,7 @@ $template->assign('sample_text', $sampleText);
 
 $content = $template->fetch('whispeakauth/view/authentify_recorder.html.twig');
 
-if (!empty($lpQuestionInfo)) {
+if (!empty($lpQuestionInfo) && empty($lpItemInfo)) {
     echo $content;
 
     exit;

plugin/whispeakauth/authentify_password.php

@@ -17,14 +17,19 @@ $lpItemInfo = ChamiloSession::read(WhispeakAuthPlugin::SESSION_LP_ITEM, []);
 $oLp = ChamiloSession::read('oLP', null);
 /** @var array $lpQuestionInfo */
 $lpQuestionInfo = ChamiloSession::read(WhispeakAuthPlugin::SESSION_QUIZ_QUESTION, []);
+/** @var Exercise $objExercise */
+$objExercise = ChamiloSession::read('objExercise', null);
 
-$showHeader = (empty($lpItemInfo) && empty($oLp)) && empty($lpQuestionInfo);
+$isAuthOnLp = !empty($lpItemInfo) && !empty($oLp);
+$isAuthOnQuiz = !empty($lpQuestionInfo) && !empty($objExercise);
+
+$showFullPage = !$isAuthOnLp && !$isAuthOnQuiz;
 
 if (empty($userId)) {
-    api_not_allowed($showHeader);
+    api_not_allowed($showFullPage);
 }
 
-if (!empty($lpQuestionInfo)) {
+if (!empty($lpQuestionInfo) && empty($lpItemInfo)) {
     echo Display::return_message(
         $plugin->get_lang('MaxAttemptsReached').'<br>'
         .'<strong>'.$plugin->get_lang('LoginWithUsernameAndPassword').'</strong>',
@@ -52,9 +57,9 @@ $form->setConstants(['sec_token' => Security::get_token()]);
 $form->addButton('submitAuth', get_lang('LoginEnter'), 'check', 'primary', 'default', 'btn-block');
 
 $template = new Template(
-    !$showHeader ? '' : $plugin->get_title(),
-    $showHeader,
-    $showHeader,
+    !$showFullPage ? '' : $plugin->get_title(),
+    $showFullPage,
+    $showFullPage,
     false,
     true,
     false
@@ -63,7 +68,7 @@ $template->assign('form', $form->returnForm());
 
 $content = $template->fetch('whispeakauth/view/authentify_password.html.twig');
 
-if (!empty($lpQuestionInfo)) {
+if (!empty($lpQuestionInfo) && empty($lpItemInfo)) {
     echo $content;
 
     exit;