Minor - fix button name, format code

main/exercise/Annotation.php

@@ -48,8 +48,9 @@ class Annotation extends Question
             }
         }
 
+        global $text;
         if (isset($_GET['editQuestion'])) {
-            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+            $form->addButtonUpdate($text, 'submitQuestion');
 
             return;
         }
@@ -108,7 +109,6 @@ class Annotation extends Question
      */
     public function createAnswersForm($form)
     {
-        // nothing
     }
 
     /**

main/exercise/admin.php

@@ -329,7 +329,6 @@ function multiple_answer_true_false_onchange(variable) {
     document.getElementById(weight_id).value = array_result[result];
 }
 
-
 </script>';
 
 $htmlHeadXtra[] = api_get_js('jqueryui-touch-punch/jquery.ui.touch-punch.min.js');
@@ -349,14 +348,6 @@ if (isset($_GET['message'])) {
 }
 
 Display::display_header($nameTools, 'Exercise');
-/*
-if ($objExercise->exercise_was_added_in_lp) {
-    if ($objExercise->force_edit_exercise_in_lp == true) {
-        Display::addFlash(Display::return_message(get_lang('ForceEditingExerciseInLPWarning'), 'warning'));
-    } else {
-        Display::addFlash(Display::return_message(get_lang('EditingExerciseCauseProblemsInLP'), 'warning'));
-    }
-}*/
 
 // If we are in a test
 $inATest = isset($exerciseId) && $exerciseId > 0;

main/exercise/annotation_user.php

@@ -7,8 +7,9 @@ session_cache_limiter("none");
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$questionId = isset($_GET['question_id']) ? intval($_GET['question_id']) : 0;
-$exerciseId = isset($_GET['exe_id']) ? intval($_GET['exe_id']) : 0;
+$questionId = isset($_GET['question_id']) ? (int) $_GET['question_id'] : 0;
+$exerciseId = isset($_GET['exe_id']) ? (int) $_GET['exe_id'] : 0;
+$courseId = isset($_GET['exe_id']) ? (int) $_GET['exe_id'] : 0;
 
 $objQuestion = Question::read($questionId);
 $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';

main/exercise/calculated_answer.class.php

@@ -173,7 +173,7 @@ class CalculatedAnswer extends Question
         $form->addButtonSave($text, 'submitQuestion');
 
         if (!empty($this->id)) {
-            $form -> setDefaults($defaults);
+            $form->setDefaults($defaults);
         } else {
             if ($this->isContent == 1) {
                 $form->setDefaults($defaults);

main/exercise/freeanswer.class.php

@@ -29,7 +29,7 @@ class FreeAnswer extends Question
     public function createAnswersForm($form)
     {
         $form->addElement('text', 'weighting', get_lang('Weighting'));
-        global $text, $class;
+        global $text;
         // setting the save button here and not in the question class.php
         $form->addButtonSave($text, 'submitQuestion');
         if (!empty($this->id)) {

main/exercise/hotspot.class.php

@@ -57,7 +57,6 @@ class HotSpot extends Question
             // setting the save button here and not in the question class.php
             // Saving a question
             $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
             $form->addRule(
                 'imageUpload',
                 get_lang('OnlyImagesAllowed'),
@@ -136,7 +135,6 @@ class HotSpotDelineation extends HotSpot
      */
     public function processCreation($form, $exercise)
     {
-        $file_info = $form->getSubmitValue('imageUpload');
         parent::processCreation($form, $exercise);
     }