@@ -11,40 +11,40 @@ discard block |
||
11 | 11 | * Code |
12 | 12 | */ |
13 | 13 | require_once '../inc/global.inc.php'; |
14 | -$this_section=SECTION_COURSES; |
|
14 | +$this_section = SECTION_COURSES; |
|
15 | 15 | api_protect_course_script(true); |
16 | 16 | |
17 | -$show=(isset($_GET['show']) && $_GET['show'] == 'result')?'result':'test'; // moved down to fix bug: http://www.dokeos.com/forum/viewtopic.php?p=18609#18609 |
|
17 | +$show = (isset($_GET['show']) && $_GET['show'] == 'result') ? 'result' : 'test'; // moved down to fix bug: http://www.dokeos.com/forum/viewtopic.php?p=18609#18609 |
|
18 | 18 | |
19 | 19 | /* Constants and variables */ |
20 | -$is_allowedToEdit = api_is_allowed_to_edit(null,true); |
|
20 | +$is_allowedToEdit = api_is_allowed_to_edit(null, true); |
|
21 | 21 | $is_tutor = api_is_allowed_to_edit(true); |
22 | 22 | |
23 | -if (!$is_allowedToEdit){ |
|
23 | +if (!$is_allowedToEdit) { |
|
24 | 24 | header('Location: /main/exercice/exercise.php?cidReq='.Security::remove_XSS($_GET['cidReq'])); |
25 | 25 | exit; |
26 | 26 | } |
27 | 27 | |
28 | -$interbreadcrumb[]= array ('url' => 'exercise_report.php?'.api_get_cidreq(),'name' => get_lang('Exercises')); |
|
29 | -$interbreadcrumb[]= array ('url' => 'exercise_report.php?filter=2&'.api_get_cidreq(),'name' => get_lang('StudentScore')); |
|
30 | -$interbreadcrumb[]= array ('url' => 'exercise_history.php?exe_id='.intval($_GET['exe_id']).'&'.api_get_cidreq(), 'name' => get_lang('Details')); |
|
28 | +$interbreadcrumb[] = array('url' => 'exercise_report.php?'.api_get_cidreq(), 'name' => get_lang('Exercises')); |
|
29 | +$interbreadcrumb[] = array('url' => 'exercise_report.php?filter=2&'.api_get_cidreq(), 'name' => get_lang('StudentScore')); |
|
30 | +$interbreadcrumb[] = array('url' => 'exercise_history.php?exe_id='.intval($_GET['exe_id']).'&'.api_get_cidreq(), 'name' => get_lang('Details')); |
|
31 | 31 | |
32 | 32 | $TBL_USER = Database::get_main_table(TABLE_MAIN_USER); |
33 | -$TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST); |
|
33 | +$TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST); |
|
34 | 34 | $TBL_EXERCISES_QUESTION = Database::get_course_table(TABLE_QUIZ_QUESTION); |
35 | -$TBL_TRACK_ATTEMPT_RECORDING= Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING); |
|
36 | -Display::display_header($nameTools,get_lang('Exercise')); |
|
35 | +$TBL_TRACK_ATTEMPT_RECORDING = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING); |
|
36 | +Display::display_header($nameTools, get_lang('Exercise')); |
|
37 | 37 | |
38 | 38 | if (isset($_GET['message'])) { |
39 | 39 | if (in_array($_GET['message'], array('ExerciseEdited'))) { |
40 | - $my_message_history=Security::remove_XSS($_GET['message']); |
|
40 | + $my_message_history = Security::remove_XSS($_GET['message']); |
|
41 | 41 | Display::display_confirmation_message(get_lang($my_message_history)); |
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
45 | 45 | echo '<div class="actions">'; |
46 | -echo '<a href="exercise_report.php?' . api_get_cidreq() . '&filter=2">' . |
|
47 | - Display :: return_icon('back.png', get_lang('BackToResultList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
46 | +echo '<a href="exercise_report.php?'.api_get_cidreq().'&filter=2">'. |
|
47 | + Display :: return_icon('back.png', get_lang('BackToResultList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
48 | 48 | echo '</div>'; |
49 | 49 | |
50 | 50 | ?> |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | <?php |
61 | 61 | |
62 | 62 | $sql = "SELECT *, quiz_question.question, firstname, lastname FROM $TBL_TRACK_ATTEMPT_RECORDING t, $TBL_USER,$TBL_EXERCISES_QUESTION quiz_question |
63 | - WHERE quiz_question.id = question_id AND user_id = author AND exe_id = '".(int)$_GET['exe_id']."' ORDER BY position"; |
|
63 | + WHERE quiz_question.id = question_id AND user_id = author AND exe_id = '".(int) $_GET['exe_id']."' ORDER BY position"; |
|
64 | 64 | $query = Database::query($sql); |
65 | -while($row = Database::fetch_array($query)){ |
|
65 | +while ($row = Database::fetch_array($query)) { |
|
66 | 66 | echo '<tr'; |
67 | - if ($i%2==0) { |
|
67 | + if ($i % 2 == 0) { |
|
68 | 68 | echo 'class="row_odd"'; |
69 | 69 | } else { |
70 | 70 | echo 'class="row_even"'; |
@@ -260,10 +260,10 @@ discard block |
||
260 | 260 | ['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"], |
261 | 261 | array('ToolbarSet' => 'TestQuestionDescription') |
262 | 262 | ); |
263 | - $form->addRule('answer',get_lang('GiveText'),'required'); |
|
263 | + $form->addRule('answer', get_lang('GiveText'), 'required'); |
|
264 | 264 | |
265 | 265 | //added multiple answers |
266 | - $form->addElement('checkbox','multiple_answer','', get_lang('FillInBlankSwitchable')); |
|
266 | + $form->addElement('checkbox', 'multiple_answer', '', get_lang('FillInBlankSwitchable')); |
|
267 | 267 | $form->addElement( |
268 | 268 | 'select', |
269 | 269 | 'select_separator', |
@@ -276,11 +276,11 @@ discard block |
||
276 | 276 | null, |
277 | 277 | '<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />' |
278 | 278 | ); |
279 | - $form->addElement('html','<div id="blanks_weighting"></div>'); |
|
279 | + $form->addElement('html', '<div id="blanks_weighting"></div>'); |
|
280 | 280 | |
281 | 281 | global $text; |
282 | 282 | // setting the save button here and not in the question class.php |
283 | - $form->addElement('html','<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>'); |
|
283 | + $form->addElement('html', '<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>'); |
|
284 | 284 | $form->addButtonSave($text, 'submitQuestion'); |
285 | 285 | |
286 | 286 | if (!empty($this->id)) { |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | // remove spaces at the beginning and the end of text in square brackets |
321 | 321 | $answer = preg_replace_callback( |
322 | 322 | "/".$blankStartSeparatorRegexp."[^]]+".$blankEndSeparatorRegexp."/", |
323 | - function ($matches) use ($blankStartSeparator, $blankEndSeparator) { |
|
323 | + function($matches) use ($blankStartSeparator, $blankEndSeparator) { |
|
324 | 324 | $matchingResult = $matches[0]; |
325 | 325 | $matchingResult = trim($matchingResult, $blankStartSeparator); |
326 | 326 | $matchingResult = trim($matchingResult, $blankEndSeparator); |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | if ($nb > 0) { |
366 | 366 | $answer .= '::'; |
367 | 367 | // weighting |
368 | - for ($i=0; $i < $nb; ++$i) { |
|
368 | + for ($i = 0; $i < $nb; ++$i) { |
|
369 | 369 | // enter the weighting of word $i |
370 | 370 | $answer .= $form->getSubmitValue('weighting['.$i.']'); |
371 | 371 | // not the last word, add "," |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | // input width |
380 | 380 | $answer .= ":"; |
381 | - for ($i=0; $i < $nb; ++$i) { |
|
381 | + for ($i = 0; $i < $nb; ++$i) { |
|
382 | 382 | // enter the width of input for word $i |
383 | 383 | $answer .= $form->getSubmitValue('sizeofinput['.$i.']'); |
384 | 384 | // not the last word, add "," |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | |
404 | 404 | // Allow answers order switches |
405 | 405 | $is_multiple = $form -> getSubmitValue('multiple_answer'); |
406 | - $answer.= '@'.$is_multiple; |
|
406 | + $answer .= '@'.$is_multiple; |
|
407 | 407 | |
408 | 408 | $this->save(); |
409 | 409 | $objAnswer = new Answer($this->id); |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | public function return_header($feedback_type = null, $counter = null, $score = null) |
421 | 421 | { |
422 | 422 | $header = parent::return_header($feedback_type, $counter, $score); |
423 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
423 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
424 | 424 | <tr> |
425 | 425 | <th>'.get_lang("Answer").'</th> |
426 | 426 | </tr>'; |
@@ -464,13 +464,13 @@ discard block |
||
464 | 464 | // if display for student, shuffle the correct answer menu |
465 | 465 | $listMenu = self::getFillTheBlankMenuAnswers($inTeacherSolution, $displayForStudent); |
466 | 466 | $result .= '<select name="choice['.$questionId.'][]">'; |
467 | - for ($k=0; $k < count($listMenu); $k++) { |
|
467 | + for ($k = 0; $k < count($listMenu); $k++) { |
|
468 | 468 | $selected = ""; |
469 | 469 | if ($correctItem == $listMenu[$k]) { |
470 | 470 | $selected = " selected=selected "; |
471 | 471 | } |
472 | 472 | // if in teacher view, display the first item by default, which is the right answer |
473 | - if ($k==0 && !$displayForStudent) { |
|
473 | + if ($k == 0 && !$displayForStudent) { |
|
474 | 474 | $selected = " selected=selected "; |
475 | 475 | } |
476 | 476 | $optionMenu .= '<option '.$selected.' value="'.$listMenu[$k].'">'.$listMenu[$k].'</option>'; |
@@ -642,10 +642,10 @@ discard block |
||
642 | 642 | if (count($listDetails) < 3) { |
643 | 643 | $listWeightings = explode(',', $listDetails[0]); |
644 | 644 | $listSizeOfInput = array(); |
645 | - for ($i=0; $i < count($listWeightings); $i++) { |
|
645 | + for ($i = 0; $i < count($listWeightings); $i++) { |
|
646 | 646 | $listSizeOfInput[] = 200; |
647 | 647 | } |
648 | - $blankSeparatorNumber = 0; // 0 is [...] |
|
648 | + $blankSeparatorNumber = 0; // 0 is [...] |
|
649 | 649 | } else { |
650 | 650 | $listWeightings = explode(',', $listDetails[0]); |
651 | 651 | $listSizeOfInput = explode(',', $listDetails[1]); |
@@ -677,9 +677,9 @@ discard block |
||
677 | 677 | // remove [ and ] in string |
678 | 678 | array_walk( |
679 | 679 | $listWords[0], |
680 | - function (&$value, $key, $tabBlankChar) { |
|
680 | + function(&$value, $key, $tabBlankChar) { |
|
681 | 681 | $trimChars = ""; |
682 | - for ($i=0; $i < count($tabBlankChar); $i++) { |
|
682 | + for ($i = 0; $i < count($tabBlankChar); $i++) { |
|
683 | 683 | $trimChars .= $tabBlankChar[$i]; |
684 | 684 | } |
685 | 685 | $value = trim($value, $trimChars); |
@@ -699,18 +699,18 @@ discard block |
||
699 | 699 | // if student answer, the second [] is the student answer, |
700 | 700 | // the third is if student scored or not |
701 | 701 | $listBrackets = array(); |
702 | - $listWords = array(); |
|
702 | + $listWords = array(); |
|
703 | 703 | |
704 | 704 | if ($isStudentAnswer) { |
705 | - for ($i=0; $i < count($listAnswerResults['tabwords']); $i++) { |
|
705 | + for ($i = 0; $i < count($listAnswerResults['tabwords']); $i++) { |
|
706 | 706 | $listBrackets[] = $listAnswerResults['tabwordsbracket'][$i]; |
707 | 707 | $listWords[] = $listAnswerResults['tabwords'][$i]; |
708 | - if ($i+1 < count($listAnswerResults['tabwords'])) { |
|
708 | + if ($i + 1 < count($listAnswerResults['tabwords'])) { |
|
709 | 709 | // should always be |
710 | 710 | $i++; |
711 | 711 | } |
712 | 712 | $listAnswerResults['studentanswer'][] = $listAnswerResults['tabwords'][$i]; |
713 | - if ($i+1 < count($listAnswerResults['tabwords'])) { |
|
713 | + if ($i + 1 < count($listAnswerResults['tabwords'])) { |
|
714 | 714 | // should always be |
715 | 715 | $i++; |
716 | 716 | } |
@@ -802,9 +802,9 @@ discard block |
||
802 | 802 | break; |
803 | 803 | default : |
804 | 804 | if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) { |
805 | - $tabUserResult[$data['user_id']][$bracketNumber] = 0; // right answer |
|
805 | + $tabUserResult[$data['user_id']][$bracketNumber] = 0; // right answer |
|
806 | 806 | } else { |
807 | - $tabUserResult[$data['user_id']][$bracketNumber] = -1; // wrong answer |
|
807 | + $tabUserResult[$data['user_id']][$bracketNumber] = -1; // wrong answer |
|
808 | 808 | } |
809 | 809 | } |
810 | 810 | } else { |
@@ -812,11 +812,11 @@ discard block |
||
812 | 812 | if ($useLastAnswerredAttempt) { |
813 | 813 | // if we take into account the last answered attempt |
814 | 814 | if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) { |
815 | - $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered |
|
815 | + $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered |
|
816 | 816 | } |
817 | 817 | } else { |
818 | 818 | // we take the last attempt, even if the student answer the question before |
819 | - $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered |
|
819 | + $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered |
|
820 | 820 | } |
821 | 821 | } |
822 | 822 | } |
@@ -837,10 +837,10 @@ discard block |
||
837 | 837 | { |
838 | 838 | $outRes = 0; |
839 | 839 | // for each student in group |
840 | - foreach($resultList as $userId => $tabValue) { |
|
840 | + foreach ($resultList as $userId => $tabValue) { |
|
841 | 841 | $trouve = false; |
842 | 842 | // for each bracket, if student has at leat one answer ( choice > -2) then he pass the question |
843 | - foreach($tabValue as $i => $choice) { |
|
843 | + foreach ($tabValue as $i => $choice) { |
|
844 | 844 | if ($choice > -2 && !$trouve) { |
845 | 845 | $outRes++; |
846 | 846 | $trouve = true; |
@@ -862,7 +862,7 @@ discard block |
||
862 | 862 | $separatorEnd = $listWithStudentAnswer['blankseparatorend']; |
863 | 863 | // lets rebuild the sentence with [correct answer][student answer][answer is correct] |
864 | 864 | $result = ""; |
865 | - for ($i=0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) { |
|
865 | + for ($i = 0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) { |
|
866 | 866 | $result .= $listWithStudentAnswer['commonwords'][$i]; |
867 | 867 | $result .= $listWithStudentAnswer['tabwordsbracket'][$i]; |
868 | 868 | $result .= $separatorStart.$listWithStudentAnswer['studentanswer'][$i].$separatorEnd; |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | ")", |
945 | 945 | ]; |
946 | 946 | $result = $text; |
947 | - for ($i=0; $i < count($listRegexpCharacters); $i++) { |
|
947 | + for ($i = 0; $i < count($listRegexpCharacters); $i++) { |
|
948 | 948 | $result = str_replace($listRegexpCharacters[$i], "\\".$listRegexpCharacters[$i], $result); |
949 | 949 | } |
950 | 950 | |
@@ -1006,7 +1006,7 @@ discard block |
||
1006 | 1006 | { |
1007 | 1007 | $listResults = array(); |
1008 | 1008 | $fillBlanksAllowedSeparator = self::getAllowedSeparator(); |
1009 | - for ($i=0; $i < count($fillBlanksAllowedSeparator); $i++) { |
|
1009 | + for ($i = 0; $i < count($fillBlanksAllowedSeparator); $i++) { |
|
1010 | 1010 | $listResults[] = $fillBlanksAllowedSeparator[$i][0]."...".$fillBlanksAllowedSeparator[$i][1]; |
1011 | 1011 | } |
1012 | 1012 | |
@@ -1024,7 +1024,7 @@ discard block |
||
1024 | 1024 | { |
1025 | 1025 | $listSeparators = self::getAllowedSeparator(); |
1026 | 1026 | $result = 0; |
1027 | - for ($i=0; $i < count($listSeparators); $i++) { |
|
1027 | + for ($i = 0; $i < count($listSeparators); $i++) { |
|
1028 | 1028 | if ($listSeparators[$i][0] == $startSeparator && |
1029 | 1029 | $listSeparators[$i][1] == $endSeparator |
1030 | 1030 | ) { |
@@ -1049,7 +1049,7 @@ discard block |
||
1049 | 1049 | |
1050 | 1050 | // rebuild the answer with good HTML style |
1051 | 1051 | // this is the student answer, right or wrong |
1052 | - for ($i=0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) { |
|
1052 | + for ($i = 0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) { |
|
1053 | 1053 | if ($listStudentAnswerInfo['studentscore'][$i] == 1) { |
1054 | 1054 | $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlRightAnswer( |
1055 | 1055 | $listStudentAnswerInfo['studentanswer'][$i], |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | |
1068 | 1068 | |
1069 | 1069 | // rebuild the sentence with student answer inserted |
1070 | - for ($i=0; $i < count($listStudentAnswerInfo['commonwords']); $i++) { |
|
1070 | + for ($i = 0; $i < count($listStudentAnswerInfo['commonwords']); $i++) { |
|
1071 | 1071 | $result .= isset($listStudentAnswerInfo['commonwords'][$i]) ? $listStudentAnswerInfo['commonwords'][$i] : ''; |
1072 | 1072 | $result .= isset($listStudentAnswerInfo['studentanswer'][$i]) ? $listStudentAnswerInfo['studentanswer'][$i] : ''; |
1073 | 1073 | } |
@@ -1100,7 +1100,7 @@ discard block |
||
1100 | 1100 | $listPossibleAnswers = FillBlanks::getFillTheBlankMenuAnswers($correct, false); |
1101 | 1101 | $correctAnswerHtml .= "<span style='color: green'>".$listPossibleAnswers[0]."</span>"; |
1102 | 1102 | $correctAnswerHtml .= " <span style='font-weight:normal'>("; |
1103 | - for ($i=1; $i < count($listPossibleAnswers); $i++) { |
|
1103 | + for ($i = 1; $i < count($listPossibleAnswers); $i++) { |
|
1104 | 1104 | $correctAnswerHtml .= $listPossibleAnswers[$i]; |
1105 | 1105 | if ($i != count($listPossibleAnswers) - 1) { |
1106 | 1106 | $correctAnswerHtml .= " | "; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | if (!empty($gradebook) && $gradebook == 'view') { |
110 | 110 | $interbreadcrumb[] = array( |
111 | - 'url' => '../gradebook/' . $_SESSION['gradebook_dest'], |
|
111 | + 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
|
112 | 112 | 'name' => get_lang('ToolGradebook') |
113 | 113 | ); |
114 | 114 | } |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | ); |
699 | 699 | |
700 | 700 | // Exercise results |
701 | - $actions .='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
701 | + $actions .= '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
702 | 702 | Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>'; |
703 | 703 | |
704 | 704 | // Export |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | } |
763 | 763 | } |
764 | 764 | |
765 | - $actions .='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
765 | + $actions .= '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
766 | 766 | Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>'; |
767 | 767 | $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'), ENT_QUOTES, $charset))." ".addslashes($row['title'])."?"."')) return false;", 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); |
768 | 768 | } |
@@ -952,7 +952,7 @@ discard block |
||
952 | 952 | $item .= Display::tag('td', $actions, array('class' => 'td_actions')); |
953 | 953 | } else { |
954 | 954 | if ($isDrhOfCourse) { |
955 | - $actions ='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
955 | + $actions = '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'. |
|
956 | 956 | Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>'; |
957 | 957 | $item .= Display::tag('td', $actions, array('class' => 'td_actions')); |
958 | 958 | } |
@@ -962,7 +962,7 @@ discard block |
||
962 | 962 | 'tr', |
963 | 963 | $item, |
964 | 964 | array( |
965 | - 'id' => 'exercise_list_' . $my_exercise_id, |
|
965 | + 'id' => 'exercise_list_'.$my_exercise_id, |
|
966 | 966 | ) |
967 | 967 | ); |
968 | 968 | |
@@ -1033,7 +1033,7 @@ discard block |
||
1033 | 1033 | 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path |
1034 | 1034 | ); |
1035 | 1035 | |
1036 | - $actions .='<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'. |
|
1036 | + $actions .= '<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'. |
|
1037 | 1037 | Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>'; |
1038 | 1038 | |
1039 | 1039 | // if active |
@@ -1042,7 +1042,7 @@ discard block |
||
1042 | 1042 | $actions .= ' <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=disable&page='.$page.'&file='.$path.'">'. |
1043 | 1043 | Display::return_icon('visible.png', get_lang('Deactivate'), '', ICON_SIZE_SMALL).'</a>'; |
1044 | 1044 | } else { // else if not active |
1045 | - $actions .=' <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=enable&page='.$page.'&file='.$path.'">'. |
|
1045 | + $actions .= ' <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=enable&page='.$page.'&file='.$path.'">'. |
|
1046 | 1046 | Display::return_icon('invisible.png', get_lang('Activate'), '', ICON_SIZE_SMALL).'</a>'; |
1047 | 1047 | } |
1048 | 1048 | $actions .= '<a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=delete&file='.$path.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('AreYouSureToDeleteJS'), ENT_QUOTES, $charset).' '.$title."?").'\')) return false;">'. |
@@ -1075,7 +1075,7 @@ discard block |
||
1075 | 1075 | $item .= Display::tag('td', $attemptText); |
1076 | 1076 | |
1077 | 1077 | if ($isDrhOfCourse) { |
1078 | - $actions ='<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'. |
|
1078 | + $actions = '<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'. |
|
1079 | 1079 | Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>'; |
1080 | 1080 | |
1081 | 1081 | $item .= Display::tag('td', $actions, array('class' => 'td_actions')); |
@@ -63,13 +63,13 @@ discard block |
||
63 | 63 | for ($i = 1; $i <= $answer->nbrAnswers; $i++) { |
64 | 64 | if ($answer->isCorrect($i)) { |
65 | 65 | $nb_matches++; |
66 | - $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i); |
|
67 | - $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1); |
|
66 | + $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i); |
|
67 | + $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1); |
|
68 | 68 | $answerInfo = $answer->getAnswerByAutoId($answer->correct[$i]); |
69 | - $defaults['matches[' . $nb_matches . ']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : ''; |
|
69 | + $defaults['matches['.$nb_matches.']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : ''; |
|
70 | 70 | } else { |
71 | 71 | $nb_options++; |
72 | - $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i); |
|
72 | + $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | $html = '<table class="table table-striped table-hover"> |
93 | 93 | <thead> |
94 | 94 | <tr> |
95 | - <th width="85%">' . get_lang('Answer') . '</th> |
|
96 | - <th width="15%">' . get_lang('MatchesTo') . '</th> |
|
97 | - <th width="10">' . get_lang('Weighting') . '</th> |
|
95 | + <th width="85%">' . get_lang('Answer').'</th> |
|
96 | + <th width="15%">' . get_lang('MatchesTo').'</th> |
|
97 | + <th width="10">' . get_lang('Weighting').'</th> |
|
98 | 98 | </tr> |
99 | 99 | </thead> |
100 | 100 | <tbody>'; |
@@ -189,9 +189,9 @@ discard block |
||
189 | 189 | for ($i = 1; $i <= $nb_matches; ++$i) { |
190 | 190 | $position++; |
191 | 191 | |
192 | - $answer = $form->getSubmitValue('answer[' . $i . ']'); |
|
193 | - $matches = $form->getSubmitValue('matches[' . $i . ']'); |
|
194 | - $weighting = $form->getSubmitValue('weighting[' . $i . ']'); |
|
192 | + $answer = $form->getSubmitValue('answer['.$i.']'); |
|
193 | + $matches = $form->getSubmitValue('matches['.$i.']'); |
|
194 | + $weighting = $form->getSubmitValue('weighting['.$i.']'); |
|
195 | 195 | $this->weighting += $weighting; |
196 | 196 | $objAnswer->createAnswer( |
197 | 197 | $answer, |
@@ -216,10 +216,10 @@ discard block |
||
216 | 216 | public function return_header($feedback_type = null, $counter = null, $score = null) |
217 | 217 | { |
218 | 218 | $header = parent::return_header($feedback_type, $counter, $score); |
219 | - $header .= '<table class="' . $this->question_table_class . '"> |
|
219 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
220 | 220 | <tr> |
221 | - <th>' . get_lang('ElementList') . '</th> |
|
222 | - <th>' . get_lang('Status') . '</th> |
|
221 | + <th>' . get_lang('ElementList').'</th> |
|
222 | + <th>' . get_lang('Status').'</th> |
|
223 | 223 | </tr>'; |
224 | 224 | |
225 | 225 | return $header; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $is_allowedToEdit = api_is_allowed_to_edit(null, true); |
34 | 34 | |
35 | 35 | // Database table definitions. |
36 | -$dbTable = Database::get_course_table(TABLE_DOCUMENT); |
|
36 | +$dbTable = Database::get_course_table(TABLE_DOCUMENT); |
|
37 | 37 | $course_id = api_get_course_int_id(); |
38 | 38 | |
39 | 39 | // Setting some variables. |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $_course, |
149 | 149 | $_FILES['userFile'], |
150 | 150 | $document_sys_path, |
151 | - $uploadPath . '/' . $fld, |
|
151 | + $uploadPath.'/'.$fld, |
|
152 | 152 | api_get_user_id(), |
153 | 153 | null, |
154 | 154 | null, |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $imgparams = $_POST['imgparams']; |
161 | 161 | $checked = CheckImageName($imgparams, $filename); |
162 | 162 | if ($checked) { |
163 | - $imgcount = $imgcount-1; |
|
163 | + $imgcount = $imgcount - 1; |
|
164 | 164 | } else { |
165 | 165 | $dialogBox .= $filename.' '.get_lang('NameNotEqual'); |
166 | 166 | my_delete($document_sys_path.$uploadPath.'/'.$fld.'/'.$filename); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | require_once '../inc/global.inc.php'; |
14 | 14 | $this_section = SECTION_COURSES; |
15 | 15 | |
16 | -if (!api_is_allowed_to_edit(null,true)) { |
|
16 | +if (!api_is_allowed_to_edit(null, true)) { |
|
17 | 17 | api_not_allowed(true); |
18 | 18 | } |
19 | 19 | |
@@ -131,8 +131,8 @@ discard block |
||
131 | 131 | $gradebook = $_SESSION['gradebook']; |
132 | 132 | } |
133 | 133 | |
134 | - if (!empty($gradebook) && $gradebook=='view') { |
|
135 | - $interbreadcrumb[]= array ( |
|
134 | + if (!empty($gradebook) && $gradebook == 'view') { |
|
135 | + $interbreadcrumb[] = array( |
|
136 | 136 | 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
137 | 137 | 'name' => get_lang('ToolGradebook') |
138 | 138 | ); |
@@ -152,19 +152,19 @@ discard block |
||
152 | 152 | echo '<div class="actions">'; |
153 | 153 | |
154 | 154 | if ($objExercise->id != 0) { |
155 | - echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' . |
|
155 | + echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">'. |
|
156 | 156 | Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
157 | 157 | } else { |
158 | - if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){ |
|
159 | - if (!empty($_POST['lp_id'])){ |
|
158 | + if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])) { |
|
159 | + if (!empty($_POST['lp_id'])) { |
|
160 | 160 | $lp_id = intval($_POST['lp_id']); |
161 | 161 | //TODO:this remains to be implemented after press the first post |
162 | 162 | } else { |
163 | 163 | $lp_id = intval($_GET['lp_id']); |
164 | 164 | } |
165 | - echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'',ICON_SIZE_MEDIUM)."</a>"; |
|
165 | + echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"), '', ICON_SIZE_MEDIUM)."</a>"; |
|
166 | 166 | } else { |
167 | - echo '<a href="exercise.php?'.api_get_cidreq().'">' . |
|
167 | + echo '<a href="exercise.php?'.api_get_cidreq().'">'. |
|
168 | 168 | Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM). |
169 | 169 | '</a>'; |
170 | 170 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | get_lang('DirectFeedbackCantModifyTypeQuestion') |
177 | 177 | ); |
178 | 178 | |
179 | - if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) { |
|
179 | + if (api_get_setting('search_enabled') == 'true' && !extension_loaded('xapian')) { |
|
180 | 180 | Display::display_error_message(get_lang('SearchXapianModuleNotInstalled')); |
181 | 181 | } |
182 | 182 |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $hotSpot['answer'] = $hotspot['answer']; |
71 | 71 | |
72 | 72 | // Square or rectancle |
73 | - if ($hotspot['hotspot_type'] == 'square' ) { |
|
73 | + if ($hotspot['hotspot_type'] == 'square') { |
|
74 | 74 | $hotSpot['type'] = 'square'; |
75 | 75 | } |
76 | 76 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | ORDER by hotspot_id"; |
110 | 110 | $rs = Database::query($sql); // don't output error because we are in Flash execution. |
111 | 111 | |
112 | -while($row = Database :: fetch_array($rs, 'ASSOC')) { |
|
112 | +while ($row = Database :: fetch_array($rs, 'ASSOC')) { |
|
113 | 113 | $data['answers'][] = $row['hotspot_coordinate']; |
114 | 114 | } |
115 | 115 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | // notice for unauthorized people. |
15 | 15 | api_protect_course_script(true); |
16 | 16 | |
17 | -if ($debug>0) { |
|
17 | +if ($debug > 0) { |
|
18 | 18 | error_log('Entered exercise_result.php: '.print_r($_POST, 1)); |
19 | 19 | } |
20 | 20 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | if (isset($_SESSION['exe_id'])) { |
94 | 94 | $exe_id = intval($_SESSION['exe_id']); |
95 | 95 | } |
96 | -$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id); |
|
96 | +$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id); |
|
97 | 97 | if (!empty($exercise_stat_info['data_tracking'])) { |
98 | 98 | $question_list = explode(',', $exercise_stat_info['data_tracking']); |
99 | 99 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $remind_list = $exercise_stat_info['questions_to_check']; |
174 | 174 | $remind_list = explode(',', $remind_list); |
175 | 175 | |
176 | -$exercise_result = array(); |
|
176 | +$exercise_result = array(); |
|
177 | 177 | |
178 | 178 | foreach ($attempt_list as $question_id => $options) { |
179 | 179 | foreach ($options as $item) { |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | unset($objQuestionTmp); |
205 | 205 | |
206 | 206 | // creates a temporary Question object |
207 | - $objQuestionTmp = Question :: read($questionId); |
|
207 | + $objQuestionTmp = Question :: read($questionId); |
|
208 | 208 | |
209 | 209 | $quesId = $objQuestionTmp->selectId(); |
210 | - $check_id = 'remind_list['.$questionId.']'; |
|
210 | + $check_id = 'remind_list['.$questionId.']'; |
|
211 | 211 | $attributes = array('id'=>$check_id, 'onclick'=>"save_remind_item(this, '$questionId');"); |
212 | 212 | |
213 | 213 | if (in_array($questionId, $remind_list)) { |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | echo Display::div($table, array('class'=>'span10')); |
240 | 240 | |
241 | 241 | $exercise_actions = Display::url(get_lang('EndTest'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-warning')); |
242 | -$exercise_actions .= ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn btn-success')); |
|
242 | +$exercise_actions .= ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();', 'class'=>'btn btn-success')); |
|
243 | 243 | |
244 | 244 | echo Display::div('', array('class'=>'clear')); |
245 | 245 | echo Display::div($exercise_actions, array('class'=>'form-actions')); |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | |
60 | 60 | $gradebook = ''; |
61 | 61 | if (isset($_SESSION['gradebook'])) { |
62 | - $gradebook= $_SESSION['gradebook']; |
|
62 | + $gradebook = $_SESSION['gradebook']; |
|
63 | 63 | } |
64 | -if (!empty($gradebook) && $gradebook=='view') { |
|
64 | +if (!empty($gradebook) && $gradebook == 'view') { |
|
65 | 65 | $interbreadcrumb[] = array( |
66 | 66 | 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
67 | 67 | 'name' => get_lang('ToolGradebook'), |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | "name" => get_lang('Exercises'), |
76 | 76 | ); |
77 | 77 | |
78 | -$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>'; |
|
79 | -$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">'; |
|
78 | +$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>'; |
|
79 | +$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">'; |
|
80 | 80 | |
81 | 81 | if ($origin != 'learnpath') { |
82 | 82 | // So we are not in learnpath tool |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | |
155 | 155 | $max_score = $objExercise->get_max_score(); |
156 | 156 | |
157 | -Display :: display_normal_message(get_lang('Saved').'<br />',false); |
|
157 | +Display :: display_normal_message(get_lang('Saved').'<br />', false); |
|
158 | 158 | |
159 | 159 | // Display and save questions |
160 | 160 | ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } else { |
185 | 185 | $lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null; |
186 | 186 | $url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type; |
187 | - $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"'; |
|
187 | + $href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"'; |
|
188 | 188 | |
189 | 189 | if (api_is_allowed_to_session_edit()) { |
190 | 190 | Session::erase('objExercise'); |