From 04092c431fbdb7adcb810c63cafaedef50bc8eb2 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Tue, 2 Jul 2019 15:50:12 +0200
Subject: [PATCH] Minor - fix message

---
 main/exercise/exercise.php        | 70 +++++++++++++++----------------
 main/exercise/hotpotatoes.lib.php |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/main/exercise/exercise.php b/main/exercise/exercise.php
index e79219a21c..96d3a54e96 100644
--- a/main/exercise/exercise.php
+++ b/main/exercise/exercise.php
@@ -283,16 +283,6 @@ if (!empty($action) && $is_allowedToEdit) {
     }
 }
 
-if ($origin !== 'learnpath') {
-    //so we are not in learnpath tool
-    Display::display_header($nameTools, get_lang('Exercise'));
-    if (isset($_GET['message']) && in_array($_GET['message'], ['ExerciseEdited'])) {
-        echo Display::return_message(get_lang('ExerciseEdited'), 'confirmation');
-    }
-} else {
-    Display::display_reduced_header();
-}
-
 Event::event_access_tool(TOOL_QUIZ);
 
 $logInfo = [
@@ -304,9 +294,6 @@ $logInfo = [
 ];
 Event::registerLog($logInfo);
 
-// Tool introduction
-Display::display_introduction_section(TOOL_QUIZ);
-
 HotPotGCt($documentPath, 1, $userId);
 
 // Only for administrator
@@ -335,7 +322,7 @@ if ($is_allowedToEdit) {
                         // deletes an exercise
                         $result = $objExerciseTmp->delete();
                         if ($result) {
-                            echo Display::return_message(get_lang('ExerciseDeleted'), 'confirmation');
+                            Display::addFlash(Display::return_message(get_lang('ExerciseDeleted'), 'confirmation'));
                         }
                         break;
                     case 'enable':
@@ -362,7 +349,7 @@ if ($is_allowedToEdit) {
                             'visible',
                             $userId
                         );
-                        echo Display::return_message(get_lang('VisibilityChanged'), 'confirmation');
+                        Display::addFlash(Display::return_message(get_lang('VisibilityChanged'), 'confirmation'));
                         break;
                     case 'disable':
                         if ($limitTeacherAccess && !api_is_platform_admin()) {
@@ -388,28 +375,21 @@ if ($is_allowedToEdit) {
                             'invisible',
                             $userId
                         );
-                        echo Display::return_message(
-                            get_lang('VisibilityChanged'),
-                            'confirmation'
-                        );
+                        Display::addFlash(Display::return_message(get_lang('VisibilityChanged'), 'confirmation'));
                         break;
                     case 'disable_results':
                         //disable the results for the learners
                         $objExerciseTmp->disable_results();
                         $objExerciseTmp->save();
-                        echo Display::return_message(
-                            get_lang('ResultsDisabled'),
-                            'confirmation'
-                        );
+                        Display::addFlash(Display::return_message(get_lang('ResultsDisabled'), 'confirmation'));
+
                         break;
                     case 'enable_results':
                         //disable the results for the learners
                         $objExerciseTmp->enable_results();
                         $objExerciseTmp->save();
-                        echo Display::return_message(
-                            get_lang('ResultsEnabled'),
-                            'confirmation'
-                        );
+                        Display::addFlash(Display::return_message(get_lang('ResultsEnabled'), 'confirmation'));
+
                         break;
                     case 'clean_results':
                         if ($limitTeacherAccess && !api_is_platform_admin()) {
@@ -421,24 +401,29 @@ if ($is_allowedToEdit) {
                         if ($exercise_action_locked == false) {
                             $quantity_results_deleted = $objExerciseTmp->cleanResults(true);
                             $title = $objExerciseTmp->selectTitle();
-                            echo Display::return_message(
-                                $title.': '.sprintf(
-                                    get_lang('XResultsCleaned'),
-                                    $quantity_results_deleted
-                                ),
-                                'confirmation'
+
+                            Display::addFlash(
+                                Display::return_message(
+                                    $title.': '.sprintf(
+                                        get_lang('XResultsCleaned'),
+                                        $quantity_results_deleted
+                                    ),
+                                    'confirmation'
+                                )
                             );
                         }
                         break;
                     case 'copy_exercise': //copy an exercise
                         api_set_more_memory_and_time_limits();
                         $objExerciseTmp->copyExercise();
-                        echo Display::return_message(
+                        Display::addFlash(Display::return_message(
                             get_lang('ExerciseCopied'),
                             'confirmation'
-                        );
+                        ));
                         break;
                 }
+                header('Location: '.$currentUrl);
+                exit;
             }
         }
         // destruction of Exercise
@@ -502,6 +487,8 @@ if ($is_allowedToEdit) {
                     $userId
                 );
 
+                Display::addFlash(Display::return_message(get_lang('Updated')));
+
                 break;
             case 'disable': // disables an exercise
                 if ($limitTeacherAccess && !api_is_platform_admin()) {
@@ -524,9 +511,22 @@ if ($is_allowedToEdit) {
             default:
                 break;
         }
+        header('Location: '.$currentUrl);
+        exit;
     }
 }
 
+if ($origin !== 'learnpath') {
+    //so we are not in learnpath tool
+    Display::display_header($nameTools, get_lang('Exercise'));
+    if (isset($_GET['message']) && in_array($_GET['message'], ['ExerciseEdited'])) {
+        echo Display::return_message(get_lang('ExerciseEdited'), 'confirmation');
+    }
+} else {
+    Display::display_reduced_header();
+}
+Display::display_introduction_section(TOOL_QUIZ);
+
 // Selects $limit exercises at the same time
 // maximum number of exercises on a same page
 $limit = 50;
diff --git a/main/exercise/hotpotatoes.lib.php b/main/exercise/hotpotatoes.lib.php
index 11c73f39f0..0f6be98dc6 100755
--- a/main/exercise/hotpotatoes.lib.php
+++ b/main/exercise/hotpotatoes.lib.php
@@ -424,7 +424,7 @@ function GenerateHpFolder($folder)
 function GetFolderName($fname)
 {
     $name = explode('/', $fname);
-    $name = $name[sizeof($name) - 2];
+    $name = $name[count($name) - 2];
 
     return $name;
 }