From 43dd643dc44146dbe38c278e09fe1c6377979f0d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 17 Sep 2014 15:52:06 +0200 Subject: [PATCH] Minor - format code. --- main/exercice/exercise.class.php | 19 +++++++++---------- main/inc/ajax/exercise.ajax.php | 5 +++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index abffb18d2f..7891454d61 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -2041,13 +2041,13 @@ class Exercise $extra_data = array(); $final_overlap = 0; - $final_missing =0; - $final_excess =0; - $overlap_color =0; - $missing_color =0; - $excess_color =0; - $threadhold1 =0; - $threadhold2 =0; + $final_missing = 0; + $final_excess = 0; + $overlap_color = 0; + $missing_color = 0; + $excess_color = 0; + $threadhold1 = 0; + $threadhold2 = 0; $threadhold3 = 0; $arrques = null; @@ -2407,6 +2407,7 @@ class Exercise $answer .= $temp; break; } + if ($from_database) { $queryfill = "SELECT answer FROM ".$TBL_TRACK_ATTEMPT." WHERE @@ -2434,11 +2435,9 @@ class Exercise $choice[$j] = api_htmlentities(trim($choice[$j])); } - //No idea why we api_strtolower user reponses - //$user_tags[] = api_strtolower($choice[$j]); + $user_tags[] = $choice[$j]; //put the contents of the [] answer tag into correct_tags[] - //$correct_tags[] = api_strtolower(api_substr($temp, 0, $pos)); $correct_tags[] = api_substr($temp, 0, $pos); $j++; $temp = api_substr($temp, $pos +1); diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index c8d97d005a..f27d07dc62 100755 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -262,7 +262,7 @@ switch ($action) { $objExercise = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null; // Question info. - $question_id = intval($_REQUEST['question_id']); + $question_id = isset($_REQUEST['question_id']) ? intval($_REQUEST['question_id']) : null; $question_list = $_SESSION['questionList']; // If exercise or question is not set then exit. @@ -353,7 +353,8 @@ switch ($action) { continue; } - $my_choice = $choice[$my_question_id]; + $my_choice = isset($choice[$my_question_id]) ? + $choice[$my_question_id] : null; if ($debug) { error_log("my_choice = ".print_r($my_choice, 1)."");