@@ -13,14 +13,14 @@ discard block |
||
13 | 13 | $nameTools=get_lang('ExerciseManagement'); |
14 | 14 | |
15 | 15 | if (isset($_SESSION['gradebook'])){ |
16 | - $gradebook= $_SESSION['gradebook']; |
|
16 | + $gradebook= $_SESSION['gradebook']; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | if (!empty($gradebook) && $gradebook=='view') { |
20 | - $interbreadcrumb[]= array ( |
|
21 | - 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
|
22 | - 'name' => get_lang('ToolGradebook') |
|
23 | - ); |
|
20 | + $interbreadcrumb[]= array ( |
|
21 | + 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
|
22 | + 'name' => get_lang('ToolGradebook') |
|
23 | + ); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | $interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises')); |
@@ -31,24 +31,24 @@ discard block |
||
31 | 31 | <?php echo "Add Feedback"; ?> |
32 | 32 | </h4> |
33 | 33 | <?php |
34 | - $id = $_REQUEST['question']; |
|
35 | - $objQuestionTmp = Question::read($id); |
|
36 | - echo "<tr><td><b>".get_lang('Question')." : </b>"; |
|
37 | - echo $objQuestionTmp->selectTitle(); |
|
38 | - echo "</td></tr>"; |
|
39 | - echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>"; |
|
40 | - $objAnswerTmp=new Answer($id); |
|
41 | - $num = $objAnswerTmp->selectNbrAnswers(); |
|
42 | - $objAnswerTmp->read(); |
|
43 | - for($i=1;$i<=$num;$i++) |
|
44 | - { |
|
45 | - echo "<tr><td width='10%'> "; |
|
46 | - $ans = $objAnswerTmp->answer[$i]; |
|
34 | + $id = $_REQUEST['question']; |
|
35 | + $objQuestionTmp = Question::read($id); |
|
36 | + echo "<tr><td><b>".get_lang('Question')." : </b>"; |
|
37 | + echo $objQuestionTmp->selectTitle(); |
|
38 | + echo "</td></tr>"; |
|
39 | + echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>"; |
|
40 | + $objAnswerTmp=new Answer($id); |
|
41 | + $num = $objAnswerTmp->selectNbrAnswers(); |
|
42 | + $objAnswerTmp->read(); |
|
43 | + for($i=1;$i<=$num;$i++) |
|
44 | + { |
|
45 | + echo "<tr><td width='10%'> "; |
|
46 | + $ans = $objAnswerTmp->answer[$i]; |
|
47 | 47 | |
48 | - $form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion); |
|
49 | - $obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST'); |
|
50 | - $renderer =& $obj_registration_form->defaultRenderer(); |
|
51 | - $renderer->setCustomElementTemplate( |
|
48 | + $form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion); |
|
49 | + $obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST'); |
|
50 | + $renderer =& $obj_registration_form->defaultRenderer(); |
|
51 | + $renderer->setCustomElementTemplate( |
|
52 | 52 | '<tr> |
53 | 53 | <td align="left" style="" valign="top" width=30%>{label} |
54 | 54 | <!-- BEGIN required --><span style="color: #ff0000">*</span><!-- END required --> |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> |
58 | 58 | </td> |
59 | 59 | </tr>'); |
60 | - $form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200')); |
|
61 | - $form->display(); |
|
62 | - echo "</td>"; |
|
63 | - }?> |
|
60 | + $form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200')); |
|
61 | + $form->display(); |
|
62 | + echo "</td>"; |
|
63 | + }?> |
|
64 | 64 | <form name="frm" action="javascript: void(0);" method="post"> |
65 | 65 | Click Ok to finish <input type="submit" value="Ok" /> |
66 | 66 | </form> |
@@ -8,23 +8,23 @@ discard block |
||
8 | 8 | * @version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $ |
9 | 9 | */ |
10 | 10 | include("../inc/global.inc.php"); |
11 | -$this_section=SECTION_COURSES; |
|
11 | +$this_section = SECTION_COURSES; |
|
12 | 12 | |
13 | -$nameTools=get_lang('ExerciseManagement'); |
|
13 | +$nameTools = get_lang('ExerciseManagement'); |
|
14 | 14 | |
15 | -if (isset($_SESSION['gradebook'])){ |
|
16 | - $gradebook= $_SESSION['gradebook']; |
|
15 | +if (isset($_SESSION['gradebook'])) { |
|
16 | + $gradebook = $_SESSION['gradebook']; |
|
17 | 17 | } |
18 | 18 | |
19 | -if (!empty($gradebook) && $gradebook=='view') { |
|
20 | - $interbreadcrumb[]= array ( |
|
19 | +if (!empty($gradebook) && $gradebook == 'view') { |
|
20 | + $interbreadcrumb[] = array( |
|
21 | 21 | 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
22 | 22 | 'name' => get_lang('ToolGradebook') |
23 | 23 | ); |
24 | 24 | } |
25 | 25 | |
26 | -$interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises')); |
|
27 | -Display::display_header($nameTools,"Exercises"); |
|
26 | +$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises')); |
|
27 | +Display::display_header($nameTools, "Exercises"); |
|
28 | 28 | ?> |
29 | 29 | <table border="0" align="center" cellpadding="2" cellspacing="2" width="100%"> |
30 | 30 | <h4> |
@@ -37,17 +37,17 @@ discard block |
||
37 | 37 | echo $objQuestionTmp->selectTitle(); |
38 | 38 | echo "</td></tr>"; |
39 | 39 | echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>"; |
40 | - $objAnswerTmp=new Answer($id); |
|
40 | + $objAnswerTmp = new Answer($id); |
|
41 | 41 | $num = $objAnswerTmp->selectNbrAnswers(); |
42 | 42 | $objAnswerTmp->read(); |
43 | - for($i=1;$i<=$num;$i++) |
|
43 | + for ($i = 1; $i <= $num; $i++) |
|
44 | 44 | { |
45 | 45 | echo "<tr><td width='10%'> "; |
46 | - $ans = $objAnswerTmp->answer[$i]; |
|
46 | + $ans = $objAnswerTmp->answer[$i]; |
|
47 | 47 | |
48 | - $form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion); |
|
48 | + $form = new FormValidator('feedbackform', 'post', api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion); |
|
49 | 49 | $obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST'); |
50 | - $renderer =& $obj_registration_form->defaultRenderer(); |
|
50 | + $renderer = & $obj_registration_form->defaultRenderer(); |
|
51 | 51 | $renderer->setCustomElementTemplate( |
52 | 52 | '<tr> |
53 | 53 | <td align="left" style="" valign="top" width=30%>{label} |
@@ -40,22 +40,22 @@ discard block |
||
40 | 40 | |
41 | 41 | if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { |
42 | 42 | //Scenario |
43 | - $commentTitle = '<th>' . get_lang('Comment') . '</th>'; |
|
44 | - $feedbackTitle = '<th>' . get_lang('Scenario') . '</th>'; |
|
43 | + $commentTitle = '<th>'.get_lang('Comment').'</th>'; |
|
44 | + $feedbackTitle = '<th>'.get_lang('Scenario').'</th>'; |
|
45 | 45 | } else { |
46 | - $commentTitle = '<th >' . get_lang('Comment') . '</th>'; |
|
46 | + $commentTitle = '<th >'.get_lang('Comment').'</th>'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | $html = '<div class="alert alert-success" role="alert">'.get_lang('UniqueAnswerImagePreferredSize200x150').'</div>'; |
50 | 50 | $html .= '<table class="table table-striped table-hover"> |
51 | 51 | <thead> |
52 | 52 | <tr style="text-align: center;"> |
53 | - <th width="10">' . get_lang('Number') . '</th> |
|
54 | - <th>' . get_lang('True') . '</th> |
|
55 | - <th>' . get_lang('Answer') . '</th> |
|
56 | - ' . $commentTitle . ' |
|
57 | - ' . $feedbackTitle . ' |
|
58 | - <th width="15">' . get_lang('Weighting') . '</th> |
|
53 | + <th width="10">' . get_lang('Number').'</th> |
|
54 | + <th>' . get_lang('True').'</th> |
|
55 | + <th>' . get_lang('Answer').'</th> |
|
56 | + ' . $commentTitle.' |
|
57 | + ' . $feedbackTitle.' |
|
58 | + <th width="15">' . get_lang('Weighting').'</th> |
|
59 | 59 | </tr> |
60 | 60 | </thead> |
61 | 61 | <tbody>'; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | $question = Question::read($questionid); |
93 | - $selectQuestion[$questionid] = 'Q' . $key . ' :' . cut( |
|
93 | + $selectQuestion[$questionid] = 'Q'.$key.' :'.cut( |
|
94 | 94 | $question->selectTitle(), 20 |
95 | 95 | ); |
96 | 96 | } |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | $correct = $i; |
124 | 124 | } |
125 | 125 | |
126 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
127 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
128 | - $defaults['weighting[' . $i . ']'] = float_format( |
|
126 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
127 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
128 | + $defaults['weighting['.$i.']'] = float_format( |
|
129 | 129 | $answer->weighting[$i], 1 |
130 | 130 | ); |
131 | 131 | |
@@ -148,18 +148,18 @@ discard block |
||
148 | 148 | $urlResult = $url; |
149 | 149 | } |
150 | 150 | |
151 | - $tempScenario['url' . $i] = $urlResult; |
|
152 | - $tempScenario['try' . $i] = $tryResult; |
|
153 | - $tempScenario['lp' . $i] = $lp; |
|
154 | - $tempScenario['destination' . $i] = $listDestination; |
|
151 | + $tempScenario['url'.$i] = $urlResult; |
|
152 | + $tempScenario['try'.$i] = $tryResult; |
|
153 | + $tempScenario['lp'.$i] = $lp; |
|
154 | + $tempScenario['destination'.$i] = $listDestination; |
|
155 | 155 | } else { |
156 | 156 | $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1'); |
157 | 157 | $defaults['weighting[1]'] = 10; |
158 | 158 | $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2'); |
159 | 159 | $defaults['weighting[2]'] = 0; |
160 | 160 | |
161 | - $tempScenario['destination' . $i] = array('0'); |
|
162 | - $tempScenario['lp' . $i] = array('0'); |
|
161 | + $tempScenario['destination'.$i] = array('0'); |
|
162 | + $tempScenario['lp'.$i] = array('0'); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | $defaults['scenario'] = $tempScenario; |
@@ -172,50 +172,50 @@ discard block |
||
172 | 172 | ); |
173 | 173 | $renderer->setElementTemplate( |
174 | 174 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
175 | - 'counter[' . $i . ']' |
|
175 | + 'counter['.$i.']' |
|
176 | 176 | ); |
177 | 177 | $renderer->setElementTemplate( |
178 | 178 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
179 | - 'answer[' . $i . ']' |
|
179 | + 'answer['.$i.']' |
|
180 | 180 | ); |
181 | 181 | $renderer->setElementTemplate( |
182 | 182 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
183 | - 'comment[' . $i . ']' |
|
183 | + 'comment['.$i.']' |
|
184 | 184 | ); |
185 | 185 | $renderer->setElementTemplate( |
186 | 186 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
187 | - 'weighting[' . $i . ']' |
|
187 | + 'weighting['.$i.']' |
|
188 | 188 | ); |
189 | 189 | |
190 | - $answerNumber = $form->addElement('text', 'counter[' . $i . ']', null, ' value = "' . $i . '"'); |
|
190 | + $answerNumber = $form->addElement('text', 'counter['.$i.']', null, ' value = "'.$i.'"'); |
|
191 | 191 | $answerNumber->freeze(); |
192 | 192 | |
193 | 193 | $form->addElement('radio', 'correct', null, null, $i, 'class="checkbox"'); |
194 | - $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editorConfig); |
|
194 | + $form->addHtmlEditor('answer['.$i.']', null, null, true, $editorConfig); |
|
195 | 195 | |
196 | - $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'); |
|
196 | + $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); |
|
197 | 197 | |
198 | 198 | if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { |
199 | - $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editorConfig); |
|
199 | + $form->addHtmlEditor('comment['.$i.']', null, null, false, $editorConfig); |
|
200 | 200 | // Direct feedback |
201 | 201 | //Adding extra feedback fields |
202 | 202 | $group = array(); |
203 | - $group['try' . $i] = $form->createElement('checkbox', 'try' . $i, null, get_lang('TryAgain')); |
|
204 | - $group['lp' . $i] = $form->createElement( |
|
203 | + $group['try'.$i] = $form->createElement('checkbox', 'try'.$i, null, get_lang('TryAgain')); |
|
204 | + $group['lp'.$i] = $form->createElement( |
|
205 | 205 | 'select', |
206 | - 'lp' . $i, |
|
207 | - get_lang('SeeTheory') . ': ', |
|
206 | + 'lp'.$i, |
|
207 | + get_lang('SeeTheory').': ', |
|
208 | 208 | $selectLpId |
209 | 209 | ); |
210 | - $group['destination' . $i] = $form->createElement( |
|
210 | + $group['destination'.$i] = $form->createElement( |
|
211 | 211 | 'select', |
212 | - 'destination' . $i, |
|
213 | - get_lang('GoToQuestion') . ': ', |
|
212 | + 'destination'.$i, |
|
213 | + get_lang('GoToQuestion').': ', |
|
214 | 214 | $selectQuestion |
215 | 215 | ); |
216 | - $group['url' . $i] = $form->createElement( |
|
217 | - 'text', 'url' . $i, |
|
218 | - get_lang('Other') . ': ', |
|
216 | + $group['url'.$i] = $form->createElement( |
|
217 | + 'text', 'url'.$i, |
|
218 | + get_lang('Other').': ', |
|
219 | 219 | array( |
220 | 220 | 'class' => 'col-md-2', |
221 | 221 | 'placeholder' => get_lang('Other') |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | 'scenario' |
229 | 229 | ); |
230 | 230 | } else { |
231 | - $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editorConfig); |
|
231 | + $form->addHtmlEditor('comment['.$i.']', null, null, false, $editorConfig); |
|
232 | 232 | } |
233 | - $form->addText('weighting[' . $i . ']', null, null, array('class' => "col-md-1", 'value' => '0')); |
|
233 | + $form->addText('weighting['.$i.']', null, null, array('class' => "col-md-1", 'value' => '0')); |
|
234 | 234 | $form->addHtml('</tr>'); |
235 | 235 | } |
236 | 236 | |
@@ -279,19 +279,19 @@ discard block |
||
279 | 279 | $numberAnswers = $form->getSubmitValue('nb_answers'); |
280 | 280 | |
281 | 281 | for ($i = 1; $i <= $numberAnswers; $i++) { |
282 | - $answer = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('answer[' . $i . ']'))); |
|
283 | - $comment = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('comment[' . $i . ']'))); |
|
284 | - $weighting = trim($form->getSubmitValue('weighting[' . $i . ']')); |
|
282 | + $answer = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('answer['.$i.']'))); |
|
283 | + $comment = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('comment['.$i.']'))); |
|
284 | + $weighting = trim($form->getSubmitValue('weighting['.$i.']')); |
|
285 | 285 | |
286 | 286 | $scenario = $form->getSubmitValue('scenario'); |
287 | 287 | |
288 | 288 | //$listDestination = $form -> getSubmitValue('destination'.$i); |
289 | 289 | //$destinationStr = $form -> getSubmitValue('destination'.$i); |
290 | 290 | |
291 | - $try = $scenario['try' . $i]; |
|
292 | - $lp = $scenario['lp' . $i]; |
|
293 | - $destination = $scenario['destination' . $i]; |
|
294 | - $url = trim($scenario['url' . $i]); |
|
291 | + $try = $scenario['try'.$i]; |
|
292 | + $lp = $scenario['lp'.$i]; |
|
293 | + $destination = $scenario['destination'.$i]; |
|
294 | + $url = trim($scenario['url'.$i]); |
|
295 | 295 | |
296 | 296 | /* |
297 | 297 | How we are going to parse the destination value |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | } |
341 | 341 | |
342 | 342 | //1@@1;2;@@2;4;4;@@http://www.chamilo.org |
343 | - $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url; |
|
343 | + $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url; |
|
344 | 344 | |
345 | 345 | $objAnswer->createAnswer($answer, $goodAnswer, $comment, $weighting, $i, null, null, $dest); |
346 | 346 | } |
@@ -60,9 +60,9 @@ |
||
60 | 60 | $score['revised'] = false; |
61 | 61 | } |
62 | 62 | $header = parent::return_header($feedback_type, $counter, $score); |
63 | - $header .= '<table class="' . $this->question_table_class . '" > |
|
63 | + $header .= '<table class="'.$this->question_table_class.'" > |
|
64 | 64 | <tr> |
65 | - <th>' . get_lang("Answer") . '</th> |
|
65 | + <th>' . get_lang("Answer").'</th> |
|
66 | 66 | </tr>'; |
67 | 67 | |
68 | 68 | return $header; |
@@ -14,19 +14,19 @@ discard block |
||
14 | 14 | $hotspot_lang_file = api_get_path(SYS_LANG_PATH); |
15 | 15 | |
16 | 16 | if(isset($_GET['lang'])) { |
17 | - //$search = array('../','\\0','\\'); |
|
18 | - $lang = urldecode($_GET['lang']); |
|
19 | - if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
|
20 | - //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
|
21 | - if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
22 | - $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
23 | - else |
|
24 | - $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
25 | - } else { |
|
26 | - $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
27 | - } |
|
17 | + //$search = array('../','\\0','\\'); |
|
18 | + $lang = urldecode($_GET['lang']); |
|
19 | + if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
|
20 | + //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
|
21 | + if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
22 | + $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
23 | + else |
|
24 | + $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
25 | + } else { |
|
26 | + $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
27 | + } |
|
28 | 28 | } else { |
29 | - $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
29 | + $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | $file = file($hotspot_lang_file); |
@@ -35,23 +35,23 @@ discard block |
||
35 | 35 | |
36 | 36 | foreach($file as $value) |
37 | 37 | { |
38 | - $explode = explode('=', $value); |
|
38 | + $explode = explode('=', $value); |
|
39 | 39 | |
40 | - if(count($explode) > 1) |
|
41 | - { |
|
42 | - $explode[0] = trim($explode[0]); |
|
43 | - $explode[0] = '&' . substr($explode[0], 1, strlen($explode[0])); |
|
40 | + if(count($explode) > 1) |
|
41 | + { |
|
42 | + $explode[0] = trim($explode[0]); |
|
43 | + $explode[0] = '&' . substr($explode[0], 1, strlen($explode[0])); |
|
44 | 44 | |
45 | - $explode[1] = trim($explode[1]); |
|
46 | - $explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1); |
|
47 | - $explode[1] = str_replace('"', '', $explode[1]); |
|
45 | + $explode[1] = trim($explode[1]); |
|
46 | + $explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1); |
|
47 | + $explode[1] = str_replace('"', '', $explode[1]); |
|
48 | 48 | |
49 | - $temp[] = $explode[0] . '=' . $explode[1]; |
|
50 | - } |
|
49 | + $temp[] = $explode[0] . '=' . $explode[1]; |
|
50 | + } |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | foreach($temp as $value) |
54 | 54 | { |
55 | - echo $value . ' '; |
|
55 | + echo $value . ' '; |
|
56 | 56 | } |
57 | 57 | ?> |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | |
14 | 14 | $hotspot_lang_file = api_get_path(SYS_LANG_PATH); |
15 | 15 | |
16 | -if(isset($_GET['lang'])) { |
|
16 | +if (isset($_GET['lang'])) { |
|
17 | 17 | //$search = array('../','\\0','\\'); |
18 | 18 | $lang = urldecode($_GET['lang']); |
19 | 19 | if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
20 | 20 | //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
21 | - if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
22 | - $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
21 | + if (file_exists($hotspot_lang_file.$lang.'/hotspot.inc.php')) |
|
22 | + $hotspot_lang_file .= $lang.'/hotspot.inc.php'; |
|
23 | 23 | else |
24 | 24 | $hotspot_lang_file .= 'english/hotspot.inc.php'; |
25 | 25 | } else { |
@@ -33,25 +33,25 @@ discard block |
||
33 | 33 | |
34 | 34 | $temp = array(); |
35 | 35 | |
36 | -foreach($file as $value) |
|
36 | +foreach ($file as $value) |
|
37 | 37 | { |
38 | 38 | $explode = explode('=', $value); |
39 | 39 | |
40 | - if(count($explode) > 1) |
|
40 | + if (count($explode) > 1) |
|
41 | 41 | { |
42 | 42 | $explode[0] = trim($explode[0]); |
43 | - $explode[0] = '&' . substr($explode[0], 1, strlen($explode[0])); |
|
43 | + $explode[0] = '&'.substr($explode[0], 1, strlen($explode[0])); |
|
44 | 44 | |
45 | 45 | $explode[1] = trim($explode[1]); |
46 | 46 | $explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1); |
47 | 47 | $explode[1] = str_replace('"', '', $explode[1]); |
48 | 48 | |
49 | - $temp[] = $explode[0] . '=' . $explode[1]; |
|
49 | + $temp[] = $explode[0].'='.$explode[1]; |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | -foreach($temp as $value) |
|
53 | +foreach ($temp as $value) |
|
54 | 54 | { |
55 | - echo $value . ' '; |
|
55 | + echo $value.' '; |
|
56 | 56 | } |
57 | 57 | ?> |
@@ -18,10 +18,11 @@ |
||
18 | 18 | $lang = urldecode($_GET['lang']); |
19 | 19 | if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) { |
20 | 20 | //$lang = str_replace($search,$replace,urldecode($_GET['lang'])); |
21 | - if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) |
|
22 | - $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
23 | - else |
|
24 | - $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
21 | + if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) { |
|
22 | + $hotspot_lang_file .= $lang . '/hotspot.inc.php'; |
|
23 | + } else { |
|
24 | + $hotspot_lang_file .= 'english/hotspot.inc.php'; |
|
25 | + } |
|
25 | 26 | } else { |
26 | 27 | $hotspot_lang_file .= 'english/hotspot.inc.php'; |
27 | 28 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $result = $objExercise->read($exercise_id); |
13 | 13 | |
14 | 14 | if (!$result) { |
15 | - api_not_allowed(true); |
|
15 | + api_not_allowed(true); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | $sessionId = api_get_session_id(); |
@@ -29,17 +29,17 @@ discard block |
||
29 | 29 | $data = array(); |
30 | 30 | // Question title # of students who tool it Lowest score Average Highest score Maximum score |
31 | 31 | $headers = array( |
32 | - get_lang('Question'), |
|
32 | + get_lang('Question'), |
|
33 | 33 | get_lang('QuestionType'), |
34 | 34 | get_lang('NumberStudentWhoSelectedIt'), |
35 | - get_lang('LowestScore'), |
|
36 | - get_lang('AverageScore'), |
|
37 | - get_lang('HighestScore'), |
|
38 | - get_lang('Weighting') |
|
35 | + get_lang('LowestScore'), |
|
36 | + get_lang('AverageScore'), |
|
37 | + get_lang('HighestScore'), |
|
38 | + get_lang('Weighting') |
|
39 | 39 | ); |
40 | 40 | |
41 | 41 | if (!empty($question_list)) { |
42 | - foreach ($question_list as $question_id) { |
|
42 | + foreach ($question_list as $question_id) { |
|
43 | 43 | $question_obj = Question::read($question_id); |
44 | 44 | |
45 | 45 | $exercise_stats = ExerciseLib::get_student_stats_by_question( |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $data[$question_id]['average_score'] = round($exercise_stats['average'], 2); |
74 | 74 | $data[$question_id]['highest_score'] = round($exercise_stats['max'], 2); |
75 | 75 | $data[$question_id]['max_score'] = round($question_obj->weighting, 2); |
76 | - } |
|
76 | + } |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | // Format A table |
@@ -81,37 +81,37 @@ discard block |
||
81 | 81 | $row = 0; |
82 | 82 | $column = 0; |
83 | 83 | foreach ($headers as $header) { |
84 | - $table->setHeaderContents($row, $column, $header); |
|
85 | - $column++; |
|
84 | + $table->setHeaderContents($row, $column, $header); |
|
85 | + $column++; |
|
86 | 86 | } |
87 | 87 | $row++; |
88 | 88 | foreach ($data as $row_table) { |
89 | - $column = 0; |
|
90 | - foreach ($row_table as $cell) { |
|
91 | - $table->setCellContents($row, $column, $cell); |
|
92 | - $table->updateCellAttributes($row, $column, 'align="center"'); |
|
93 | - $column++; |
|
94 | - } |
|
95 | - $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); |
|
96 | - $row++; |
|
89 | + $column = 0; |
|
90 | + foreach ($row_table as $cell) { |
|
91 | + $table->setCellContents($row, $column, $cell); |
|
92 | + $table->updateCellAttributes($row, $column, 'align="center"'); |
|
93 | + $column++; |
|
94 | + } |
|
95 | + $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); |
|
96 | + $row++; |
|
97 | 97 | } |
98 | 98 | $content = $table->toHtml(); |
99 | 99 | |
100 | 100 | // Format B |
101 | 101 | |
102 | 102 | $headers = array( |
103 | - get_lang('Question'), |
|
104 | - get_lang('Answer'), |
|
105 | - get_lang('Correct'), |
|
106 | - get_lang('NumberStudentWhoSelectedIt') |
|
103 | + get_lang('Question'), |
|
104 | + get_lang('Answer'), |
|
105 | + get_lang('Correct'), |
|
106 | + get_lang('NumberStudentWhoSelectedIt') |
|
107 | 107 | ); |
108 | 108 | |
109 | 109 | $data = array(); |
110 | 110 | |
111 | 111 | if (!empty($question_list)) { |
112 | 112 | $id = 0; |
113 | - foreach ($question_list as $question_id) { |
|
114 | - $question_obj = Question::read($question_id); |
|
113 | + foreach ($question_list as $question_id) { |
|
114 | + $question_obj = Question::read($question_id); |
|
115 | 115 | $exercise_stats = ExerciseLib::get_student_stats_by_question( |
116 | 116 | $question_id, |
117 | 117 | $exercise_id, |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | ); |
121 | 121 | |
122 | 122 | $answer = new Answer($question_id); |
123 | - $answer_count = $answer->selectNbrAnswers(); |
|
123 | + $answer_count = $answer->selectNbrAnswers(); |
|
124 | 124 | |
125 | 125 | for ($answer_id = 1; $answer_id <= $answer_count; $answer_id++) { |
126 | 126 | $answer_info = $answer->selectAnswer($answer_id); |
@@ -175,11 +175,11 @@ discard block |
||
175 | 175 | $correct = ''; |
176 | 176 | |
177 | 177 | for ($i = 1; $i <= $answer_count; $i++) { |
178 | - $is_correct_i = $answer->isCorrect($i); |
|
179 | - if ($is_correct_i != 0 && $is_correct_i == $answer_id) { |
|
180 | - $correct = $answer->selectAnswer($i); |
|
181 | - break; |
|
182 | - } |
|
178 | + $is_correct_i = $answer->isCorrect($i); |
|
179 | + if ($is_correct_i != 0 && $is_correct_i == $answer_id) { |
|
180 | + $correct = $answer->selectAnswer($i); |
|
181 | + break; |
|
182 | + } |
|
183 | 183 | } |
184 | 184 | $data[$id]['answer'] = $correct; |
185 | 185 | $data[$id]['correct'] = $answer_info; |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | } |
246 | 246 | $id++; |
247 | 247 | } |
248 | - } |
|
248 | + } |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | // Format A table |
@@ -253,19 +253,19 @@ discard block |
||
253 | 253 | $row = 0; |
254 | 254 | $column = 0; |
255 | 255 | foreach ($headers as $header) { |
256 | - $table->setHeaderContents($row, $column, $header); |
|
257 | - $column++; |
|
256 | + $table->setHeaderContents($row, $column, $header); |
|
257 | + $column++; |
|
258 | 258 | } |
259 | 259 | $row++; |
260 | 260 | foreach ($data as $row_table) { |
261 | - $column = 0; |
|
262 | - foreach ($row_table as $cell) { |
|
263 | - $table->setCellContents($row, $column, $cell); |
|
264 | - $table->updateCellAttributes($row, $column, 'align="center"'); |
|
265 | - $column++; |
|
266 | - } |
|
267 | - $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); |
|
268 | - $row++; |
|
261 | + $column = 0; |
|
262 | + foreach ($row_table as $cell) { |
|
263 | + $table->setCellContents($row, $column, $cell); |
|
264 | + $table->updateCellAttributes($row, $column, 'align="center"'); |
|
265 | + $column++; |
|
266 | + } |
|
267 | + $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); |
|
268 | + $row++; |
|
269 | 269 | } |
270 | 270 | $content .= $table->toHtml(); |
271 | 271 |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | $data[$question_id]['type'] = $question_obj->get_question_type_name(); |
62 | 62 | $percentange = 0; |
63 | 63 | if ($count_students) { |
64 | - $percentange = $count_users / $count_students*100; |
|
64 | + $percentange = $count_users / $count_students * 100; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $data[$question_id]['students_who_try_exercise'] = Display::bar_progress( |
68 | 68 | $percentange, |
69 | 69 | false, |
70 | - $count_users .' / '.$count_students |
|
70 | + $count_users.' / '.$count_students |
|
71 | 71 | ); |
72 | 72 | $data[$question_id]['lowest_score'] = round($exercise_stats['min'], 2); |
73 | 73 | $data[$question_id]['average_score'] = round($exercise_stats['average'], 2); |
@@ -142,23 +142,23 @@ discard block |
||
142 | 142 | } else { |
143 | 143 | $data[$id]['name'] = '-'; |
144 | 144 | } |
145 | - $data[$id]['answer'] = $answer_item; |
|
145 | + $data[$id]['answer'] = $answer_item; |
|
146 | 146 | |
147 | 147 | $answer_item = api_substr($answer_item, 1); |
148 | - $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) -1); |
|
148 | + $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) - 1); |
|
149 | 149 | |
150 | - $data[$id]['answer'] = $answer_item; |
|
150 | + $data[$id]['answer'] = $answer_item; |
|
151 | 151 | |
152 | - $data[$id]['correct'] = '-'; |
|
152 | + $data[$id]['correct'] = '-'; |
|
153 | 153 | |
154 | 154 | $count = ExerciseLib::getNumberStudentsFillBlanksAnwserCount($question_id, $exercise_id); |
155 | 155 | $count = $count[$counter]; |
156 | 156 | |
157 | 157 | $percentange = 0; |
158 | 158 | if (!empty($count_students)) { |
159 | - $percentange = $count/$count_students*100; |
|
159 | + $percentange = $count / $count_students * 100; |
|
160 | 160 | } |
161 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
161 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
162 | 162 | $id++; |
163 | 163 | $counter++; |
164 | 164 | } |
@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | ); |
195 | 195 | $percentange = 0; |
196 | 196 | if (!empty($count_students)) { |
197 | - $percentange = $count/$count_students*100; |
|
197 | + $percentange = $count / $count_students * 100; |
|
198 | 198 | } |
199 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
199 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
200 | 200 | } |
201 | 201 | break; |
202 | 202 | case HOT_SPOT: |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | ); |
218 | 218 | $percentange = 0; |
219 | 219 | if (!empty($count_students)) { |
220 | - $percentange = $count/$count_students*100; |
|
220 | + $percentange = $count / $count_students * 100; |
|
221 | 221 | } |
222 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
222 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
223 | 223 | break; |
224 | 224 | default: |
225 | 225 | if ($answer_id == 1) { |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | ); |
240 | 240 | $percentange = 0; |
241 | 241 | if (!empty($count_students)) { |
242 | - $percentange = $count/$count_students*100; |
|
242 | + $percentange = $count / $count_students * 100; |
|
243 | 243 | } |
244 | - $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students); |
|
244 | + $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students); |
|
245 | 245 | } |
246 | 246 | $id++; |
247 | 247 | } |
@@ -273,8 +273,8 @@ discard block |
||
273 | 273 | $interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name); |
274 | 274 | |
275 | 275 | $tpl = new Template(get_lang('ReportByQuestion')); |
276 | -$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' . |
|
277 | - Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
276 | +$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'. |
|
277 | + Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
278 | 278 | $actions = Display::div($actions, array('class'=> 'actions')); |
279 | 279 | $content = $actions.$content; |
280 | 280 | $tpl->assign('content', $content); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | // the breadcrumbs |
24 | -$interbreadcrumb[]= array ( |
|
24 | +$interbreadcrumb[] = array( |
|
25 | 25 | "url" => api_get_path(WEB_CODE_PATH)."exercice/exercise.php?".api_get_cidreq(), |
26 | 26 | "name" => get_lang('Exercises') |
27 | 27 | ); |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
244 | - * abstract function which creates the form to create / edit the answers of the question |
|
245 | - * @param FormValidator $form |
|
246 | - */ |
|
244 | + * abstract function which creates the form to create / edit the answers of the question |
|
245 | + * @param FormValidator $form |
|
246 | + */ |
|
247 | 247 | public function processAnswersCreation($form) |
248 | 248 | { |
249 | - $questionWeighting = $nbrGoodAnswers = 0; |
|
250 | - $objAnswer = new Answer($this->id); |
|
249 | + $questionWeighting = $nbrGoodAnswers = 0; |
|
250 | + $objAnswer = new Answer($this->id); |
|
251 | 251 | $nb_answers = $form->getSubmitValue('nb_answers'); |
252 | 252 | //$options_count = $form->getSubmitValue('options_count'); |
253 | 253 | $course_id = api_get_course_int_id(); |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | $course_id, |
270 | 270 | $i |
271 | 271 | ); |
272 | - $correct[$i] = $last_id; |
|
272 | + $correct[$i] = $last_id; |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | |
281 | 281 | $sorted_by_position = array(); |
282 | 282 | foreach ($new_options as $item) { |
283 | - $sorted_by_position[$item['position']] = $item; |
|
283 | + $sorted_by_position[$item['position']] = $item; |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | /* Saving quiz_question.extra values that has the correct scores of |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | } |
294 | 294 | $this->setExtra(implode(':', $extra_values)); |
295 | 295 | |
296 | - for ($i = 1; $i <= $nb_answers; $i++) { |
|
296 | + for ($i = 1; $i <= $nb_answers; $i++) { |
|
297 | 297 | $answer = trim($form->getSubmitValue('answer['.$i.']')); |
298 | 298 | $comment = trim($form->getSubmitValue('comment['.$i.']')); |
299 | 299 | $goodAnswer = trim($form->getSubmitValue('correct['.$i.']')); |
@@ -302,18 +302,18 @@ discard block |
||
302 | 302 | // change the default values from the form 1 and 2 by the correct "option id" registered |
303 | 303 | $goodAnswer = $sorted_by_position[$goodAnswer]['id']; |
304 | 304 | } |
305 | - $questionWeighting += $extra_values[0]; //By default 0 has the correct answers |
|
305 | + $questionWeighting += $extra_values[0]; //By default 0 has the correct answers |
|
306 | 306 | |
307 | - $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i); |
|
307 | + $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i); |
|
308 | 308 | } |
309 | 309 | |
310 | - // saves the answers into the data base |
|
310 | + // saves the answers into the data base |
|
311 | 311 | $objAnswer->save(); |
312 | 312 | |
313 | 313 | // sets the total weighting of the question |
314 | 314 | $this->updateWeighting($questionWeighting); |
315 | 315 | $this->save(); |
316 | - } |
|
316 | + } |
|
317 | 317 | |
318 | 318 | /** |
319 | 319 | * @param int $feedback_type |
@@ -324,17 +324,17 @@ discard block |
||
324 | 324 | function return_header($feedback_type = null, $counter = null, $score = null) |
325 | 325 | { |
326 | 326 | $header = parent::return_header($feedback_type, $counter, $score); |
327 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
327 | + $header .= '<table class="'.$this->question_table_class .'"> |
|
328 | 328 | <tr> |
329 | 329 | <th>'.get_lang("Choice").'</th> |
330 | 330 | <th>'. get_lang("ExpectedChoice").'</th> |
331 | 331 | <th>'. get_lang("Answer").'</th>'; |
332 | - if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { |
|
333 | - $header .= '<th>'.get_lang("Comment").'</th>'; |
|
334 | - } else { |
|
335 | - $header .= '<th> </th>'; |
|
336 | - } |
|
332 | + if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { |
|
333 | + $header .= '<th>'.get_lang("Comment").'</th>'; |
|
334 | + } else { |
|
335 | + $header .= '<th> </th>'; |
|
336 | + } |
|
337 | 337 | $header .= '</tr>'; |
338 | 338 | return $header; |
339 | - } |
|
339 | + } |
|
340 | 340 | } |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | $html = '<table class="table table-striped table-hover">'; |
45 | 45 | $html .= '<thead>'; |
46 | 46 | $html .= '<tr>'; |
47 | - $html .= '<th>' . get_lang('Number') . '</th>'; |
|
48 | - $html .= '<th>' . get_lang('True') . '</th>'; |
|
49 | - $html .= '<th>' . get_lang('False') . '</th>'; |
|
50 | - $html .= '<th>' . get_lang('Answer') . '</th>'; |
|
47 | + $html .= '<th>'.get_lang('Number').'</th>'; |
|
48 | + $html .= '<th>'.get_lang('True').'</th>'; |
|
49 | + $html .= '<th>'.get_lang('False').'</th>'; |
|
50 | + $html .= '<th>'.get_lang('Answer').'</th>'; |
|
51 | 51 | |
52 | 52 | // show column comment when feedback is enable |
53 | 53 | if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { |
54 | - $html .= '<th>' . get_lang('Comment') . '</th>'; |
|
54 | + $html .= '<th>'.get_lang('Comment').'</th>'; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $html .= '</tr>'; |
@@ -89,19 +89,19 @@ discard block |
||
89 | 89 | |
90 | 90 | $renderer->setElementTemplate( |
91 | 91 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
92 | - 'correct[' . $i . ']' |
|
92 | + 'correct['.$i.']' |
|
93 | 93 | ); |
94 | 94 | $renderer->setElementTemplate( |
95 | 95 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
96 | - 'counter[' . $i . ']' |
|
96 | + 'counter['.$i.']' |
|
97 | 97 | ); |
98 | 98 | $renderer->setElementTemplate( |
99 | 99 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
100 | - 'answer[' . $i . ']' |
|
100 | + 'answer['.$i.']' |
|
101 | 101 | ); |
102 | 102 | $renderer->setElementTemplate( |
103 | 103 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
104 | - 'comment[' . $i . ']' |
|
104 | + 'comment['.$i.']' |
|
105 | 105 | ); |
106 | 106 | |
107 | 107 | $answer_number = $form->addElement( |
@@ -114,15 +114,15 @@ discard block |
||
114 | 114 | $answer_number->freeze(); |
115 | 115 | |
116 | 116 | if (is_object($answer)) { |
117 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
118 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
117 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
118 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
119 | 119 | $correct = $answer->correct[$i]; |
120 | - $defaults['correct[' . $i . ']'] = $correct; |
|
120 | + $defaults['correct['.$i.']'] = $correct; |
|
121 | 121 | |
122 | 122 | $j = 1; |
123 | 123 | if (!empty($optionData)) { |
124 | 124 | foreach ($optionData as $id => $data) { |
125 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, $id); |
|
125 | + $form->addElement('radio', 'correct['.$i.']', null, null, $id); |
|
126 | 126 | $j++; |
127 | 127 | if ($j == 3) { |
128 | 128 | break; |
@@ -130,15 +130,15 @@ discard block |
||
130 | 130 | } |
131 | 131 | } |
132 | 132 | } else { |
133 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, 1); |
|
134 | - $form->addElement('radio', 'correct[' . $i . ']', null, null, 2); |
|
133 | + $form->addElement('radio', 'correct['.$i.']', null, null, 1); |
|
134 | + $form->addElement('radio', 'correct['.$i.']', null, null, 2); |
|
135 | 135 | |
136 | - $defaults['answer[' . $i . ']'] = ''; |
|
137 | - $defaults['comment[' . $i . ']'] = ''; |
|
138 | - $defaults['correct[' . $i . ']'] = ''; |
|
136 | + $defaults['answer['.$i.']'] = ''; |
|
137 | + $defaults['comment['.$i.']'] = ''; |
|
138 | + $defaults['correct['.$i.']'] = ''; |
|
139 | 139 | } |
140 | 140 | |
141 | - $boxes_names[] = 'correct[' . $i . ']'; |
|
141 | + $boxes_names[] = 'correct['.$i.']'; |
|
142 | 142 | |
143 | 143 | $form->addHtmlEditor( |
144 | 144 | "answer[$i]", |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { |
153 | 153 | $form->addElement( |
154 | 154 | 'html_editor', |
155 | - 'comment[' . $i . ']', |
|
155 | + 'comment['.$i.']', |
|
156 | 156 | null, |
157 | 157 | array(), |
158 | 158 | array( |
@@ -170,22 +170,22 @@ discard block |
||
170 | 170 | |
171 | 171 | $correctInputTemplate = '<div class="form-group">'; |
172 | 172 | $correctInputTemplate .= '<label class="col-sm-2 control-label">'; |
173 | - $correctInputTemplate .= '<span class="form_required">*</span>' . get_lang('Score'); |
|
173 | + $correctInputTemplate .= '<span class="form_required">*</span>'.get_lang('Score'); |
|
174 | 174 | $correctInputTemplate .= '</label>'; |
175 | 175 | $correctInputTemplate .= '<div class="col-sm-8">'; |
176 | 176 | $correctInputTemplate .= '<table>'; |
177 | 177 | $correctInputTemplate .= '<tr>'; |
178 | 178 | $correctInputTemplate .= '<td>'; |
179 | - $correctInputTemplate .= get_lang('Correct') . '{element}'; |
|
179 | + $correctInputTemplate .= get_lang('Correct').'{element}'; |
|
180 | 180 | $correctInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
181 | 181 | $correctInputTemplate .= '</td>'; |
182 | 182 | |
183 | 183 | $wrongInputTemplate = '<td>'; |
184 | - $wrongInputTemplate .= get_lang('Wrong') . '{element}'; |
|
184 | + $wrongInputTemplate .= get_lang('Wrong').'{element}'; |
|
185 | 185 | $wrongInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
186 | 186 | $wrongInputTemplate .= '</td>'; |
187 | 187 | |
188 | - $doubtScoreInputTemplate = '<td>' . get_lang('DoubtScore') . '<br>{element}'; |
|
188 | + $doubtScoreInputTemplate = '<td>'.get_lang('DoubtScore').'<br>{element}'; |
|
189 | 189 | $doubtScoreInputTemplate .= '<!-- BEGIN error --><span class="form_error">{error}</span><!-- END error -->'; |
190 | 190 | $doubtScoreInputTemplate .= '</td>'; |
191 | 191 | $doubtScoreInputTemplate .= '</tr>'; |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | if (!empty($scores)) { |
216 | 216 | for ($i = 1; $i <= 3; $i++) { |
217 | - $defaults['option[' . $i . ']'] = $scores[$i - 1]; |
|
217 | + $defaults['option['.$i.']'] = $scores[$i - 1]; |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | } |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | Question::updateQuestionOption($id, $optionData, $course_id); |
263 | 263 | } |
264 | 264 | } else { |
265 | - for ($i=1 ; $i <= 3 ; $i++) { |
|
265 | + for ($i = 1; $i <= 3; $i++) { |
|
266 | 266 | $last_id = Question::saveQuestionOption( |
267 | 267 | $this->id, |
268 | 268 | $this->options[$i], |
@@ -287,9 +287,9 @@ discard block |
||
287 | 287 | the true, false, doubt options registered in this format |
288 | 288 | XX:YY:ZZZ where XX is a float score value.*/ |
289 | 289 | $extra_values = array(); |
290 | - for ($i=1 ; $i <= 3 ; $i++) { |
|
290 | + for ($i = 1; $i <= 3; $i++) { |
|
291 | 291 | $score = trim($form -> getSubmitValue('option['.$i.']')); |
292 | - $extra_values[]= $score; |
|
292 | + $extra_values[] = $score; |
|
293 | 293 | } |
294 | 294 | $this->setExtra(implode(':', $extra_values)); |
295 | 295 | |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | $questionWeighting += $extra_values[0]; //By default 0 has the correct answers |
306 | 306 | |
307 | - $objAnswer->createAnswer($answer, $goodAnswer, $comment,'',$i); |
|
307 | + $objAnswer->createAnswer($answer, $goodAnswer, $comment, '', $i); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | // saves the answers into the data base |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | function return_header($feedback_type = null, $counter = null, $score = null) |
325 | 325 | { |
326 | 326 | $header = parent::return_header($feedback_type, $counter, $score); |
327 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
327 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
328 | 328 | <tr> |
329 | 329 | <th>'.get_lang("Choice").'</th> |
330 | 330 | <th>'. get_lang("ExpectedChoice").'</th> |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * @param null $feedback_type |
59 | 59 | * @param null $counter |
60 | 60 | * @param null $score |
61 | - * @return null|string |
|
61 | + * @return string |
|
62 | 62 | */ |
63 | 63 | function return_header($feedback_type = null, $counter = null, $score = null) |
64 | 64 | { |
@@ -15,24 +15,24 @@ |
||
15 | 15 | $answerId = intval($_GET['answerId']); |
16 | 16 | |
17 | 17 | if ($_GET['type'] == "square" || $_GET['type'] == "circle") { |
18 | - $hotspot_type = $_GET['type']; |
|
19 | - $hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height']; |
|
18 | + $hotspot_type = $_GET['type']; |
|
19 | + $hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height']; |
|
20 | 20 | } |
21 | 21 | if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") { |
22 | - $hotspot_type = $_GET['type']; |
|
23 | - $tmp_coord = explode(",",$_GET['co']); |
|
24 | - $i = 0; |
|
25 | - $hotspot_coordinates = ""; |
|
26 | - foreach ($tmp_coord as $coord) { |
|
27 | - if ($i%2 == 0) { |
|
28 | - $delimiter = ";"; |
|
29 | - } else { |
|
30 | - $delimiter = "|"; |
|
31 | - } |
|
32 | - $hotspot_coordinates .= $coord.$delimiter; |
|
33 | - $i++; |
|
34 | - } |
|
35 | - $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2); |
|
22 | + $hotspot_type = $_GET['type']; |
|
23 | + $tmp_coord = explode(",",$_GET['co']); |
|
24 | + $i = 0; |
|
25 | + $hotspot_coordinates = ""; |
|
26 | + foreach ($tmp_coord as $coord) { |
|
27 | + if ($i%2 == 0) { |
|
28 | + $delimiter = ";"; |
|
29 | + } else { |
|
30 | + $delimiter = "|"; |
|
31 | + } |
|
32 | + $hotspot_coordinates .= $coord.$delimiter; |
|
33 | + $i++; |
|
34 | + } |
|
35 | + $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2); |
|
36 | 36 | } |
37 | 37 | $course_id = api_get_course_int_id(); |
38 | 38 | $sql = "UPDATE $TBL_ANSWER SET |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER); |
14 | 14 | $questionId = intval($_GET['questionId']); |
15 | -$answerId = intval($_GET['answerId']); |
|
15 | +$answerId = intval($_GET['answerId']); |
|
16 | 16 | |
17 | 17 | if ($_GET['type'] == "square" || $_GET['type'] == "circle") { |
18 | 18 | $hotspot_type = $_GET['type']; |
@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | } |
21 | 21 | if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") { |
22 | 22 | $hotspot_type = $_GET['type']; |
23 | - $tmp_coord = explode(",",$_GET['co']); |
|
23 | + $tmp_coord = explode(",", $_GET['co']); |
|
24 | 24 | $i = 0; |
25 | 25 | $hotspot_coordinates = ""; |
26 | 26 | foreach ($tmp_coord as $coord) { |
27 | - if ($i%2 == 0) { |
|
27 | + if ($i % 2 == 0) { |
|
28 | 28 | $delimiter = ";"; |
29 | 29 | } else { |
30 | 30 | $delimiter = "|"; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $hotspot_coordinates .= $coord.$delimiter; |
33 | 33 | $i++; |
34 | 34 | } |
35 | - $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2); |
|
35 | + $hotspot_coordinates = api_substr($hotspot_coordinates, 0, -2); |
|
36 | 36 | } |
37 | 37 | $course_id = api_get_course_int_id(); |
38 | 38 | $sql = "UPDATE $TBL_ANSWER SET |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | .sortable({ |
109 | 109 | cursor: "move", // works? |
110 | 110 | update: function(event, ui) { |
111 | - var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']);?>"; |
|
111 | + var order = $(this).sortable("serialize") + "&a=update_question_order&exercise_id=<?php echo intval($_GET['exerciseId']); ?>"; |
|
112 | 112 | $.post("<?php echo $ajax_url ?>", order, function(reponse){ |
113 | 113 | $("#message").html(reponse); |
114 | 114 | }); |
@@ -141,11 +141,11 @@ discard block |
||
141 | 141 | echo "<div class='table-responsive'>"; |
142 | 142 | echo "<table class='table table-condensed'>"; |
143 | 143 | echo "<tr>"; |
144 | - echo "<th style=\"width: 50%;\">" .get_lang('Questions'). "</th>"; |
|
145 | - echo "<th style=\"width: 6%;\">" .get_lang('Type'). "</th>"; |
|
146 | - echo "<th style=\"width: 22%; text-align:center;\">" .get_lang('Category'). "</th>"; |
|
147 | - echo "<th style=\"width: 6%;\">" .get_lang('Difficulty'). "</th>"; |
|
148 | - echo "<th style=\"width: 16%; float:left;\">" .get_lang('Score'). "</th>"; |
|
144 | + echo "<th style=\"width: 50%;\">".get_lang('Questions')."</th>"; |
|
145 | + echo "<th style=\"width: 6%;\">".get_lang('Type')."</th>"; |
|
146 | + echo "<th style=\"width: 22%; text-align:center;\">".get_lang('Category')."</th>"; |
|
147 | + echo "<th style=\"width: 6%;\">".get_lang('Difficulty')."</th>"; |
|
148 | + echo "<th style=\"width: 16%; float:left;\">".get_lang('Score')."</th>"; |
|
149 | 149 | echo "</tr>"; |
150 | 150 | echo "</table>"; |
151 | 151 | echo "</div>"; |
@@ -172,15 +172,14 @@ discard block |
||
172 | 172 | $question_class = get_class($objQuestionTmp); |
173 | 173 | |
174 | 174 | $clone_link = '<a href="'.api_get_self().'?'.api_get_cidreq().'&clone_question='.$id.'">'. |
175 | - Display::return_icon('cd.gif',get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>'; |
|
175 | + Display::return_icon('cd.gif', get_lang('Copy'), array(), ICON_SIZE_SMALL).'</a>'; |
|
176 | 176 | $edit_link = ($objQuestionTmp->type == CALCULATED_ANSWER && $objQuestionTmp->isAnswered()) ? |
177 | 177 | '<a>'.Display::return_icon( |
178 | 178 | 'edit_na.png', |
179 | 179 | get_lang('QuestionEditionNotAvailableBecauseItIsAlreadyAnsweredHoweverYouCanCopyItAndModifyTheCopy'), |
180 | 180 | array(), |
181 | 181 | ICON_SIZE_SMALL |
182 | - ).'</a>' : |
|
183 | - '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='. |
|
182 | + ).'</a>' : '<a href="'.api_get_self().'?'.api_get_cidreq().'&type='. |
|
184 | 183 | $objQuestionTmp->selectType().'&myid=1&editQuestion='.$id.'">'. |
185 | 184 | Display::return_icon( |
186 | 185 | 'edit.png', |
@@ -190,16 +189,16 @@ discard block |
||
190 | 189 | ).'</a>'; |
191 | 190 | $delete_link = null; |
192 | 191 | if ($objExercise->edit_exercise_in_lp == true) { |
193 | - $delete_link = '<a id="delete_'.$id.'" class="opener" href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png',get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>'; |
|
192 | + $delete_link = '<a id="delete_'.$id.'" class="opener" href="'.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId.'&deleteQuestion='.$id.'" >'.Display::return_icon('delete.png', get_lang('RemoveFromTest'), array(), ICON_SIZE_SMALL).'</a>'; |
|
194 | 193 | } |
195 | 194 | |
196 | - $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
197 | - $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
195 | + $edit_link = Display::tag('div', $edit_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
196 | + $clone_link = Display::tag('div', $clone_link, array('style'=>'float:left; padding:0px; margin:0px')); |
|
198 | 197 | $delete_link = Display::tag('div', $delete_link, array('style'=>'float:left; padding:0px; margin:0px')); |
199 | 198 | $actions = Display::tag( |
200 | 199 | 'div', |
201 | 200 | $edit_link.$clone_link.$delete_link, |
202 | - array('class'=>'edition','style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;') |
|
201 | + array('class'=>'edition', 'style'=>'width:100px; right:10px; margin-top: 8px; position: absolute; top: 10%;') |
|
203 | 202 | ); |
204 | 203 | |
205 | 204 | $title = Security::remove_XSS($objQuestionTmp->selectTitle()); |
@@ -248,7 +247,7 @@ discard block |
||
248 | 247 | echo $actions; |
249 | 248 | echo '</div>'; |
250 | 249 | echo '<div class="question-list-description-block">'; |
251 | - echo '<p class="lead">' . get_lang($question_class) . '</p>'; |
|
250 | + echo '<p class="lead">'.get_lang($question_class).'</p>'; |
|
252 | 251 | //echo get_lang('Level').': '.$objQuestionTmp->selectLevel(); |
253 | 252 | ExerciseLib::showQuestion($id, false, null, null, false, true, false, true, $objExercise->feedback_type, true); |
254 | 253 | echo '</div>'; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | * @author Patrick Cool |
17 | 17 | * @author René Haentjens, added CSV file import (October 2004) |
18 | 18 | * @package chamilo.link |
19 | - |
|
20 | 19 | */ |
21 | 20 | |
22 | 21 | // Including libraries |