@@ -59,21 +59,21 @@ discard block |
||
59 | 59 | |
60 | 60 | if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { |
61 | 61 | //Scenario |
62 | - $comment_title = '<th width="20%">' . get_lang('Comment') . '</th>'; |
|
63 | - $feedback_title = '<th width="20%">' . get_lang('Scenario') . '</th>'; |
|
62 | + $comment_title = '<th width="20%">'.get_lang('Comment').'</th>'; |
|
63 | + $feedback_title = '<th width="20%">'.get_lang('Scenario').'</th>'; |
|
64 | 64 | } else { |
65 | - $comment_title = '<th width="40%">' . get_lang('Comment') . '</th>'; |
|
65 | + $comment_title = '<th width="40%">'.get_lang('Comment').'</th>'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $html = '<table class="table table-striped table-hover"> |
69 | 69 | <thead> |
70 | 70 | <tr style="text-align: center;"> |
71 | - <th width="5%">' . get_lang('Number') . '</th> |
|
72 | - <th width="5%"> ' . get_lang('True') . '</th> |
|
73 | - <th width="40%">' . get_lang('Answer') . '</th> |
|
74 | - ' . $comment_title . ' |
|
75 | - ' . $feedback_title . ' |
|
76 | - <th width="10%">' . get_lang('Weighting') . '</th> |
|
71 | + <th width="5%">' . get_lang('Number').'</th> |
|
72 | + <th width="5%"> ' . get_lang('True').'</th> |
|
73 | + <th width="40%">' . get_lang('Answer').'</th> |
|
74 | + ' . $comment_title.' |
|
75 | + ' . $feedback_title.' |
|
76 | + <th width="10%">' . get_lang('Weighting').'</th> |
|
77 | 77 | </tr> |
78 | 78 | </thead> |
79 | 79 | <tbody>'; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | continue; |
104 | 104 | } |
105 | 105 | $question = Question::read($questionid); |
106 | - $select_question[$questionid] = 'Q' . $key . ' :' . cut( |
|
106 | + $select_question[$questionid] = 'Q'.$key.' :'.cut( |
|
107 | 107 | $question->selectTitle(), 20 |
108 | 108 | ); |
109 | 109 | } |
@@ -134,9 +134,9 @@ discard block |
||
134 | 134 | if ($answer->correct[$i]) { |
135 | 135 | $correct = $i; |
136 | 136 | } |
137 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
138 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
139 | - $defaults['weighting[' . $i . ']'] = float_format( |
|
137 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
138 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
139 | + $defaults['weighting['.$i.']'] = float_format( |
|
140 | 140 | $answer->weighting[$i], |
141 | 141 | 1 |
142 | 142 | ); |
@@ -159,18 +159,18 @@ discard block |
||
159 | 159 | $url_result = $url; |
160 | 160 | } |
161 | 161 | |
162 | - $temp_scenario['url' . $i] = $url_result; |
|
163 | - $temp_scenario['try' . $i] = $try_result; |
|
164 | - $temp_scenario['lp' . $i] = $lp; |
|
165 | - $temp_scenario['destination' . $i] = $list_dest; |
|
162 | + $temp_scenario['url'.$i] = $url_result; |
|
163 | + $temp_scenario['try'.$i] = $try_result; |
|
164 | + $temp_scenario['lp'.$i] = $lp; |
|
165 | + $temp_scenario['destination'.$i] = $list_dest; |
|
166 | 166 | } else { |
167 | 167 | $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1'); |
168 | 168 | $defaults['weighting[1]'] = 10; |
169 | 169 | $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2'); |
170 | 170 | $defaults['weighting[2]'] = 0; |
171 | 171 | |
172 | - $temp_scenario['destination' . $i] = array('0'); |
|
173 | - $temp_scenario['lp' . $i] = array('0'); |
|
172 | + $temp_scenario['destination'.$i] = array('0'); |
|
173 | + $temp_scenario['lp'.$i] = array('0'); |
|
174 | 174 | } |
175 | 175 | $defaults['scenario'] = $temp_scenario; |
176 | 176 | |
@@ -182,62 +182,62 @@ discard block |
||
182 | 182 | ); |
183 | 183 | $renderer->setElementTemplate( |
184 | 184 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
185 | - 'counter[' . $i . ']' |
|
185 | + 'counter['.$i.']' |
|
186 | 186 | ); |
187 | 187 | $renderer->setElementTemplate( |
188 | 188 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
189 | - 'answer[' . $i . ']' |
|
189 | + 'answer['.$i.']' |
|
190 | 190 | ); |
191 | 191 | $renderer->setElementTemplate( |
192 | 192 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
193 | - 'comment[' . $i . ']' |
|
193 | + 'comment['.$i.']' |
|
194 | 194 | ); |
195 | 195 | $renderer->setElementTemplate( |
196 | 196 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
197 | - 'weighting[' . $i . ']' |
|
197 | + 'weighting['.$i.']' |
|
198 | 198 | ); |
199 | 199 | |
200 | 200 | $answer_number = $form->addElement( |
201 | - 'text', 'counter[' . $i . ']', null, ' value = "' . $i . '"' |
|
201 | + 'text', 'counter['.$i.']', null, ' value = "'.$i.'"' |
|
202 | 202 | ); |
203 | 203 | $answer_number->freeze(); |
204 | 204 | $form->addElement( |
205 | 205 | 'radio', 'correct', null, null, $i, 'class="checkbox"' |
206 | 206 | ); |
207 | 207 | |
208 | - $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config); |
|
208 | + $form->addHtmlEditor('answer['.$i.']', null, null, true, $editor_config); |
|
209 | 209 | |
210 | 210 | $form->addRule( |
211 | - 'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required' |
|
211 | + 'answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required' |
|
212 | 212 | ); |
213 | 213 | |
214 | 214 | if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { |
215 | - $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config); |
|
215 | + $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config); |
|
216 | 216 | // Direct feedback |
217 | 217 | //Adding extra feedback fields |
218 | 218 | $group = array(); |
219 | - $group['try' . $i] = $form->createElement( |
|
219 | + $group['try'.$i] = $form->createElement( |
|
220 | 220 | 'checkbox', |
221 | - 'try' . $i, |
|
221 | + 'try'.$i, |
|
222 | 222 | null, |
223 | 223 | get_lang('TryAgain') |
224 | 224 | ); |
225 | - $group['lp' . $i] = $form->createElement( |
|
225 | + $group['lp'.$i] = $form->createElement( |
|
226 | 226 | 'select', |
227 | - 'lp' . $i, |
|
228 | - get_lang('SeeTheory') . ': ', |
|
227 | + 'lp'.$i, |
|
228 | + get_lang('SeeTheory').': ', |
|
229 | 229 | $select_lp_id |
230 | 230 | ); |
231 | - $group['destination' . $i] = $form->createElement( |
|
231 | + $group['destination'.$i] = $form->createElement( |
|
232 | 232 | 'select', |
233 | - 'destination' . $i, |
|
234 | - get_lang('GoToQuestion') . ': ', |
|
233 | + 'destination'.$i, |
|
234 | + get_lang('GoToQuestion').': ', |
|
235 | 235 | $select_question |
236 | 236 | ); |
237 | - $group['url' . $i] = $form->createElement( |
|
237 | + $group['url'.$i] = $form->createElement( |
|
238 | 238 | 'text', |
239 | - 'url' . $i, |
|
240 | - get_lang('Other') . ': ', |
|
239 | + 'url'.$i, |
|
240 | + get_lang('Other').': ', |
|
241 | 241 | array( |
242 | 242 | 'class' => 'col-md-2', |
243 | 243 | 'placeholder' => get_lang('Other') |
@@ -250,9 +250,9 @@ discard block |
||
250 | 250 | 'scenario' |
251 | 251 | ); |
252 | 252 | } else { |
253 | - $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config); |
|
253 | + $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config); |
|
254 | 254 | } |
255 | - $form->addText('weighting[' . $i . ']', null, null, array('value' => '0')); |
|
255 | + $form->addText('weighting['.$i.']', null, null, array('value' => '0')); |
|
256 | 256 | $form->addHtml('</tr>'); |
257 | 257 | } |
258 | 258 | |
@@ -306,19 +306,19 @@ discard block |
||
306 | 306 | $nb_answers = $form->getSubmitValue('nb_answers'); |
307 | 307 | |
308 | 308 | for ($i = 1; $i <= $nb_answers; $i++) { |
309 | - $answer = trim($form->getSubmitValue('answer[' . $i . ']')); |
|
310 | - $comment = trim($form->getSubmitValue('comment[' . $i . ']')); |
|
311 | - $weighting = trim($form->getSubmitValue('weighting[' . $i . ']')); |
|
309 | + $answer = trim($form->getSubmitValue('answer['.$i.']')); |
|
310 | + $comment = trim($form->getSubmitValue('comment['.$i.']')); |
|
311 | + $weighting = trim($form->getSubmitValue('weighting['.$i.']')); |
|
312 | 312 | |
313 | 313 | $scenario = $form->getSubmitValue('scenario'); |
314 | 314 | |
315 | 315 | //$list_destination = $form -> getSubmitValue('destination'.$i); |
316 | 316 | //$destination_str = $form -> getSubmitValue('destination'.$i); |
317 | 317 | |
318 | - $try = $scenario['try' . $i]; |
|
319 | - $lp = $scenario['lp' . $i]; |
|
320 | - $destination = $scenario['destination' . $i]; |
|
321 | - $url = trim($scenario['url' . $i]); |
|
318 | + $try = $scenario['try'.$i]; |
|
319 | + $lp = $scenario['lp'.$i]; |
|
320 | + $destination = $scenario['destination'.$i]; |
|
321 | + $url = trim($scenario['url'.$i]); |
|
322 | 322 | |
323 | 323 | /* |
324 | 324 | How we are going to parse the destination value |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | } |
367 | 367 | |
368 | 368 | //1@@1;2;@@2;4;4;@@http://www.chamilo.org |
369 | - $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url; |
|
369 | + $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url; |
|
370 | 370 | $objAnswer->createAnswer( |
371 | 371 | $answer, |
372 | 372 | $goodAnswer, |
@@ -400,12 +400,12 @@ discard block |
||
400 | 400 | $score = null |
401 | 401 | ) { |
402 | 402 | $header = parent::return_header($feedback_type, $counter, $score); |
403 | - $header .= '<table class="' . $this->question_table_class . '"> |
|
403 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
404 | 404 | <tr> |
405 | - <th>' . get_lang("Choice") . '</th> |
|
406 | - <th>' . get_lang("ExpectedChoice") . '</th> |
|
407 | - <th>' . get_lang("Answer") . '</th>'; |
|
408 | - $header .= '<th>' . get_lang("Comment") . '</th>'; |
|
405 | + <th>' . get_lang("Choice").'</th> |
|
406 | + <th>' . get_lang("ExpectedChoice").'</th> |
|
407 | + <th>' . get_lang("Answer").'</th>'; |
|
408 | + $header .= '<th>'.get_lang("Comment").'</th>'; |
|
409 | 409 | $header .= '</tr>'; |
410 | 410 | |
411 | 411 | return $header; |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | if ($correct) { |
470 | 470 | $sql = "UPDATE $tbl_quiz_question |
471 | 471 | SET ponderation = (ponderation + $score) |
472 | - WHERE c_id = $course_id AND id = " . $question_id; |
|
472 | + WHERE c_id = $course_id AND id = ".$question_id; |
|
473 | 473 | Database::query($sql); |
474 | 474 | } |
475 | 475 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | session_cache_limiter("none"); |
12 | 12 | |
13 | 13 | require '../inc/global.inc.php'; |
14 | -require api_get_path(LIBRARY_PATH) . 'geometry.lib.php'; |
|
14 | +require api_get_path(LIBRARY_PATH).'geometry.lib.php'; |
|
15 | 15 | |
16 | 16 | // set vars |
17 | 17 | $questionId = intval($_GET['modifyAnswers']); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $course_id = api_get_course_int_id(); |
30 | 30 | |
31 | 31 | // Query db for answers |
32 | -if ($answer_type==HOT_SPOT_DELINEATION) { |
|
32 | +if ($answer_type == HOT_SPOT_DELINEATION) { |
|
33 | 33 | $sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS |
34 | 34 | WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type = 'delineation' ORDER BY id"; |
35 | 35 | } else { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $hotSpot['answer'] = $hotspot['answer']; |
76 | 76 | |
77 | 77 | // Square or rectancle |
78 | - if ($hotspot['hotspot_type'] == 'square' ) |
|
78 | + if ($hotspot['hotspot_type'] == 'square') |
|
79 | 79 | { |
80 | 80 | $hotSpot['type'] = 'square'; |
81 | 81 | } |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | session_cache_limiter('public'); |
13 | 13 | |
14 | 14 | require_once '../inc/global.inc.php'; |
15 | -$this_section=SECTION_COURSES; |
|
15 | +$this_section = SECTION_COURSES; |
|
16 | 16 | |
17 | 17 | $tbl_document = Database::get_course_table(TABLE_DOCUMENT); |
18 | 18 | |
19 | -$doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldecode($_GET['doc_url'])); |
|
20 | -$filename=basename($doc_url); |
|
19 | +$doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($_GET['doc_url'])); |
|
20 | +$filename = basename($doc_url); |
|
21 | 21 | |
22 | 22 | // launch event |
23 | 23 | //Event::event_download($doc_url); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $full_file_name = $course_path.Security::remove_XSS($doc_url); |
30 | 30 | } |
31 | 31 | |
32 | -if(!is_file($full_file_name)) { |
|
32 | +if (!is_file($full_file_name)) { |
|
33 | 33 | exit; |
34 | 34 | } |
35 | 35 | |
@@ -37,26 +37,26 @@ discard block |
||
37 | 37 | exit; |
38 | 38 | } |
39 | 39 | |
40 | -$extension=explode('.',$filename); |
|
41 | -$extension=strtolower($extension[sizeof($extension)-1]); |
|
42 | - |
|
43 | -switch($extension) { |
|
44 | - case 'gz': $content_type='application/x-gzip'; break; |
|
45 | - case 'zip': $content_type='application/zip'; break; |
|
46 | - case 'pdf': $content_type='application/pdf'; break; |
|
47 | - case 'png': $content_type='image/png'; break; |
|
48 | - case 'gif': $content_type='image/gif'; break; |
|
49 | - case 'jpg': $content_type='image/jpeg'; break; |
|
50 | - case 'txt': $content_type='text/plain'; break; |
|
51 | - case 'htm': $content_type='text/html'; break; |
|
52 | - case 'html': $content_type='text/html'; break; |
|
53 | - default: $content_type='application/octet-stream'; break; |
|
40 | +$extension = explode('.', $filename); |
|
41 | +$extension = strtolower($extension[sizeof($extension) - 1]); |
|
42 | + |
|
43 | +switch ($extension) { |
|
44 | + case 'gz': $content_type = 'application/x-gzip'; break; |
|
45 | + case 'zip': $content_type = 'application/zip'; break; |
|
46 | + case 'pdf': $content_type = 'application/pdf'; break; |
|
47 | + case 'png': $content_type = 'image/png'; break; |
|
48 | + case 'gif': $content_type = 'image/gif'; break; |
|
49 | + case 'jpg': $content_type = 'image/jpeg'; break; |
|
50 | + case 'txt': $content_type = 'text/plain'; break; |
|
51 | + case 'htm': $content_type = 'text/html'; break; |
|
52 | + case 'html': $content_type = 'text/html'; break; |
|
53 | + default: $content_type = 'application/octet-stream'; break; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | header('Content-disposition: filename='.$filename); |
57 | 57 | header('Content-Type: '.$content_type); |
58 | -header('Expires: '.gmdate('D, d M Y H:i:s',time()+10).' GMT'); |
|
59 | -header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT'); |
|
58 | +header('Expires: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT'); |
|
59 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT'); |
|
60 | 60 | |
61 | 61 | /* |
62 | 62 | Dynamic parsing section |
@@ -70,16 +70,16 @@ discard block |
||
70 | 70 | if ($content_type == 'text/html') { |
71 | 71 | $directory_name = dirname($full_file_name); |
72 | 72 | |
73 | - $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name); |
|
73 | + $dir = str_replace(array('\\', $_configuration['root_sys']."courses/".$_course['path'].'/document'), array('/', ''), $directory_name); |
|
74 | 74 | |
75 | - if($dir[strlen($dir)-1] != '/') { |
|
76 | - $dir.='/'; |
|
75 | + if ($dir[strlen($dir) - 1] != '/') { |
|
76 | + $dir .= '/'; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
80 | 80 | //Parse whole file at one |
81 | 81 | $fp = fopen($full_file_name, "r"); |
82 | - $file_content = fread ($fp, filesize ($full_file_name)); |
|
82 | + $file_content = fread($fp, filesize($full_file_name)); |
|
83 | 83 | fclose($fp); |
84 | 84 | //$file_content = api_replace_parameter($dir, $file_content, "src"); |
85 | 85 | //$file_content = api_replace_parameter($dir, $file_content, "href"); |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | |
99 | 99 | |
100 | 100 | $exercisePath = api_get_self(); |
101 | - $exfile = explode('/',$exercisePath); |
|
102 | - $exfile = $exfile[sizeof($exfile)-1]; |
|
103 | - $exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile)); |
|
101 | + $exfile = explode('/', $exercisePath); |
|
102 | + $exfile = $exfile[sizeof($exfile) - 1]; |
|
103 | + $exercisePath = substr($exercisePath, 0, strpos($exercisePath, $exfile)); |
|
104 | 104 | $exercisePath = $exercisePath; |
105 | 105 | |
106 | 106 | $content = $file_content; |
@@ -125,16 +125,16 @@ discard block |
||
125 | 125 | "// Must be included \n". |
126 | 126 | "function Finish(){\n". |
127 | 127 | " mySaveScore();"; |
128 | - $newcontent = str_replace($mit,$js_content,$content); |
|
128 | + $newcontent = str_replace($mit, $js_content, $content); |
|
129 | 129 | |
130 | - $prehref="javascript:void(0);"; |
|
131 | - $posthref=$_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid; |
|
132 | - $newcontent = str_replace($prehref,$posthref,$newcontent); |
|
130 | + $prehref = "javascript:void(0);"; |
|
131 | + $posthref = $_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid; |
|
132 | + $newcontent = str_replace($prehref, $posthref, $newcontent); |
|
133 | 133 | |
134 | 134 | |
135 | - $prehref="class=\"GridNum\" onclick="; |
|
136 | - $posthref="class=\"GridNum\" onMouseover="; |
|
137 | - $newcontent = str_replace($prehref,$posthref,$newcontent); |
|
135 | + $prehref = "class=\"GridNum\" onclick="; |
|
136 | + $posthref = "class=\"GridNum\" onMouseover="; |
|
137 | + $newcontent = str_replace($prehref, $posthref, $newcontent); |
|
138 | 138 | |
139 | 139 | |
140 | 140 | header('Content-length: '.strlen($newcontent)); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | //normal case, all non-html files |
148 | 148 | //header('Content-length: '.filesize($full_file_name)); |
149 | -$fp=fopen($full_file_name,'rb'); |
|
149 | +$fp = fopen($full_file_name, 'rb'); |
|
150 | 150 | fpassthru($fp); |
151 | 151 | fclose($fp); |
152 | 152 | ?> |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | api_protect_course_script(false); |
12 | 12 | |
13 | -$isAllowedToEdit = api_is_allowed_to_edit(null,true); |
|
13 | +$isAllowedToEdit = api_is_allowed_to_edit(null, true); |
|
14 | 14 | |
15 | 15 | if (!$isAllowedToEdit) { |
16 | 16 | api_not_allowed(true); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $objQuestion = Question::read($questionId); |
23 | 23 | $_course = api_get_course_info(); |
24 | 24 | |
25 | -$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
|
25 | +$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
|
26 | 26 | |
27 | 27 | $picturePath = $documentPath.'/images'; |
28 | 28 | $pictureName = $objQuestion->selectPicture(); |
@@ -65,13 +65,13 @@ discard block |
||
65 | 65 | $answers = $_SESSION['tmp_answers']; |
66 | 66 | $nbrAnswers = count($answers['answer']); |
67 | 67 | |
68 | -for ($i=1;$i <= $nbrAnswers; $i++) { |
|
68 | +for ($i = 1; $i <= $nbrAnswers; $i++) { |
|
69 | 69 | $hotSpot = []; |
70 | 70 | $hotSpot['id'] = null; |
71 | - $hotSpot['answer']= $answers['answer'][$i]; |
|
71 | + $hotSpot['answer'] = $answers['answer'][$i]; |
|
72 | 72 | |
73 | 73 | if ($answer_type == HOT_SPOT_DELINEATION) { |
74 | - if ($i==1) { |
|
74 | + if ($i == 1) { |
|
75 | 75 | $hotSpot['type'] = 'delineation'; |
76 | 76 | } else { |
77 | 77 | $hotSpot['type'] = 'oar'; |
@@ -7,4 +7,4 @@ |
||
7 | 7 | // directly to exercise.php. This redirection is enabled for 1.10.x (2015-04-21) |
8 | 8 | // The final goal of this file is to be removed in a few years time, if |
9 | 9 | // considered realistically not harmful |
10 | -require __DIR__ . '/exercise.php'; |
|
10 | +require __DIR__.'/exercise.php'; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | api_not_allowed($show_headers); |
27 | 27 | } |
28 | 28 | |
29 | -$is_allowedToEdit = api_is_allowed_to_edit(null,true) || $is_courseTutor; |
|
29 | +$is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor; |
|
30 | 30 | |
31 | 31 | //Getting results from the exe_id. This variable also contain all the information about the exercise |
32 | 32 | $track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($id); |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | -$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">'; |
|
57 | -$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>'; |
|
56 | +$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">'; |
|
57 | +$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>'; |
|
58 | 58 | |
59 | 59 | if ($show_headers) { |
60 | 60 | $interbreadcrumb[] = array( |
@@ -7,7 +7,7 @@ |
||
7 | 7 | get_lang('MultiplicationStar')."\n". |
8 | 8 | get_lang('DivisionSlash')."\n". |
9 | 9 | get_lang('ExponentiationCircumflex')."\n". |
10 | -get_lang('ModuloPercentage') . "\n" . |
|
10 | +get_lang('ModuloPercentage')."\n". |
|
11 | 11 | "\n". |
12 | 12 | get_lang('SquareRootSqrt')."\n". |
13 | 13 | get_lang('AbsoluteValueAbs')."\n". |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | 'Height' => '125' |
39 | 39 | ); |
40 | 40 | |
41 | - $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759. |
|
41 | + $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759. |
|
42 | 42 | $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0)); |
43 | 43 | |
44 | 44 | $obj_ex = $_SESSION['objExercise']; |
@@ -48,11 +48,11 @@ discard block |
||
48 | 48 | $html = '<table class="table table-striped table-hover"> |
49 | 49 | <thead> |
50 | 50 | <tr> |
51 | - <th width="10">' . get_lang('Number') . '</th> |
|
52 | - <th width="10">' . get_lang('True') . '</th> |
|
53 | - <th width="50%">' . get_lang('Answer') . '</th> |
|
54 | - <th width="50%">' . get_lang('Comment') . '</th> |
|
55 | - <th width="10">' . get_lang('Weighting') . '</th> |
|
51 | + <th width="10">' . get_lang('Number').'</th> |
|
52 | + <th width="10">' . get_lang('True').'</th> |
|
53 | + <th width="50%">' . get_lang('Answer').'</th> |
|
54 | + <th width="50%">' . get_lang('Comment').'</th> |
|
55 | + <th width="10">' . get_lang('Weighting').'</th> |
|
56 | 56 | </tr> |
57 | 57 | </thead> |
58 | 58 | <tbody>'; |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | $form->addHtml('<tr>'); |
83 | 83 | |
84 | 84 | if (is_object($answer)) { |
85 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
86 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
87 | - $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1); |
|
88 | - $defaults['correct[' . $i . ']'] = $answer->correct[$i]; |
|
85 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
86 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
87 | + $defaults['weighting['.$i.']'] = float_format($answer->weighting[$i], 1); |
|
88 | + $defaults['correct['.$i.']'] = $answer->correct[$i]; |
|
89 | 89 | } else { |
90 | 90 | $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2'); |
91 | 91 | $defaults['comment[1]'] = get_lang('DefaultMultipleComment2'); |
@@ -101,38 +101,38 @@ discard block |
||
101 | 101 | |
102 | 102 | $renderer->setElementTemplate( |
103 | 103 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
104 | - 'correct[' . $i . ']' |
|
104 | + 'correct['.$i.']' |
|
105 | 105 | ); |
106 | 106 | $renderer->setElementTemplate( |
107 | 107 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
108 | - 'counter[' . $i . ']' |
|
108 | + 'counter['.$i.']' |
|
109 | 109 | ); |
110 | 110 | $renderer->setElementTemplate( |
111 | 111 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
112 | - 'answer[' . $i . ']' |
|
112 | + 'answer['.$i.']' |
|
113 | 113 | ); |
114 | 114 | $renderer->setElementTemplate( |
115 | 115 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
116 | - 'comment[' . $i . ']' |
|
116 | + 'comment['.$i.']' |
|
117 | 117 | ); |
118 | 118 | $renderer->setElementTemplate( |
119 | 119 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
120 | - 'weighting[' . $i . ']' |
|
120 | + 'weighting['.$i.']' |
|
121 | 121 | ); |
122 | 122 | |
123 | - $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"'); |
|
123 | + $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"'); |
|
124 | 124 | $answer_number->freeze(); |
125 | 125 | |
126 | - $form->addElement('checkbox', 'correct[' . $i . ']', null, null, |
|
126 | + $form->addElement('checkbox', 'correct['.$i.']', null, null, |
|
127 | 127 | 'class="checkbox" style="margin-left: 0em;"'); |
128 | - $boxes_names[] = 'correct[' . $i . ']'; |
|
128 | + $boxes_names[] = 'correct['.$i.']'; |
|
129 | 129 | |
130 | 130 | $form->addHtmlEditor("answer[$i]", null, null, true, $editorConfig); |
131 | - $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'); |
|
131 | + $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); |
|
132 | 132 | |
133 | 133 | $form->addHtmlEditor("comment[$i]", null, null, true, $editorConfig); |
134 | 134 | |
135 | - $form->addElement('text', 'weighting[' . $i . ']', null, array('style' => "width: 60px;", 'value' => '0')); |
|
135 | + $form->addElement('text', 'weighting['.$i.']', null, array('style' => "width: 60px;", 'value' => '0')); |
|
136 | 136 | $form->addHtml('</tr>'); |
137 | 137 | } |
138 | 138 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $objAnswer = new Answer($this->id); |
178 | 178 | $nb_answers = $form->getSubmitValue('nb_answers'); |
179 | 179 | |
180 | - for($i=1 ; $i <= $nb_answers ; $i++) { |
|
180 | + for ($i = 1; $i <= $nb_answers; $i++) { |
|
181 | 181 | $answer = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('answer['.$i.']'))); |
182 | 182 | $comment = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('comment['.$i.']'))); |
183 | 183 | $weighting = trim($form -> getSubmitValue('weighting['.$i.']')); |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | $weighting = abs($weighting); |
190 | 190 | $weighting = -$weighting; |
191 | 191 | } |
192 | - if($weighting > 0) { |
|
192 | + if ($weighting > 0) { |
|
193 | 193 | $questionWeighting += $weighting; |
194 | 194 | } |
195 | - $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i); |
|
195 | + $objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | // saves the answers into the data base |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | function return_header($feedback_type = null, $counter = null, $score = null) |
207 | 207 | { |
208 | 208 | $header = parent::return_header($feedback_type, $counter, $score); |
209 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
209 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
210 | 210 | <tr> |
211 | 211 | <th>'.get_lang("Choice").'</th> |
212 | 212 | <th>'. get_lang("ExpectedChoice").'</th> |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | $time = time(); |
15 | 15 | $doc_url = str_replace(array('../', '\\', '\\0', '..'), array('', '', '', ''), urldecode($_GET['file'])); |
16 | 16 | $cid = api_get_course_id(); |
17 | -$document_path = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document'; |
|
18 | -$document_web_path = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document'; |
|
17 | +$document_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
|
18 | +$document_web_path = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'; |
|
19 | 19 | $origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null; |
20 | 20 | $learnpath_id = isset($_REQUEST['learnpath_id']) ? $_REQUEST['learnpath_id'] : null; |
21 | 21 | $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? $_REQUEST['learnpath_item_id'] : null; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $my_file = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($my_file)); |
70 | 70 | |
71 | 71 | $title = GetQuizName($my_file, $documentPath); |
72 | -if ($title =='') { |
|
72 | +if ($title == '') { |
|
73 | 73 | $title = basename($my_file); |
74 | 74 | } |
75 | 75 | $nameTools = $title; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | }); |
87 | 87 | </script>'; |
88 | 88 | |
89 | -$interbreadcrumb[]= array ("url"=>"./exercise.php", "name"=> get_lang('Exercises')); |
|
89 | +$interbreadcrumb[] = array("url"=>"./exercise.php", "name"=> get_lang('Exercises')); |
|
90 | 90 | if ($origin == 'learnpath') { |
91 | 91 | Display::display_reduced_header($nameTools, "Exercise"); |
92 | 92 | } else { |