From 64859a52b35613f442a10d2d2837f8a32aeba255 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 28 Aug 2012 11:57:54 +0200 Subject: [PATCH] Avoiding PHP warnings --- main/exercice/exercise.class.php | 56 ++++++++++++++++---------------- main/exercice/matching.class.php | 32 +++++++++--------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index d84e0a3d95..d87d758ce6 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -894,31 +894,31 @@ class Exercise { if ($this->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_DIRECT ) { // feedback type $radios_feedback = array(); - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); if (api_get_setting('enable_quiz_scenario') == 'true') { //Can't convert a question from one feedback to another if there is more than 1 question already added if ($this->selectNbrQuestions() == 0) { - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'),'1',array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'),'1',array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()')); } } - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2')); $form->addGroup($radios_feedback, null, get_lang('FeedbackType'), ''); //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"'); // test type $radios = array(); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); $form->addGroup($radios, null, get_lang('QuestionsPerPage'), ''); $radios_results_disabled = array(); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), ''); } else { @@ -927,37 +927,37 @@ class Exercise { // feedback type $radios_feedback = array(); - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); if (api_get_setting('enable_quiz_scenario') == 'true') { - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()')); } - $radios_feedback[] = FormValidator :: createElement ('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2')); + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2')); $form->addGroup($radios_feedback, null, get_lang('FeedbackType')); //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"'); // test type $radios = array(); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1'); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2'); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1'); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2'); $form->addGroup($radios, null, get_lang('ExerciseType')); $radios_results_disabled = array(); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),''); } else { //Show options freeze - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); - $radios_results_disabled[] = FormValidator :: createElement ('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),''); $result_disable_group->freeze(); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); - $radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); $type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), ''); $type_group->freeze(); @@ -978,23 +978,23 @@ class Exercise { //random answers $radios_random_answers = array(); - $radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('Yes'),'1'); - $radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('No'),'0'); + $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'),'1'); + $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'),'0'); $form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), ''); //randow by category $form->addElement('html','
 
'); $radiocat = array(); - $radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1'); - $radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2'); - $radiocat[] = FormValidator::createElement('radio', 'randomByCat', null, get_lang('No'),'0'); + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1'); + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2'); + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'),'0'); $form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), ''); $form->addElement('html','
 
'); // add the radio display the category name for student $radio_display_cat_name = array(); - $radio_display_cat_name[] = FormValidator::createElement('radio', 'display_category_name', null, get_lang('Yes'),'1'); - $radio_display_cat_name[] = FormValidator::createElement('radio', 'display_category_name', null, get_lang('No'),'0'); + $radio_display_cat_name[] = $form->createElement('radio', 'display_category_name', null, get_lang('Yes'),'1'); + $radio_display_cat_name[] = $form->createElement('radio', 'display_category_name', null, get_lang('No'),'0'); $form->addGroup($radio_display_cat_name, null, get_lang('QuestionDisplayCategoryName'), ''); //Attempts diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php index d7da25047e..902230b112 100644 --- a/main/exercice/matching.class.php +++ b/main/exercice/matching.class.php @@ -115,13 +115,13 @@ class Matching extends Question { for($i = 1 ; $i <= $nb_matches ; ++$i) { $form -> addElement ('html', ''); $group = array(); - $puce = FormValidator :: createElement ('text', null,null,'value="'.$i.'"'); + $puce = $form->createElement('text', null,null,'value="'.$i.'"'); $puce->freeze(); $group[] = $puce; - $group[] = FormValidator :: createElement ('text', 'answer['.$i.']',null, 'size="60" style="margin-left: 0em;"'); - $group[] = FormValidator :: createElement ('select', 'matches['.$i.']',null,$a_matches); - $group[] = FormValidator :: createElement ('text', 'weighting['.$i.']',null, array('class' => 'span1', 'value' => 10)); + $group[] = $form->createElement('text', 'answer['.$i.']',null, 'size="60" style="margin-left: 0em;"'); + $group[] = $form->createElement('select', 'matches['.$i.']',null,$a_matches); + $group[] = $form->createElement('text', 'weighting['.$i.']',null, array('class' => 'span1', 'value' => 10)); $form -> addGroup($group, null, null, ''); $form -> addElement ('html', ''); } @@ -130,11 +130,11 @@ class Matching extends Question { $group = array(); if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { - $group[] = FormValidator :: createElement ('submit', 'lessMatches', get_lang('DelElem'),'class="btn minus"'); - $group[] = FormValidator :: createElement ('submit', 'moreMatches', get_lang('AddElem'),'class="btn plus"'); + $group[] = $form->createElement('submit', 'lessMatches', get_lang('DelElem'),'class="btn minus"'); + $group[] = $form->createElement('submit', 'moreMatches', get_lang('AddElem'),'class="btn plus"'); } else { - $group[] = FormValidator :: createElement ('style_submit_button', 'moreMatches', get_lang('AddElem'),'class="btn plus"'); - $group[] = FormValidator :: createElement ('style_submit_button', 'lessMatches', get_lang('DelElem'),'class="btn minus"'); + $group[] = $form->createElement('style_submit_button', 'moreMatches', get_lang('AddElem'),'class="btn plus"'); + $group[] = $form->createElement('style_submit_button', 'lessMatches', get_lang('DelElem'),'class="btn minus"'); } $form -> addGroup($group); @@ -160,10 +160,10 @@ class Matching extends Question { for($i = 1 ; $i <= $nb_options ; ++$i) { $form -> addElement ('html', ''); $group = array(); - $puce = FormValidator :: createElement ('text', null,null,'value="'.chr(64+$i).'"'); + $puce = $form->createElement('text', null,null,'value="'.chr(64+$i).'"'); $puce->freeze(); $group[] = $puce; - $group[] = FormValidator :: createElement ('text', 'option['.$i.']',null, array('class' =>'span6')); + $group[] = $form->createElement('text', 'option['.$i.']',null, array('class' =>'span6')); $form -> addGroup($group, null, null, ''); $form -> addElement ('html', ''); } @@ -174,14 +174,14 @@ class Matching extends Question { if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { // setting the save button here and not in the question class.php - $group[] = FormValidator :: createElement('submit','submitQuestion',$text, 'class="'.$class.'"'); - $group[] = FormValidator :: createElement ('submit', 'lessOptions', get_lang('DelElem'),'class="minus"'); - $group[] = FormValidator :: createElement ('submit', 'moreOptions',get_lang('AddElem'),'class="plus"'); + $group[] = $form->createElement('submit','submitQuestion',$text, 'class="'.$class.'"'); + $group[] = $form->createElement('submit', 'lessOptions', get_lang('DelElem'),'class="minus"'); + $group[] = $form->createElement('submit', 'moreOptions',get_lang('AddElem'),'class="plus"'); } else { // setting the save button here and not in the question class.php - $group[] = FormValidator :: createElement ('style_submit_button', 'lessOptions', get_lang('DelElem'),'class="minus"'); - $group[] = FormValidator :: createElement ('style_submit_button', 'moreOptions',get_lang('AddElem'),' class="plus"'); - $group[] = FormValidator :: createElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"'); + $group[] = $form->createElement('style_submit_button', 'lessOptions', get_lang('DelElem'),'class="minus"'); + $group[] = $form->createElement('style_submit_button', 'moreOptions',get_lang('AddElem'),' class="plus"'); + $group[] = $form->createElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"'); } $form -> addGroup($group);