chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - flint fixes

Browse Source
pull/2588/merge
Julio Montoya 7 years ago
parent dcd9996f66
commit d7c8554ed5
15 changed files with 30 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      main/exercise/Draggable.php
  2. 12
      main/exercise/MatchingDraggable.php
  3. 2
      main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
  4. 2
      main/exercise/UniqueAnswerImage.php
  5. 2
      main/exercise/calculated_answer.class.php
  6. 2
      main/exercise/export/scorm/ScormSection.php
  7. 4
      main/exercise/fill_blanks.class.php
  8. 2
      main/exercise/global_multiple_answer.class.php
  9. 12
      main/exercise/matching.class.php
  10. 2
      main/exercise/multiple_answer.class.php
  11. 2
      main/exercise/multiple_answer_combination.class.php
  12. 2
      main/exercise/multiple_answer_true_false.class.php
  13. 2
      main/exercise/unique_answer.class.php
  14. 4
      main/exercise/unique_answer_no_option.class.php
  15. 2
      main/lp/aicc.class.php

8
main/exercise/Draggable.php
Unescape View File

@ -79,7 +79,7 @@ class Draggable extends Question
$defaults['orientation'] = 'h';
}
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$matches[$i] = $i;
}
@ -111,7 +111,7 @@ class Draggable extends Question
echo Display::return_message(get_lang('YouHaveToCreateAtLeastOneAnswer'), 'normal');
}
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$renderer = &$form->defaultRenderer();
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
@ -182,13 +182,13 @@ class Draggable extends Question
$position = 0;
$objAnswer = new Answer($this->id);
// Insert the options
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$position++;
$objAnswer->createAnswer($position, 0, '', 0, $position);
}
// Insert the answers
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$position++;
$answer = $form->getSubmitValue('answer['.$i.']');
$matches = $form->getSubmitValue('matches['.$i.']');

12
main/exercise/MatchingDraggable.php
Unescape View File

@ -81,12 +81,12 @@ class MatchingDraggable extends Question
}
if (empty($matches)) {
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
// fill the array with A, B, C.....
$matches[$i] = chr(64 + $i);
}
} else {
for ($i = $counter; $i <= $nb_options; ++$i) {
for ($i = $counter; $i <= $nb_options; $i++) {
// fill the array with A, B, C.....
$matches[$i] = chr(64 + $i);
}
@ -121,7 +121,7 @@ class MatchingDraggable extends Question
'Height' => '125',
];
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$renderer = &$form->defaultRenderer();
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
@ -174,7 +174,7 @@ class MatchingDraggable extends Question
echo Display::return_message(get_lang('YouHaveToCreateAtLeastOneAnswer'), 'normal');
}
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
$renderer = &$form->defaultRenderer();
$renderer->setElementTemplate(
@ -232,14 +232,14 @@ class MatchingDraggable extends Question
$objAnswer = new Answer($this->id);
// Insert the options
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
$position++;
$option = $form->getSubmitValue("option[$i]");
$objAnswer->createAnswer($option, 0, '', 0, $position);
}
// Insert the answers
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$position++;
$answer = $form->getSubmitValue("answer[$i]");
$matches = $form->getSubmitValue("matches[$i]");

2
main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
Unescape View File

@ -104,7 +104,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
// Can be more options
$optionData = Question::readQuestionOption($this->id, $courseId);
for ($i = 1; $i <= $nbAnswers; ++$i) {
for ($i = 1; $i <= $nbAnswers; $i++) {
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
'correct['.$i.']'

2
main/exercise/UniqueAnswerImage.php
Unescape View File

@ -122,7 +122,7 @@ class UniqueAnswerImage extends UniqueAnswer
echo Display::return_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
for ($i = 1; $i <= $numberAnswers; ++$i) {
for ($i = 1; $i <= $numberAnswers; $i++) {
$form->addHtml('<tr>');
if (isset($answer) && is_object($answer)) {
if ($answer->correct[$i]) {

2
main/exercise/calculated_answer.class.php
Unescape View File

@ -209,7 +209,7 @@ class CalculatedAnswer extends Question
$auxFormula = $formula;
$nb = preg_match_all('/\[[^\]]*\]/', $auxAnswer, $blanks);
if ($nb > 0) {
for ($i = 0; $i < $nb; ++$i) {
for ($i = 0; $i < $nb; $i++) {
$blankItem = $blanks[0][$i];
// take random float values when one or both edge values have a decimal point

2
main/exercise/export/scorm/ScormSection.php
Unescape View File

@ -215,7 +215,7 @@ class ScormSection
list($jstmp, $htmltmp) = ScormQuestion::export_question($q, false, $js_id);
$js .= $jstmp."\n";
$html .= $htmltmp."\n";
++$js_id;
$js_id++;
}
return [$js, $html];

4
main/exercise/fill_blanks.class.php
Unescape View File

@ -436,7 +436,7 @@ class FillBlanks extends Question
if ($nb > 0) {
$answer .= '::';
// weighting
for ($i = 0; $i < $nb; ++$i) {
for ($i = 0; $i < $nb; $i++) {
// enter the weighting of word $i
$answer .= $form->getSubmitValue('weighting['.$i.']');
// not the last word, add ","
@ -449,7 +449,7 @@ class FillBlanks extends Question
// input width
$answer .= ":";
for ($i = 0; $i < $nb; ++$i) {
for ($i = 0; $i < $nb; $i++) {
// enter the width of input for word $i
$answer .= $form->getSubmitValue('sizeofinput['.$i.']');
// not the last word, add ","

2
main/exercise/global_multiple_answer.class.php
Unescape View File

@ -78,7 +78,7 @@ class GlobalMultipleAnswer extends Question
$scoreG = "0"; //Global
/* boucle pour sauvegarder les donn<EFBFBD>es dans le tableau defaults */
for ($i = 1; $i <= $nb_answers; ++$i) {
for ($i = 1; $i <= $nb_answers; $i++) {
/* si la reponse est de type objet */
if (is_object($answer)) {
$defaults['answer['.$i.']'] = $answer->answer[$i];

12
main/exercise/matching.class.php
Unescape View File

@ -88,12 +88,12 @@ class Matching extends Question
}
if (empty($matches)) {
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
// fill the array with A, B, C.....
$matches[$i] = chr(64 + $i);
}
} else {
for ($i = $counter; $i <= $nb_options; ++$i) {
for ($i = $counter; $i <= $nb_options; $i++) {
// fill the array with A, B, C.....
$matches[$i] = chr(64 + $i);
}
@ -130,7 +130,7 @@ class Matching extends Question
'Height' => '125',
];
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$renderer = &$form->defaultRenderer();
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
@ -193,7 +193,7 @@ class Matching extends Question
);
}
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
$renderer = &$form->defaultRenderer();
$renderer->setElementTemplate(
'<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->{element}</td>',
@ -251,14 +251,14 @@ class Matching extends Question
$objAnswer = new Answer($this->id);
// Insert the options
for ($i = 1; $i <= $nb_options; ++$i) {
for ($i = 1; $i <= $nb_options; $i++) {
$position++;
$option = $form->getSubmitValue('option['.$i.']');
$objAnswer->createAnswer($option, 0, '', 0, $position);
}
// Insert the answers
for ($i = 1; $i <= $nb_matches; ++$i) {
for ($i = 1; $i <= $nb_matches; $i++) {
$position++;
$answer = $form->getSubmitValue('answer['.$i.']');
$matches = $form->getSubmitValue('matches['.$i.']');

2
main/exercise/multiple_answer.class.php
Unescape View File

@ -80,7 +80,7 @@ class MultipleAnswer extends Question
echo Display::return_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
for ($i = 1; $i <= $nb_answers; ++$i) {
for ($i = 1; $i <= $nb_answers; $i++) {
$form->addHtml('<tr>');
if (is_object($answer)) {
$defaults['answer['.$i.']'] = $answer->answer[$i];

2
main/exercise/multiple_answer_combination.class.php
Unescape View File

@ -72,7 +72,7 @@ class MultipleAnswerCombination extends Question
echo Display::return_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
for ($i = 1; $i <= $nb_answers; ++$i) {
for ($i = 1; $i <= $nb_answers; $i++) {
$form->addHtml('<tr>');
if (is_object($answer)) {

2
main/exercise/multiple_answer_true_false.class.php
Unescape View File

@ -83,7 +83,7 @@ class MultipleAnswerTrueFalse extends Question
// Can be more options
$optionData = Question::readQuestionOption($this->id, $course_id);
for ($i = 1; $i <= $nb_answers; ++$i) {
for ($i = 1; $i <= $nb_answers; $i++) {
$form->addHtml('<tr>');
$renderer->setElementTemplate(

2
main/exercise/unique_answer.class.php
Unescape View File

@ -130,7 +130,7 @@ class UniqueAnswer extends Question
);
}
for ($i = 1; $i <= $nb_answers; ++$i) {
for ($i = 1; $i <= $nb_answers; $i++) {
$form->addHtml('<tr>');
if (isset($answer) && is_object($answer)) {
if (isset($answer->correct[$i]) && $answer->correct[$i]) {

4
main/exercise/unique_answer_no_option.class.php
Unescape View File

@ -105,14 +105,14 @@ class UniqueAnswerNoOption extends Question
$nb_answers--;
}
}
for ($k = 1; $k <= $nb_answers; ++$k) {
for ($k = 1; $k <= $nb_answers; $k++) {
if ($answer->position[$k] != '666') {
$new_list[$count] = $count;
$count++;
}
}
} else {
for ($k = 1; $k <= $nb_answers; ++$k) {
for ($k = 1; $k <= $nb_answers; $k++) {
$new_list[$k] = $k;
}
}

2
main/lp/aicc.class.php
Unescape View File

@ -1065,7 +1065,7 @@ class aicc extends learnpath
case $enclosure:
if ($enclosed && $data[$i + 1] == $enclosure) {
$fldval .= $chr;
++$i; // Skip the next character.
$i++; // Skip the next character.
} else {
$enclosed = !$enclosed;
}

Write Preview
Loading…
Cancel
Save