Completed
Push — 1.11.x ( b4cb95...04c255 )
by José
287:38 queued 248:49
created
main/exercise/question_create.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -51,17 +51,17 @@
 block discarded – undo
51 51
 $result = Database::query($sql);
52 52
 $exercises['-'] = '-'.get_lang('SelectExercise').'-';
53 53
 while ($row = Database :: fetch_array($result)) {
54
-	$exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
54
+    $exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
55 55
 }
56 56
 $form->addElement('select', 'exercise', get_lang('Exercise'), $exercises);
57 57
 
58 58
 // generate default content
59 59
 $form->addElement(
60
-	'checkbox',
61
-	'is_content',
62
-	null,
63
-	get_lang('GenerateDefaultContent'),
64
-	array('checked' => true)
60
+    'checkbox',
61
+    'is_content',
62
+    null,
63
+    get_lang('GenerateDefaultContent'),
64
+    array('checked' => true)
65 65
 );
66 66
 
67 67
 // the submit button
Please login to merge, or discard this patch.
main/exercise/multiple_answer.class.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -166,12 +166,12 @@  discard block
 block discarded – undo
166 166
     }
167 167
 
168 168
 
169
-	/**
170
-	 * abstract function which creates the form to create / edit the answers of the question
171
-	 * @param the formvalidator instance
172
-	 * @param the answers number to display
173
-	 */
174
-	function processAnswersCreation($form)
169
+    /**
170
+     * abstract function which creates the form to create / edit the answers of the question
171
+     * @param the formvalidator instance
172
+     * @param the answers number to display
173
+     */
174
+    function processAnswersCreation($form)
175 175
     {
176 176
         $questionWeighting = $nbrGoodAnswers = 0;
177 177
         $objAnswer  = new Answer($this->id);
@@ -201,12 +201,12 @@  discard block
 block discarded – undo
201 201
         // sets the total weighting of the question
202 202
         $this->updateWeighting($questionWeighting);
203 203
         $this->save();
204
-	}
204
+    }
205 205
 
206
-	function return_header($feedback_type = null, $counter = null, $score = null)
206
+    function return_header($feedback_type = null, $counter = null, $score = null)
207 207
     {
208
-	    $header = parent::return_header($feedback_type, $counter, $score);
209
-	    $header .= '<table class="'.$this->question_table_class .'">
208
+        $header = parent::return_header($feedback_type, $counter, $score);
209
+        $header .= '<table class="'.$this->question_table_class .'">
210 210
 			<tr>
211 211
 				<th>'.get_lang("Choice").'</th>
212 212
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
         $header .= '<th>'.get_lang("Comment").'</th>';
215 215
         $header .= '</tr>';
216 216
         return $header;
217
-	}
217
+    }
218 218
 
219 219
 
220 220
 }
Please login to merge, or discard this patch.
main/exercise/question_pool.php 1 patch
Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -172,11 +172,11 @@  discard block
 block discarded – undo
172 172
 }
173 173
 
174 174
 if (isset($_SESSION['gradebook'])){
175
-	$gradebook=	$_SESSION['gradebook'];
175
+    $gradebook=	$_SESSION['gradebook'];
176 176
 }
177 177
 
178 178
 if (!empty($gradebook) && $gradebook=='view') {
179
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
179
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
180 180
 }
181 181
 
182 182
 // if admin of course
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 echo '</div>';
228 228
 
229 229
 if ($displayMessage != "") {
230
-	Display::display_confirmation_message($displayMessage);
231
-	$displayMessage = "";
230
+    Display::display_confirmation_message($displayMessage);
231
+    $displayMessage = "";
232 232
 }
233 233
 
234 234
 // Form
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 // Title
237 237
 echo '<legend>'.$nameTools.' - '.$titleAdd.'</legend>';
238 238
 if (isset($type)) {
239
-	echo '<input type="hidden" name="type" value="1">';
239
+    echo '<input type="hidden" name="type" value="1">';
240 240
 }
241 241
 echo '<input type="hidden" name="fromExercise" value="'.$fromExercise.'">';
242 242
 
@@ -283,11 +283,11 @@  discard block
 block discarded – undo
283 283
 foreach ($course_list as $item) {
284 284
     $courseItemId = $item['real_id'];
285 285
     $courseInfo = api_get_course_info_by_id($courseItemId);
286
-	$course_select_list[$courseItemId] = "";
287
-	if ($courseItemId == api_get_course_int_id()) {
288
-		$course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
289
-	}
290
-	$course_select_list[$courseItemId] .= $courseInfo['title'];
286
+    $course_select_list[$courseItemId] = "";
287
+    if ($courseItemId == api_get_course_int_id()) {
288
+        $course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
289
+    }
290
+    $course_select_list[$courseItemId] .= $courseInfo['title'];
291 291
 }
292 292
 
293 293
 $select_course_html =  Display::select(
@@ -304,11 +304,11 @@  discard block
 block discarded – undo
304 304
     // no course selected, reset menu test / difficult� / type de reponse
305 305
     reset_menu_exo_lvl_type();
306 306
 } else {
307
-	$course_info = api_get_course_info_by_id($selected_course);
307
+    $course_info = api_get_course_info_by_id($selected_course);
308 308
 }
309 309
 // If course has changed, reset the menu default
310 310
 if ($course_id_changed) {
311
-	reset_menu_exo_lvl_type();
311
+    reset_menu_exo_lvl_type();
312 312
 }
313 313
 
314 314
 $course_id = $course_info['real_id'];
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 }
357 357
 
358 358
 if ($exercise_id_changed == 1) {
359
-	reset_menu_lvl_type();
359
+    reset_menu_lvl_type();
360 360
 }
361 361
 $select_exercise_html =  Display::select(
362 362
     'exerciseId',
@@ -434,19 +434,19 @@  discard block
 block discarded – undo
434 434
 // if we have selected an exercise in the list-box 'Filter'
435 435
 
436 436
 if ($exerciseId > 0) {
437
-	$where = '';
438
-	$from = '';
439
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
440
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
441
-		$where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
442
-	}
443
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
444
-		$where .= ' AND level='.$exerciseLevel;
445
-	}
446
-	if (isset($answerType) && $answerType > 0) {
447
-		$where .= ' AND type='.$answerType;
448
-	}
449
-	$sql = "SELECT DISTINCT
437
+    $where = '';
438
+    $from = '';
439
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
440
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
441
+        $where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
442
+    }
443
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
444
+        $where .= ' AND level='.$exerciseLevel;
445
+    }
446
+    if (isset($answerType) && $answerType > 0) {
447
+        $where .= ' AND type='.$answerType;
448
+    }
449
+    $sql = "SELECT DISTINCT
450 450
 	            id,
451 451
 	            question,
452 452
 	            type,
@@ -468,22 +468,22 @@  discard block
 block discarded – undo
468 468
         $mainQuestionList[] = $row;
469 469
     }
470 470
 } elseif ($exerciseId == -1) {
471
-	// If we have selected the option 'Orphan questions' in the list-box 'Filter'
472
-	$level_where = '';
473
-	$from = '';
474
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
475
-		$from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
476
-		$level_where .= " AND
471
+    // If we have selected the option 'Orphan questions' in the list-box 'Filter'
472
+    $level_where = '';
473
+    $from = '';
474
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
475
+        $from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
476
+        $level_where .= " AND
477 477
 		        crc.c_id = $selected_course AND
478 478
 		        crc.category_id = $courseCategoryId";
479
-	}
480
-	if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
481
-		$level_where = ' AND level='.$exerciseLevel;
482
-	}
483
-	$answer_where = '';
484
-	if (isset($answerType) && $answerType >0 -1 ) {
485
-		$answer_where = ' AND type='.$answerType;
486
-	}
479
+    }
480
+    if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
481
+        $level_where = ' AND level='.$exerciseLevel;
482
+    }
483
+    $answer_where = '';
484
+    if (isset($answerType) && $answerType >0 -1 ) {
485
+        $answer_where = ' AND type='.$answerType;
486
+    }
487 487
 
488 488
     // @todo fix this query with the new id field
489 489
     $sql = " (
@@ -525,24 +525,24 @@  discard block
 block discarded – undo
525 525
         $mainQuestionList[] = $row;
526 526
     }
527 527
 } else {
528
-	// All tests for selected course
528
+    // All tests for selected course
529 529
     // If we have not selected any option in the list-box 'Filter'
530
-	$filter = '';
531
-	$from = '';
530
+    $filter = '';
531
+    $from = '';
532 532
 
533
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
534
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
535
-		$filter .= " AND
533
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
534
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
535
+        $filter .= " AND
536 536
 		            crc.c_id = $selected_course AND
537 537
 		            crc.question_id = qu.id AND
538 538
 		            crc.category_id = $courseCategoryId";
539
-	}
540
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
541
-		$filter .= ' AND level='.$exerciseLevel.' ';
542
-	}
543
-	if (isset($answerType) && $answerType > 0) {
544
-		$filter .= ' AND qu.type='.$answerType.' ';
545
-	}
539
+    }
540
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
541
+        $filter .= ' AND level='.$exerciseLevel.' ';
542
+    }
543
+    if (isset($answerType) && $answerType > 0) {
544
+        $filter .= ' AND qu.type='.$answerType.' ';
545
+    }
546 546
 
547 547
     if (!empty($session_id) && $session_id != '-1') {
548 548
         $mainQuestionList = array();
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
             $mainQuestionList[] = $row;
645 645
         }
646 646
     }
647
-	// forces the value to 0
647
+    // forces the value to 0
648 648
     $exerciseId = 0;
649 649
 }
650 650
 
@@ -670,33 +670,33 @@  discard block
 block discarded – undo
670 670
 //
671 671
 if ($fromExercise <= 0) {
672 672
     // NOT IN A TEST - IN THE COURSE
673
-	if ($selected_course == api_get_course_int_id()) {
674
-		$actionLabel = get_lang('Modify');
675
-		$actionIcon1 = "edit";
676
-		$actionIcon2 = "delete";
673
+    if ($selected_course == api_get_course_int_id()) {
674
+        $actionLabel = get_lang('Modify');
675
+        $actionIcon1 = "edit";
676
+        $actionIcon2 = "delete";
677 677
         // We are in the course, question title can be a link to the question edit page
678
-		$questionTagA = 1;
678
+        $questionTagA = 1;
679 679
     } else { // NOT IN A TEST - NOT IN THE COURSE
680
-		$actionLabel = get_lang('Reuse');
681
-		$actionIcon1 = get_lang('MustBeInATest');
682
-		$actionIcon2 = "";
680
+        $actionLabel = get_lang('Reuse');
681
+        $actionIcon1 = get_lang('MustBeInATest');
682
+        $actionIcon2 = "";
683 683
         // We are not in this course, to messy if we link to the question in another course
684
-		$questionTagA = 0;
685
-	}
684
+        $questionTagA = 0;
685
+    }
686 686
 } else {
687 687
     // IN A TEST - IN THE COURSE
688
-	if ($selected_course == api_get_course_int_id()) {
689
-		$actionLabel = get_lang('Reuse');
690
-		$actionIcon1 = "add";
691
-		$actionIcon2 = "";
692
-		$questionTagA = 1;
688
+    if ($selected_course == api_get_course_int_id()) {
689
+        $actionLabel = get_lang('Reuse');
690
+        $actionIcon1 = "add";
691
+        $actionIcon2 = "";
692
+        $questionTagA = 1;
693 693
     } else {
694 694
         // IN A TEST - NOT IN THE COURSE
695
-		$actionLabel = get_lang('Reuse');
696
-		$actionIcon1 = "clone";
697
-		$actionIcon2 = "";
698
-		$questionTagA = 0;
699
-	}
695
+        $actionLabel = get_lang('Reuse');
696
+        $actionIcon1 = "clone";
697
+        $actionIcon2 = "";
698
+        $questionTagA = 0;
699
+    }
700 700
 }
701 701
 // Display table
702 702
 $header = array(
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
789 789
 );
790 790
 
791 791
 if (!$nbrQuestions) {
792
-	echo get_lang('NoQuestion');
792
+    echo get_lang('NoQuestion');
793 793
 }
794 794
 
795 795
 Display::display_footer();
@@ -801,9 +801,9 @@  discard block
 block discarded – undo
801 801
 */
802 802
 function reset_menu_lvl_type()
803 803
 {
804
-	global $exerciseLevel, $answerType;
805
-	$answerType = -1;
806
-	$exerciseLevel = -1;
804
+    global $exerciseLevel, $answerType;
805
+    $answerType = -1;
806
+    $exerciseLevel = -1;
807 807
 }
808 808
 
809 809
 /**
@@ -813,10 +813,10 @@  discard block
 block discarded – undo
813 813
 */
814 814
 function reset_menu_exo_lvl_type()
815 815
 {
816
-	global $exerciseId, $courseCategoryId;
817
-	reset_menu_lvl_type();
818
-	$exerciseId = 0;
819
-	$courseCategoryId = 0;
816
+    global $exerciseId, $courseCategoryId;
817
+    reset_menu_lvl_type();
818
+    $exerciseId = 0;
819
+    $courseCategoryId = 0;
820 820
 }
821 821
 
822 822
 /**
@@ -838,17 +838,17 @@  discard block
 block discarded – undo
838 838
     $in_questionname,
839 839
     $sessionId
840 840
 ) {
841
-	$res = $in_questionname;
841
+    $res = $in_questionname;
842 842
     $sessionIcon = null;
843
-	if ($in_addA) {
843
+    if ($in_addA) {
844 844
         if (!empty($sessionId) && $sessionId != -1) {
845 845
             $sessionIcon = ' '.Display::return_icon('star.png', get_lang('Session'));
846 846
         }
847
-		$res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
847
+        $res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
848 848
             $res.$sessionIcon.
849 849
             "</a>";
850
-	}
851
-	return $res;
850
+    }
851
+    return $res;
852 852
 }
853 853
 
854 854
 /**
@@ -878,16 +878,16 @@  discard block
 block discarded – undo
878 878
     $in_session_id,
879 879
     $in_exercise_id
880 880
 ) {
881
-	$res = "";
882
-	$getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
883
-	switch ($in_action) {
884
-		case "delete" :
885
-			$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
886
-			$res .= Display::return_icon("delete.png", get_lang('Delete'));
887
-			$res .= "</a>";
888
-			break;
889
-		case "edit" :
890
-			$res = get_a_tag_for_question(
881
+    $res = "";
882
+    $getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
883
+    switch ($in_action) {
884
+        case "delete" :
885
+            $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
886
+            $res .= Display::return_icon("delete.png", get_lang('Delete'));
887
+            $res .= "</a>";
888
+            break;
889
+        case "edit" :
890
+            $res = get_a_tag_for_question(
891 891
                 1,
892 892
                 $from_exercise,
893 893
                 $in_questionid,
@@ -895,33 +895,33 @@  discard block
 block discarded – undo
895 895
                 Display::return_icon("edit.png", get_lang('Modify')),
896 896
                 $in_session_id
897 897
             );
898
-			break;
899
-		case "add":
900
-			// add if question is not already in test
901
-			$myObjEx = new Exercise();
902
-			$myObjEx->read($from_exercise);
903
-			if (!$myObjEx->isInList($in_questionid)) {
904
-				$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
905
-				$res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
906
-				$res .= "</a>";
898
+            break;
899
+        case "add":
900
+            // add if question is not already in test
901
+            $myObjEx = new Exercise();
902
+            $myObjEx->read($from_exercise);
903
+            if (!$myObjEx->isInList($in_questionid)) {
904
+                $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
905
+                $res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
906
+                $res .= "</a>";
907 907
             } else {
908
-				$res = "-";
909
-			}
910
-			unset($myObjEx);
911
-			break;
912
-		case "clone":
908
+                $res = "-";
909
+            }
910
+            unset($myObjEx);
911
+            break;
912
+        case "clone":
913 913
             $url = api_get_self()."?".api_get_cidreq().$getParams."&question_copy=$in_questionid&course_id=$in_selected_course&fromExercise=$from_exercise";
914 914
             $res = Display::url(
915 915
                 Display::return_icon('cd.gif', get_lang('ReUseACopyInCurrentTest')),
916 916
                 $url
917 917
             );
918
-			break;
919
-		default :
920
-			$res = $in_action;
921
-			break;
922
-	}
918
+            break;
919
+        default :
920
+            $res = $in_action;
921
+            break;
922
+    }
923 923
 
924
-	return $res;
924
+    return $res;
925 925
 }
926 926
 
927 927
 /**
@@ -930,14 +930,14 @@  discard block
 block discarded – undo
930 930
  */
931 931
 function get_question_type_for_question($in_selectedcourse, $in_questionid)
932 932
 {
933
-	$myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
933
+    $myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
934 934
     $questionType = null;
935 935
     if (!empty($myObjQuestion)) {
936 936
         list($typeImg, $typeExpl) = $myObjQuestion->get_type_icon_html();
937 937
         $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), 32), array());
938 938
         unset($myObjQuestion);
939 939
     }
940
-	return $questionType;
940
+    return $questionType;
941 941
 }
942 942
 
943 943
 /**
@@ -946,6 +946,6 @@  discard block
 block discarded – undo
946 946
  */
947 947
 function get_question_categorie_for_question($in_courseid, $in_questionid)
948 948
 {
949
-	$cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
950
-	return $cat;
949
+    $cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
950
+    return $cat;
951 951
 }
Please login to merge, or discard this patch.
main/exercise/showinframes.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
 $content = ReadFileCont($full_file_path.$user_id.'.t.html');
29 29
 
30 30
 if ($content == '') {
31
-	$content = ReadFileCont($full_file_path);
31
+    $content = ReadFileCont($full_file_path);
32 32
     // Do not move this like:
33
-	$mit = "function Finish(){";
34
-	$js_content = "
33
+    $mit = "function Finish(){";
34
+    $js_content = "
35 35
     // Code added - start
36 36
     var SaveScoreVariable = 0;
37 37
     function mySaveScore() {
Please login to merge, or discard this patch.
main/exercise/export/aiken/aiken_import.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -281,7 +281,7 @@
 block discarded – undo
281 281
             $correct_answer_index = array_search($matches[1], $answers_array);
282 282
             $exercise_info['question'][$question_index]['title'] = $matches[1];
283 283
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
284
-             //TAGS for chamilo >= 1.10
284
+                //TAGS for chamilo >= 1.10
285 285
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
286 286
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
287 287
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
Please login to merge, or discard this patch.
main/exercise/export/exercise_import.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,10 +74,10 @@
 block discarded – undo
74 74
 Display::display_introduction_section(
75 75
     TOOL_QUIZ,
76 76
     array(
77
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
77
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
78 78
         'CreateDocumentDir' => '../../..'.api_get_path(REL_COURSE_PATH).api_get_course_path().'/document/',
79
-		'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
80
-	)
79
+        'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
80
+    )
81 81
 );
82 82
 
83 83
 // Display Forms or dialog box(if needed)
Please login to merge, or discard this patch.
main/exercise/export/qti2/qti2_classes.php 1 patch
Indentation   +135 added lines, -135 removed lines patch added patch discarded remove patch
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 
56 56
     function createAnswersForm($form)
57 57
     {
58
-    	return true;
58
+        return true;
59 59
     }
60 60
 
61 61
     function processAnswersCreation($form)
62 62
     {
63
-    	return true;
63
+        return true;
64 64
     }
65 65
 }
66 66
 /**
@@ -76,21 +76,21 @@  discard block
 block discarded – undo
76 76
     public function imsExportResponses($questionIdent, $questionStatment)
77 77
     {
78 78
         // @todo getAnswersList() converts the answers using api_html_entity_decode()
79
-		$this->answerList = $this->getAnswersList(true);
79
+        $this->answerList = $this->getAnswersList(true);
80 80
         $out  = '    <choiceInteraction responseIdentifier="' . $questionIdent . '" >' . "\n";
81 81
         $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment) . ']]></prompt>'. "\n";
82
-		if (is_array($this->answerList)) {
83
-	        foreach ($this->answerList as $current_answer) {
84
-	            $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
82
+        if (is_array($this->answerList)) {
83
+            foreach ($this->answerList as $current_answer) {
84
+                $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
85 85
                          <![CDATA['.formatExerciseQtiTitle($current_answer['answer']).']]>';
86
-	            if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
87
-	                $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
86
+                if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
87
+                    $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
88 88
 	                         <![CDATA['.formatExerciseQtiTitle($current_answer['comment']).']]>
89 89
 	                         </feedbackInline>';
90
-	            }
91
-	            $out .= '</simpleChoice>'. "\n";
92
-	        }
93
-		}
90
+                }
91
+                $out .= '</simpleChoice>'. "\n";
92
+            }
93
+        }
94 94
         $out .= '    </choiceInteraction>'. "\n";
95 95
 
96 96
         return $out;
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
      */
103 103
     public function imsExportResponsesDeclaration($questionIdent)
104 104
     {
105
-		$this->answerList = $this->getAnswersList(true);
106
-		$type = $this->getQuestionType();
105
+        $this->answerList = $this->getAnswersList(true);
106
+        $type = $this->getQuestionType();
107 107
         if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
108 108
 
109 109
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
@@ -111,25 +111,25 @@  discard block
 block discarded – undo
111 111
         // Match the correct answers.
112 112
 
113 113
         $out .= '    <correctResponse>'. "\n";
114
-		if (is_array($this->answerList)) {
115
-	        foreach($this->answerList as $current_answer) {
116
-	            if ($current_answer['correct']) {
117
-	                $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
118
-	            }
119
-	        }
120
-		}
114
+        if (is_array($this->answerList)) {
115
+            foreach($this->answerList as $current_answer) {
116
+                if ($current_answer['correct']) {
117
+                    $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
118
+                }
119
+            }
120
+        }
121 121
         $out .= '    </correctResponse>'. "\n";
122 122
 
123 123
         //Add the grading
124 124
 
125 125
         $out .= '    <mapping>'. "\n";
126
-		if (is_array($this->answerList)) {
127
-	        foreach($this->answerList as $current_answer) {
128
-	            if (isset($current_answer['grade'])) {
129
-	                $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
130
-	            }
131
-	        }
132
-		}
126
+        if (is_array($this->answerList)) {
127
+            foreach($this->answerList as $current_answer) {
128
+                if (isset($current_answer['grade'])) {
129
+                    $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
130
+                }
131
+            }
132
+        }
133 133
         $out .= '    </mapping>'. "\n";
134 134
         $out .= '  </responseDeclaration>'. "\n";
135 135
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
      */
151 151
     public function imsExportResponses($questionIdent, $questionStatment)
152 152
     {
153
-		$this->answerList = $this->getAnswersList(true);
153
+        $this->answerList = $this->getAnswersList(true);
154 154
         $text = '';
155 155
         $text .= $this->answerText;
156 156
         if (is_array($this->answerList)) {
@@ -171,28 +171,28 @@  discard block
 block discarded – undo
171 171
      */
172 172
     public function imsExportResponsesDeclaration($questionIdent)
173 173
     {
174
-		$this->answerList = $this->getAnswersList(true);
175
-		$this->gradeList = $this->getGradesList();
174
+        $this->answerList = $this->getAnswersList(true);
175
+        $this->gradeList = $this->getGradesList();
176 176
         $out = '';
177
-		if (is_array($this->answerList)) {
178
-	        foreach ($this->answerList as $answer) {
179
-	        	$answerKey = $answer['id'];
180
-	        	$answer = $answer['answer'];
181
-	            $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
182
-	            $out .= '    <correctResponse>'. "\n";
177
+        if (is_array($this->answerList)) {
178
+            foreach ($this->answerList as $answer) {
179
+                $answerKey = $answer['id'];
180
+                $answer = $answer['answer'];
181
+                $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
182
+                $out .= '    <correctResponse>'. "\n";
183 183
                 $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'. "\n";
184
-	            $out .= '    </correctResponse>'. "\n";
185
-	            if (isset($this->gradeList[$answerKey])) {
186
-	                $out .= '    <mapping>'. "\n";
187
-	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
188
-	                $out .= '    </mapping>'. "\n";
189
-	            }
190
-
191
-	            $out .= '  </responseDeclaration>'. "\n";
192
-	        }
193
-		}
194
-
195
-       return $out;
184
+                $out .= '    </correctResponse>'. "\n";
185
+                if (isset($this->gradeList[$answerKey])) {
186
+                    $out .= '    <mapping>'. "\n";
187
+                    $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
188
+                    $out .= '    </mapping>'. "\n";
189
+                }
190
+
191
+                $out .= '  </responseDeclaration>'. "\n";
192
+            }
193
+        }
194
+
195
+        return $out;
196 196
     }
197 197
 }
198 198
 
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
      */
208 208
     public function imsExportResponses($questionIdent, $questionStatment)
209 209
     {
210
-		$this->answerList = $this->getAnswersList(true);
211
-		$maxAssociation = max(count($this->leftList), count($this->rightList));
210
+        $this->answerList = $this->getAnswersList(true);
211
+        $maxAssociation = max(count($this->leftList), count($this->rightList));
212 212
 
213 213
         $out = "";
214 214
 
@@ -218,14 +218,14 @@  discard block
 block discarded – undo
218 218
         //add left column
219 219
 
220 220
         $out .= '  <simpleMatchSet>'. "\n";
221
-		if (is_array($this->leftList)) {
222
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
223
-	            $out .= '
221
+        if (is_array($this->leftList)) {
222
+            foreach ($this->leftList as $leftKey=>$leftElement) {
223
+                $out .= '
224 224
 	            <simpleAssociableChoice identifier="left_'.$leftKey.'" >
225 225
 	                <![CDATA['.formatExerciseQtiTitle($leftElement['answer']).']]>
226 226
 	            </simpleAssociableChoice>'. "\n";
227
-	        }
228
-    	}
227
+            }
228
+        }
229 229
 
230 230
         $out .= '  </simpleMatchSet>'. "\n";
231 231
 
@@ -235,14 +235,14 @@  discard block
 block discarded – undo
235 235
 
236 236
         $i = 0;
237 237
 
238
-		if (is_array($this->rightList)) {
239
-	        foreach($this->rightList as $rightKey=>$rightElement) {
240
-	            $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
238
+        if (is_array($this->rightList)) {
239
+            foreach($this->rightList as $rightKey=>$rightElement) {
240
+                $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
241 241
 	                    <![CDATA['.formatExerciseQtiTitle($rightElement['answer']).']]>
242 242
 	                    </simpleAssociableChoice>'. "\n";
243
-	            $i++;
244
-	        }
245
-		}
243
+                $i++;
244
+            }
245
+        }
246 246
         $out .= '  </simpleMatchSet>'. "\n";
247 247
         $out .= '</matchInteraction>'. "\n";
248 248
 
@@ -254,30 +254,30 @@  discard block
 block discarded – undo
254 254
      */
255 255
     public function imsExportResponsesDeclaration($questionIdent)
256 256
     {
257
-		$this->answerList = $this->getAnswersList(true);
257
+        $this->answerList = $this->getAnswersList(true);
258 258
         $out =  '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="single" baseType="identifier">' . "\n";
259 259
         $out .= '    <correctResponse>' . "\n";
260 260
 
261 261
         $gradeArray = array();
262
-		if (is_array($this->leftList)) {
263
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
264
-	            $i=0;
265
-	            foreach ($this->rightList as $rightKey=>$rightElement) {
266
-	                if (($leftElement['match'] == $rightElement['code'])) {
267
-	                    $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
268
-
269
-	                    $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
270
-	                }
271
-	                $i++;
272
-	            }
273
-	        }
274
-		}
262
+        if (is_array($this->leftList)) {
263
+            foreach ($this->leftList as $leftKey=>$leftElement) {
264
+                $i=0;
265
+                foreach ($this->rightList as $rightKey=>$rightElement) {
266
+                    if (($leftElement['match'] == $rightElement['code'])) {
267
+                        $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
268
+
269
+                        $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
270
+                    }
271
+                    $i++;
272
+                }
273
+            }
274
+        }
275 275
         $out .= '    </correctResponse>'. "\n";
276 276
         $out .= '    <mapping>' . "\n";
277 277
         if (is_array($gradeArray)) {
278
-	        foreach ($gradeArray as $gradeKey=>$grade) {
279
-	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
280
-	        }
278
+            foreach ($gradeArray as $gradeKey=>$grade) {
279
+                $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
280
+            }
281 281
         }
282 282
         $out .= '    </mapping>' . "\n";
283 283
         $out .= '  </responseDeclaration>'. "\n";
@@ -298,49 +298,49 @@  discard block
 block discarded – undo
298 298
      */
299 299
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
300 300
     {
301
-		$this->answerList = $this->getAnswersList(true);
302
-		$questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
303
-		$mimetype = mime_content_type($questionMedia);
304
-		if(empty($mimetype)){
305
-			$mimetype = 'image/jpeg';
306
-		}
307
-
308
-		$text = '      <p>'.$questionStatment.'</p>'."\n";
309
-		$text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
310
-		$text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
311
-		$text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
301
+        $this->answerList = $this->getAnswersList(true);
302
+        $questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
303
+        $mimetype = mime_content_type($questionMedia);
304
+        if(empty($mimetype)){
305
+            $mimetype = 'image/jpeg';
306
+        }
307
+
308
+        $text = '      <p>'.$questionStatment.'</p>'."\n";
309
+        $text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
310
+        $text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
311
+        $text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
312 312
         if (is_array($this->answerList)) {
313
-	        foreach ($this->answerList as $key=>$answer) {
314
-	        	$key = $answer['id'];
315
-	        	$answerTxt = $answer['answer'];
316
-	        	$len = api_strlen($answerTxt);
317
-	        	//coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
318
-	        	$coords = '';
319
-	        	$type = 'default';
320
-	        	switch($answer['hotspot_type']){
321
-	        		case 'square':
322
-	        			$type = 'rect';
323
-						$res = array();
324
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
325
-						$coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
326
-	        			break;
327
-	        		case 'circle':
328
-	        			$type = 'circle';
329
-			 			$res = array();
330
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
331
-						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
332
-	        			break;
333
-	        		case 'poly':
334
-	        			$type = 'poly';
335
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
336
-	        			break;
337
-	        		 case 'delineation' :
338
-	        			$type = 'delineation';
339
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
340
-	        			break;
341
-	        	}
342
-	            $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
343
-	        }
313
+            foreach ($this->answerList as $key=>$answer) {
314
+                $key = $answer['id'];
315
+                $answerTxt = $answer['answer'];
316
+                $len = api_strlen($answerTxt);
317
+                //coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
318
+                $coords = '';
319
+                $type = 'default';
320
+                switch($answer['hotspot_type']){
321
+                    case 'square':
322
+                        $type = 'rect';
323
+                        $res = array();
324
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
325
+                        $coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
326
+                        break;
327
+                    case 'circle':
328
+                        $type = 'circle';
329
+                            $res = array();
330
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
331
+                        $coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
332
+                        break;
333
+                    case 'poly':
334
+                        $type = 'poly';
335
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
336
+                        break;
337
+                        case 'delineation' :
338
+                        $type = 'delineation';
339
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
340
+                        break;
341
+                }
342
+                $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
343
+            }
344 344
         }
345 345
         $text .= '      </graphicOrderInteraction>'."\n";
346 346
         $out = $text;
@@ -353,23 +353,23 @@  discard block
 block discarded – undo
353 353
      */
354 354
     public function imsExportResponsesDeclaration($questionIdent)
355 355
     {
356
-		$this->answerList = $this->getAnswersList(true);
357
-		$this->gradeList = $this->getGradesList();
356
+        $this->answerList = $this->getAnswersList(true);
357
+        $this->gradeList = $this->getGradesList();
358 358
         $out = '';
359 359
         $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">' . "\n";
360 360
         $out .= '    <correctResponse>'. "\n";
361 361
 
362
-		if (is_array($this->answerList)) {
363
-	        foreach ($this->answerList as $answerKey=>$answer)  {
364
-	        	$answerKey = $answer['id'];
365
-	        	$answer = $answer['answer'];
366
-	            $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
367
-	        }
368
-		}
362
+        if (is_array($this->answerList)) {
363
+            foreach ($this->answerList as $answerKey=>$answer)  {
364
+                $answerKey = $answer['id'];
365
+                $answer = $answer['answer'];
366
+                $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
367
+            }
368
+        }
369 369
         $out .= '    </correctResponse>'. "\n";
370 370
         $out .= '  </responseDeclaration>'. "\n";
371 371
 
372
-       return $out;
372
+        return $out;
373 373
     }
374 374
 }
375 375
 
@@ -384,14 +384,14 @@  discard block
 block discarded – undo
384 384
      * Export the question part as a matrix-choice, with only one possible answer per line.
385 385
      */
386 386
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
387
-	{
388
-		return '';
389
-	}
387
+    {
388
+        return '';
389
+    }
390 390
     /**
391 391
      *
392 392
      */
393 393
     public function imsExportResponsesDeclaration($questionIdent)
394 394
     {
395
-    	return '';
395
+        return '';
396 396
     }
397 397
 }
Please login to merge, or discard this patch.
main/exercise/exercise.class.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1966,7 +1966,7 @@  discard block
 block discarded – undo
1966 1966
                     $label = get_lang('NextQuestion');
1967 1967
                     $class = 'btn btn-primary';
1968 1968
                 }
1969
-				$class .= ' question-validate-btn'; // used to select it with jquery
1969
+                $class .= ' question-validate-btn'; // used to select it with jquery
1970 1970
                 if ($this->type == ONE_PER_PAGE) {
1971 1971
                     if ($questionNum != 1) {
1972 1972
                         $prev_question = $questionNum - 2;
@@ -1991,7 +1991,7 @@  discard block
 block discarded – undo
1991 1991
                         $all_label = get_lang('EndTest');
1992 1992
                         $class = 'btn btn-warning';
1993 1993
                     }
1994
-					$class .= ' question-validate-btn'; // used to select it with jquery
1994
+                    $class .= ' question-validate-btn'; // used to select it with jquery
1995 1995
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
1996 1996
                     $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
1997 1997
                     $html .= $all_button;
@@ -3774,7 +3774,7 @@  discard block
 block discarded – undo
3774 3774
 
3775 3775
         //Fixes multiple answer question in order to be exact
3776 3776
         //if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
3777
-       /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
3777
+        /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
3778 3778
             $diff = @array_diff($answer_correct_array, $real_answers);
3779 3779
 
3780 3780
             // All good answers or nothing works like exact
@@ -5073,8 +5073,8 @@  discard block
 block discarded – undo
5073 5073
     }
5074 5074
 
5075 5075
     /**
5076
-    * @return string
5077
-    */
5076
+     * @return string
5077
+     */
5078 5078
     public function get_formated_title()
5079 5079
     {
5080 5080
         return api_html_entity_decode($this->selectTitle());
Please login to merge, or discard this patch.
main/exercise/exercise_submit.php 1 patch
Indentation   +188 added lines, -188 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     if (!$objExercise->read($exerciseId) ||
124 124
         (!$objExercise->selectStatus() && !$is_allowedToEdit && $origin != 'learnpath')
125 125
     ) {
126
-    	if ($debug) {error_log('1.1. Error while reading the exercise'); };
126
+        if ($debug) {error_log('1.1. Error while reading the exercise'); };
127 127
         unset ($objExercise);
128 128
         $error = get_lang('ExerciseNotFound');
129 129
     } else {
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
 }
137 137
 //2. Checking if $objExercise is set
138 138
 if (!isset($objExercise) && isset($exerciseInSession)) {
139
-	if ($debug) { error_log('2. Loading $objExercise from session'); };
139
+    if ($debug) { error_log('2. Loading $objExercise from session'); };
140 140
     $objExercise = $exerciseInSession;
141 141
 }
142 142
 
143 143
 //3. $objExercise is not set, then return to the exercise list
144 144
 if (!is_object($objExercise)) {
145
-	if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
145
+    if ($debug) {error_log('3. $objExercise was not set, kill the script'); };
146 146
     header('Location: exercise.php');
147 147
     exit;
148 148
 }
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
 $time_control = false;
165 165
 if ($objExercise->expired_time != 0) {
166
-	$time_control = true;
166
+    $time_control = true;
167 167
 }
168 168
 
169 169
 // Generating the time control key for the user
@@ -172,14 +172,14 @@  discard block
 block discarded – undo
172 172
 $_SESSION['duration_time'][$current_expired_time_key] = $current_timestamp;
173 173
 
174 174
 if ($time_control) {
175
-	// Get the expired time of the current exercise in track_e_exercises
176
-	$total_seconds = $objExercise->expired_time*60;
175
+    // Get the expired time of the current exercise in track_e_exercises
176
+    $total_seconds = $objExercise->expired_time*60;
177 177
 }
178 178
 
179 179
 $show_clock = true;
180 180
 $user_id = api_get_user_id();
181 181
 if ($objExercise->selectAttempts() > 0) {
182
-	$attempt_html = '';
182
+    $attempt_html = '';
183 183
     $attempt_count = Event::get_attempt_count(
184 184
         $user_id,
185 185
         $exerciseId,
@@ -188,9 +188,9 @@  discard block
 block discarded – undo
188 188
         $learnpath_item_view_id
189 189
     );
190 190
 
191
-	if ($attempt_count >= $objExercise->selectAttempts()) {
192
-		$show_clock = false;
193
-		if (!api_is_allowed_to_edit(null,true)) {
191
+    if ($attempt_count >= $objExercise->selectAttempts()) {
192
+        $show_clock = false;
193
+        if (!api_is_allowed_to_edit(null,true)) {
194 194
             if ($objExercise->results_disabled == 0 && $origin != 'learnpath') {
195 195
 
196 196
                 // Showing latest attempt according with task BT#1628
@@ -229,31 +229,31 @@  discard block
 block discarded – undo
229 229
                             $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_question_titlescore'));
230 230
                         }
231 231
                     }
232
-					$score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
233
-					$attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
234
-				} else {
235
-					$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
236
-				}
237
-			} else {
238
-				$attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
239
-			}
240
-		} else {
241
-			$attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
242
-		}
232
+                    $score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);
233
+                    $attempt_html .= Display::div(get_lang('YourTotalScore').' '.$score, array('id'=>'question_score'));
234
+                } else {
235
+                    $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
236
+                }
237
+            } else {
238
+                $attempt_html .= Display::return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
239
+            }
240
+        } else {
241
+            $attempt_html .= Display :: return_message(sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()), 'warning', false);
242
+        }
243 243
 
244
-		if ($origin == 'learnpath') {
245
-			Display :: display_reduced_header();
246
-		} else {
247
-			Display :: display_header(get_lang('Exercises'));
248
-		}
244
+        if ($origin == 'learnpath') {
245
+            Display :: display_reduced_header();
246
+        } else {
247
+            Display :: display_header(get_lang('Exercises'));
248
+        }
249 249
 
250
-		echo $attempt_html;
250
+        echo $attempt_html;
251 251
 
252 252
         if ($origin != 'learnpath') {
253 253
             Display:: display_footer();
254 254
         }
255
-		exit;
256
-	}
255
+        exit;
256
+    }
257 257
 }
258 258
 
259 259
 if ($debug) {
@@ -277,26 +277,26 @@  discard block
 block discarded – undo
277 277
 
278 278
 if (empty($exercise_stat_info)) {
279 279
     if ($debug)  error_log('5  $exercise_stat_info is empty ');
280
-	$total_weight = 0;
281
-	$questionList = $objExercise->get_validated_question_list();
282
-	foreach ($questionListUncompressed as $question_id) {
283
-		$objQuestionTmp = Question::read($question_id);
284
-		$total_weight += floatval($objQuestionTmp->weighting);
285
-	}
280
+    $total_weight = 0;
281
+    $questionList = $objExercise->get_validated_question_list();
282
+    foreach ($questionListUncompressed as $question_id) {
283
+        $objQuestionTmp = Question::read($question_id);
284
+        $total_weight += floatval($objQuestionTmp->weighting);
285
+    }
286 286
 
287
-	if ($time_control) {
288
-		$expected_time = $current_timestamp + $total_seconds;
287
+    if ($time_control) {
288
+        $expected_time = $current_timestamp + $total_seconds;
289 289
 
290
-		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
291
-		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
290
+        if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
291
+        if ($debug)  error_log('5.2. $expected_time '.$expected_time);
292 292
 
293
-		$clock_expired_time 	= api_get_utc_datetime($expected_time);
294
-		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
293
+        $clock_expired_time 	= api_get_utc_datetime($expected_time);
294
+        if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
295 295
 
296
-		//Sessions  that contain the expired time
297
-		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
298
-		if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
299
-	}
296
+        //Sessions  that contain the expired time
297
+        $_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
298
+        if ($debug) { error_log('5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
299
+    }
300 300
 
301 301
     $exe_id = $objExercise->save_stat_track_exercise_info(
302 302
         $clock_expired_time,
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
     );
314 314
     if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
315 315
 } else {
316
-	$exe_id = $exercise_stat_info['exe_id'];
316
+    $exe_id = $exercise_stat_info['exe_id'];
317 317
     // Remember last question id position.
318 318
     $isFirstTime = Session::read('firstTime');
319 319
     if ($isFirstTime && $objExercise->type == ONE_PER_PAGE) {
@@ -372,9 +372,9 @@  discard block
 block discarded – undo
372 372
 if ($debug) { error_log('6. $objExercise->get_stat_track_exercise_info function called::  '.print_r($exercise_stat_info, 1)); };
373 373
 
374 374
 if (!empty($exercise_stat_info['questions_to_check'])) {
375
-	$my_remind_list = $exercise_stat_info['questions_to_check'];
376
-	$my_remind_list = explode(',', $my_remind_list);
377
-	$my_remind_list = array_filter($my_remind_list);
375
+    $my_remind_list = $exercise_stat_info['questions_to_check'];
376
+    $my_remind_list = explode(',', $my_remind_list);
377
+    $my_remind_list = array_filter($my_remind_list);
378 378
 }
379 379
 
380 380
 $params = "exe_id=$exe_id&exerciseId=$exerciseId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id&".api_get_cidreq();
@@ -382,8 +382,8 @@  discard block
 block discarded – undo
382 382
 
383 383
 if ($reminder == 2 && empty($my_remind_list)) {
384 384
     if ($debug) { error_log("6.2 calling the exercise_reminder.php "); };
385
-	header('Location: exercise_reminder.php?'.$params);
386
-	exit;
385
+    header('Location: exercise_reminder.php?'.$params);
386
+    exit;
387 387
 }
388 388
 
389 389
 /*
@@ -391,56 +391,56 @@  discard block
 block discarded – undo
391 391
  * If the expired time is major that zero(0) then the expired time is compute on this time.
392 392
  */
393 393
 if ($time_control) {
394
-	if ($debug) error_log('7.1. Time control is enabled');
395
-	if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
396
-	if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
394
+    if ($debug) error_log('7.1. Time control is enabled');
395
+    if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
396
+    if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
397 397
 
398 398
     if (!isset($_SESSION['expired_time'][$current_expired_time_key])) {
399 399
         //Timer - Get expired_time for a student
400 400
         if (!empty($exercise_stat_info)) {
401
-        	if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
402
-	        $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
403
-			if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
404
-	        // Get the last attempt of an exercise
405
-	    	$last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
401
+            if ($debug) {error_log('7.4 Seems that the session ends and the user want to retake the exam'); };
402
+            $expired_time_of_this_attempt = $exercise_stat_info['expired_time_control'];
403
+            if ($debug) {error_log('7.5 $expired_time_of_this_attempt: '.$expired_time_of_this_attempt); }
404
+            // Get the last attempt of an exercise
405
+            $last_attempt_date = Event::getLastAttemptDateOfExercise($exercise_stat_info['exe_id']);
406 406
 
407
-	    	/* This means that the user enters the exam but do not answer the
407
+            /* This means that the user enters the exam but do not answer the
408 408
 	    	   first question we get the date from the track_e_exercises not from
409 409
 	    	   the track_et_attempt see #2069 */
410
-	    	if (empty($last_attempt_date)) {
411
-	    		$diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
412
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
413
-	    	} else {
414
-	    		//Recalculate the time control due #2069
415
-	    		$diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
416
-	    		$last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
417
-	    	}
418
-	        if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
419
-
420
-	        //New expired time - it is due to the possible closure of session
421
-	        $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
422
-	        if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
423
-
424
-	        $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
425
-	        if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
426
-
427
-	        $clock_expired_time  = api_get_utc_datetime($expected_time);
428
-	        if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
429
-
430
-			// First we update the attempt to today
431
-			/* How the expired time is changed into "track_e_exercises" table,
410
+            if (empty($last_attempt_date)) {
411
+                $diff = $current_timestamp - api_strtotime($exercise_stat_info['start_date'], 'UTC');
412
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($exercise_stat_info['start_date'],'UTC') + $diff);
413
+            } else {
414
+                //Recalculate the time control due #2069
415
+                $diff = $current_timestamp - api_strtotime($last_attempt_date,'UTC');
416
+                $last_attempt_date = api_get_utc_datetime(api_strtotime($last_attempt_date,'UTC') + $diff);
417
+            }
418
+            if ($debug) {error_log('7.6. $last_attempt_date: '.$last_attempt_date); }
419
+
420
+            //New expired time - it is due to the possible closure of session
421
+            $new_expired_time_in_seconds = api_strtotime($expired_time_of_this_attempt, 'UTC') - api_strtotime($last_attempt_date,'UTC');
422
+            if ($debug) {error_log('7.7. $new_expired_time_in_seconds: '.$new_expired_time_in_seconds); }
423
+
424
+            $expected_time	= $current_timestamp + $new_expired_time_in_seconds;
425
+            if ($debug) {error_log('7.8. $expected_time1: '.$expected_time); }
426
+
427
+            $clock_expired_time  = api_get_utc_datetime($expected_time);
428
+            if ($debug) {error_log('7.9. $clock_expired_time: '.$clock_expired_time); }
429
+
430
+            // First we update the attempt to today
431
+            /* How the expired time is changed into "track_e_exercises" table,
432 432
                then the last attempt for this student should be changed too */
433
-	        $sql = "UPDATE $exercise_attempt_table SET
433
+            $sql = "UPDATE $exercise_attempt_table SET
434 434
 	                tms = '".api_get_utc_datetime()."'
435 435
 	                WHERE
436 436
 	                    exe_id = '".$exercise_stat_info['exe_id']."' AND
437 437
 	                    tms = '".$last_attempt_date."' ";
438
-	        if ($debug) {error_log('7.10. $sql: '.$sql); }
439
-	        Database::query($sql);
438
+            if ($debug) {error_log('7.10. $sql: '.$sql); }
439
+            Database::query($sql);
440 440
 
441
-	        //Sessions  that contain the expired time
442
-	        $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
443
-	        if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
441
+            //Sessions  that contain the expired time
442
+            $_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
443
+            if ($debug) {error_log('7.11. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key] ); };
444 444
         }
445 445
     } else {
446 446
         $clock_expired_time =  $_SESSION['expired_time'][$current_expired_time_key];
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
  * for more details of how it works see this link : http://eric.garside.name/docs.html?p=epiclock
458 458
  */
459 459
 if ($time_control) { //Sends the exercise form when the expired time is finished
460
-	$htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
460
+    $htmlHeadXtra[] = $objExercise->show_time_control_js($time_left);
461 461
 }
462 462
 
463 463
 // if the user has submitted the form
@@ -470,14 +470,14 @@  discard block
 block discarded – undo
470 470
     // selects the list of question ID
471 471
     $questionList = $objExercise->get_validated_question_list();
472 472
     if ($objExercise->isRandom() && !empty($exercise_stat_info['data_tracking'])) {
473
-    	$questionList = explode(',', $exercise_stat_info['data_tracking']);
473
+        $questionList = explode(',', $exercise_stat_info['data_tracking']);
474 474
     }
475 475
     Session::write('questionList', $questionList);
476 476
     if ($debug > 0) { error_log('$_SESSION[questionList] was set'); }
477 477
 } else {
478
-	if (isset($objExercise) && isset($_SESSION['objExercise'])) {
479
-    	$questionList = $_SESSION['questionList'];
480
-	}
478
+    if (isset($objExercise) && isset($_SESSION['objExercise'])) {
479
+        $questionList = $_SESSION['questionList'];
480
+    }
481 481
 }
482 482
 
483 483
 if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 //Real question count
486 486
 $question_count = 0;
487 487
 if (!empty($questionList)) {
488
-	$question_count = count($questionList);
488
+    $question_count = count($questionList);
489 489
 }
490 490
 
491 491
 if ($formSent && isset($_POST)) {
@@ -527,11 +527,11 @@  discard block
 block discarded – undo
527 527
                 //saving each question
528 528
                 if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_DIRECT) {
529 529
                     $nro_question = $current_question; // - 1;
530
-                 	$questionId   = $key;
530
+                        $questionId   = $key;
531 531
                     // gets the student choice for this question
532 532
                     $choice = $exerciseResult[$questionId];
533 533
                     if (isset($exe_id)) {
534
-                    	// Manage the question and answer attempts
534
+                        // Manage the question and answer attempts
535 535
                         if ($debug) { error_log('8.3. manage_answer exe_id: '.$exe_id.' - $questionId: '.$questionId.' Choice'.print_r($choice,1)); }
536 536
                         $objExercise->manage_answer(
537 537
                             $exe_id,
@@ -620,58 +620,58 @@  discard block
 block discarded – undo
620 620
 }
621 621
 
622 622
 if ($question_count != 0) {
623
-	if (($objExercise->type == ALL_ON_ONE_PAGE ||
623
+    if (($objExercise->type == ALL_ON_ONE_PAGE ||
624 624
         $current_question > $question_count)
625 625
     ) {
626
-	    if (api_is_allowed_to_session_edit()) {
627
-	        // goes to the script that will show the result of the exercise
628
-	        if ($objExercise->type == ALL_ON_ONE_PAGE) {
629
-	            if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
630
-
631
-	            //We check if the user attempts before sending to the exercise_result.php
632
-	            if ($objExercise->selectAttempts() > 0) {
633
-	                $attempt_count = Event::get_attempt_count(
626
+        if (api_is_allowed_to_session_edit()) {
627
+            // goes to the script that will show the result of the exercise
628
+            if ($objExercise->type == ALL_ON_ONE_PAGE) {
629
+                if ($debug) { error_log('12. Exercise ALL_ON_ONE_PAGE -> Redirecting to exercise_result.php'); }
630
+
631
+                //We check if the user attempts before sending to the exercise_result.php
632
+                if ($objExercise->selectAttempts() > 0) {
633
+                    $attempt_count = Event::get_attempt_count(
634 634
                         api_get_user_id(),
635 635
                         $exerciseId,
636 636
                         $learnpath_id,
637 637
                         $learnpath_item_id,
638 638
                         $learnpath_item_view_id
639 639
                     );
640
-	                if ($attempt_count >= $objExercise->selectAttempts()) {
641
-	                    Display :: display_warning_message(
640
+                    if ($attempt_count >= $objExercise->selectAttempts()) {
641
+                        Display :: display_warning_message(
642 642
                             sprintf(get_lang('ReachedMaxAttempts'), $exercise_title, $objExercise->selectAttempts()),
643 643
                             false
644 644
                         );
645
-	                    if ($origin != 'learnpath') {
646
-	                        //so we are not in learnpath tool
647
-	                        echo '</div>'; //End glossary div
648
-	                        Display :: display_footer();
649
-	                    } else {
650
-	                        echo '</body></html>';
651
-	                    }
652
-	                    exit;
653
-	                }
654
-	            }
655
-	        } else {
656
-	            if ($objExercise->review_answers) {
657
-	            	header('Location: exercise_reminder.php?'.$params);
658
-	            	exit;
659
-	            } else {
645
+                        if ($origin != 'learnpath') {
646
+                            //so we are not in learnpath tool
647
+                            echo '</div>'; //End glossary div
648
+                            Display :: display_footer();
649
+                        } else {
650
+                            echo '</body></html>';
651
+                        }
652
+                        exit;
653
+                    }
654
+                }
655
+            } else {
656
+                if ($objExercise->review_answers) {
657
+                    header('Location: exercise_reminder.php?'.$params);
658
+                    exit;
659
+                } else {
660 660
                     header("Location: exercise_result.php?".api_get_cidreq()."&exe_id=$exe_id&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&learnpath_item_view_id=$learnpath_item_view_id");
661 661
                     exit;
662
-	            }
663
-	        }
664
-	    } else {
665
-	        if ($debug) { error_log('Redirecting to exercise_submit.php'); }
666
-	        exit;
667
-	    }
668
-	}
662
+                }
663
+            }
664
+        } else {
665
+            if ($debug) { error_log('Redirecting to exercise_submit.php'); }
666
+            exit;
667
+        }
668
+    }
669 669
 } else {
670
-	$error = get_lang('ThereAreNoQuestionsForThisExercise');
671
-	// if we are in the case where user select random by category, but didn't choose the number of random question
672
-	if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
673
-		$error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
674
-	}
670
+    $error = get_lang('ThereAreNoQuestionsForThisExercise');
671
+    // if we are in the case where user select random by category, but didn't choose the number of random question
672
+    if ($objExercise->selectRandomByCat() > 0 && $objExercise->random <= 0) {
673
+        $error .= "<br/>".get_lang('PleaseSelectSomeRandomQuestion');
674
+    }
675 675
 }
676 676
 
677 677
 if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
710 710
 if (api_is_course_admin() && $origin != 'learnpath') {
711 711
     echo '<div class="actions">';
712 712
     if ($show_quiz_edition == false) {
713
-    	echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
713
+        echo '<a href="exercise_admin.php?' . api_get_cidreq() . '&modifyExercise=yes&exerciseId=' . $objExercise->id . '">'.Display :: return_icon('settings.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
714 714
     } else {
715
-    	echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
715
+        echo '<a href="#">'.Display::return_icon('settings_na.png', get_lang('ModifyExercise'),'',ICON_SIZE_MEDIUM).'</a>';
716 716
     }
717 717
     echo '</div>';
718 718
 }
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
             $message_warning = $permission_to_start ? get_lang('ReachedTimeLimit') : get_lang('ExerciseNoStartedYet');
756 756
             Display :: display_warning_message(sprintf($message_warning, $exercise_title, $objExercise->selectAttempts()));
757 757
             if ($origin != 'learnpath') {
758
-            	Display :: display_footer();
758
+                Display :: display_footer();
759 759
             }
760 760
             exit;
761 761
         } else {
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
 if (isset($_custom['exercises_hidden_when_no_start_date']) &&
771 771
     $_custom['exercises_hidden_when_no_start_date']
772 772
 ) {
773
-	if (empty($objExercise->start_time)) {
773
+    if (empty($objExercise->start_time)) {
774 774
         Display:: display_warning_message(
775 775
             sprintf(
776 776
                 get_lang('ExerciseNoStartedYet'),
@@ -778,20 +778,20 @@  discard block
 block discarded – undo
778 778
                 $objExercise->selectAttempts()
779 779
             )
780 780
         );
781
-		if ($origin != 'learnpath') {
782
-			Display :: display_footer();
783
-		}
784
-	}
781
+        if ($origin != 'learnpath') {
782
+            Display :: display_footer();
783
+        }
784
+    }
785 785
 }
786 786
 
787 787
 //Timer control
788 788
 if ($time_control) {
789 789
     echo $objExercise->return_time_left_div();
790
-	echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
790
+    echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
791 791
 }
792 792
 
793 793
 if ($origin != 'learnpath') {
794
-   echo '<div id="highlight-plugin" class="glossary-content">';
794
+    echo '<div id="highlight-plugin" class="glossary-content">';
795 795
 }
796 796
 
797 797
 if ($reminder == 2)  {
@@ -803,53 +803,53 @@  discard block
 block discarded – undo
803 803
     $current_question = 1; //set by default the 1st question
804 804
 
805 805
     if (!empty($my_remind_list)) {
806
-    	//Checking which questions we are going to call from the remind list
807
-		for ($i = 0; $i < count($data_tracking); $i++) {
808
-			for($j = 0; $j < count($my_remind_list); $j++) {
809
-
810
-				if (!empty($remind_question_id)) {
811
-					if ($remind_question_id == $my_remind_list[$j]) {
812
-
813
-			        	if ($remind_question_id == $data_tracking[$i]) {
814
-			        		if (isset($my_remind_list[$j+1])) {
815
-			        			$remind_question_id = $my_remind_list[$j+1];
816
-			        			$current_question = $i + 1;
817
-			        		} else {
806
+        //Checking which questions we are going to call from the remind list
807
+        for ($i = 0; $i < count($data_tracking); $i++) {
808
+            for($j = 0; $j < count($my_remind_list); $j++) {
809
+
810
+                if (!empty($remind_question_id)) {
811
+                    if ($remind_question_id == $my_remind_list[$j]) {
812
+
813
+                        if ($remind_question_id == $data_tracking[$i]) {
814
+                            if (isset($my_remind_list[$j+1])) {
815
+                                $remind_question_id = $my_remind_list[$j+1];
816
+                                $current_question = $i + 1;
817
+                            } else {
818 818
                                 // We end the remind list we go to the exercise_reminder.php please
819
-			        			$remind_question_id = -1;
820
-			        			$current_question = $i + 1; // last question
821
-			        		}
822
-			        		break 2;
823
-			            }
824
-					}
825
-				} else {
826
-					if ($my_remind_list[$j] == $data_tracking[$i]) {
827
-						if (isset($my_remind_list[$j+1])) {
828
-							$remind_question_id = $my_remind_list[$j+1];
829
-							$current_question = $i + 1; // last question
830
-						} else {
819
+                                $remind_question_id = -1;
820
+                                $current_question = $i + 1; // last question
821
+                            }
822
+                            break 2;
823
+                        }
824
+                    }
825
+                } else {
826
+                    if ($my_remind_list[$j] == $data_tracking[$i]) {
827
+                        if (isset($my_remind_list[$j+1])) {
828
+                            $remind_question_id = $my_remind_list[$j+1];
829
+                            $current_question = $i + 1; // last question
830
+                        } else {
831 831
                             // We end the remind list we go to the exercise_reminder.php please
832
-							$remind_question_id = -1;
833
-							$current_question = $i + 1; // last question
834
-						}
835
-						break 2;
836
-					}
837
-				}
838
-			}
832
+                            $remind_question_id = -1;
833
+                            $current_question = $i + 1; // last question
834
+                        }
835
+                        break 2;
836
+                    }
837
+                }
838
+            }
839 839
         }
840 840
     } else {
841
-    	if ($objExercise->review_answers) {
841
+        if ($objExercise->review_answers) {
842 842
             if ($debug) { error_log('. redirecting to exercise_reminder.php '); }
843
-	    	header("Location: exercise_reminder.php?$params");
844
-	    	exit;
845
-    	}
843
+            header("Location: exercise_reminder.php?$params");
844
+            exit;
845
+        }
846 846
     }
847 847
 }
848 848
 
849 849
 if ($objExercise->review_answers) {
850
-	$script_php = 'exercise_reminder.php';
850
+    $script_php = 'exercise_reminder.php';
851 851
 } else {
852
-	$script_php = 'exercise_result.php';
852
+    $script_php = 'exercise_result.php';
853 853
 }
854 854
 
855 855
 if (!empty($error)) {
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
          <input type="hidden" name="learnpath_item_id" 		value="'.$learnpath_item_id . '" />
1090 1090
          <input type="hidden" name="learnpath_item_view_id" value="'.$learnpath_item_view_id . '" />';
1091 1091
 
1092
-	// Show list of questions
1092
+    // Show list of questions
1093 1093
     $i = 1;
1094 1094
     $attempt_list = array();
1095 1095
     if (isset($exe_id)) {
@@ -1149,10 +1149,10 @@  discard block
 block discarded – undo
1149 1149
 
1150 1150
         $attributes = array('id' =>'remind_list['.$questionId.']');
1151 1151
         if (in_array($questionId, $remind_list)) {
1152
-        	$is_remind_on = true;
1153
-        	$attributes['checked'] = 1;
1154
-        	$remind_question = true;
1155
-        	$remind_highlight = ' remind_highlight ';
1152
+            $is_remind_on = true;
1153
+            $attributes['checked'] = 1;
1154
+            $remind_question = true;
1155
+            $remind_highlight = ' remind_highlight ';
1156 1156
         }
1157 1157
 
1158 1158
         // Showing the exercise description
@@ -1226,8 +1226,8 @@  discard block
 block discarded – undo
1226 1226
     }
1227 1227
     // end foreach()
1228 1228
     if ($objExercise->type == ALL_ON_ONE_PAGE) {
1229
-    	$exercise_actions =  $objExercise->show_button($questionId, $current_question);
1230
-    	echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
1229
+        $exercise_actions =  $objExercise->show_button($questionId, $current_question);
1230
+        echo Display::div($exercise_actions, array('class'=>'exercise_actions'));
1231 1231
         echo '<br>';
1232 1232
     }
1233 1233
     echo '</form>';
Please login to merge, or discard this patch.