Completed
Push — 1.10.x ( 2d1800...d0b403 )
by Angel Fernando Quiroz
145:53 queued 104:41
created
main/exercice/unique_answer_no_option.class.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $editor_config = array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '125');
40 40
 
41 41
         //this line define how many question by default appear when creating a choice question
42
-        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3;  // The previous default value was 2. See task #1759.
42
+        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3; // The previous default value was 2. See task #1759.
43 43
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
44 44
 
45 45
         /*
@@ -55,20 +55,20 @@  discard block
 block discarded – undo
55 55
         if ($obj_ex->selectFeedbackType() == 1) {
56 56
             $editor_config['Width'] = '250';
57 57
             $editor_config['Height'] = '110';
58
-            $comment_title = '<th width="50%" >' . get_lang('Comment') . '</th>';
59
-            $feedback_title = '<th width="50%" >' . get_lang('Scenario') . '</th>';
58
+            $comment_title = '<th width="50%" >'.get_lang('Comment').'</th>';
59
+            $feedback_title = '<th width="50%" >'.get_lang('Scenario').'</th>';
60 60
         } else {
61
-            $comment_title = '<th width="50%">' . get_lang('Comment') . '</th>';
61
+            $comment_title = '<th width="50%">'.get_lang('Comment').'</th>';
62 62
         }
63 63
 
64 64
         $html = '<table class="table table-striped table-hover">';
65 65
         $html .= '<thead>';
66 66
         $html .= '<tr>';
67
-        $html .= '<th>' . get_lang('Number') . '</th>';
68
-        $html .= '<th>' . get_lang('True') . '</th>';
69
-        $html .= '<th width="50%">' . get_lang('Answer') . '</th>';
70
-        $html .= $comment_title . $feedback_title;
71
-        $html .= '<th>' . get_lang('Weighting') . '</th>';
67
+        $html .= '<th>'.get_lang('Number').'</th>';
68
+        $html .= '<th>'.get_lang('True').'</th>';
69
+        $html .= '<th width="50%">'.get_lang('Answer').'</th>';
70
+        $html .= $comment_title.$feedback_title;
71
+        $html .= '<th>'.get_lang('Weighting').'</th>';
72 72
         $html .= '</tr>';
73 73
         $html .= '</thead>';
74 74
         $html .= '<tbody>';
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
                         $weight_result = '0';
136 136
                     }
137 137
 
138
-                    $defaults['answer[' . $i . ']'] = $answer_result;
139
-                    $defaults['comment[' . $i . ']'] = $answer->comment[$i];
140
-                    $defaults['weighting[' . $i . ']'] = $weight_result;
138
+                    $defaults['answer['.$i.']'] = $answer_result;
139
+                    $defaults['comment['.$i.']'] = $answer->comment[$i];
140
+                    $defaults['weighting['.$i.']'] = $weight_result;
141 141
 
142 142
                     $item_list = explode('@@', $answer->destination[$i]);
143 143
 
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
                     else
157 157
                         $url_result = $url;
158 158
 
159
-                    $temp_scenario['url' . $i] = $url_result;
160
-                    $temp_scenario['try' . $i] = $try_result;
161
-                    $temp_scenario['lp' . $i] = $lp;
162
-                    $temp_scenario['destination' . $i] = $list_dest;
159
+                    $temp_scenario['url'.$i] = $url_result;
160
+                    $temp_scenario['try'.$i] = $try_result;
161
+                    $temp_scenario['lp'.$i] = $lp;
162
+                    $temp_scenario['destination'.$i] = $list_dest;
163 163
                 }
164 164
             }
165 165
 
@@ -172,30 +172,30 @@  discard block
 block discarded – undo
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
-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
190
+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
191 191
             $answer_number->freeze();
192 192
 
193 193
 
194 194
             $form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
195
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
195
+            $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
196 196
 
197
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
198
-            $form->addElement('text', 'weighting[' . $i . ']', null, array('style' => 'width: 60px;', 'value' => '0'));
197
+            $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
198
+            $form->addElement('text', 'weighting['.$i.']', null, array('style' => 'width: 60px;', 'value' => '0'));
199 199
             $form->addElement('html', '</tr>');
200 200
             $i++;
201 201
         }
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
         $i = 666;
210 210
         $form->addHtml('<tr>');
211 211
 
212
-        $defaults['answer[' . $i . ']'] = get_lang('DontKnow');
213
-        $defaults['weighting[' . $i . ']'] = 0;
212
+        $defaults['answer['.$i.']'] = get_lang('DontKnow');
213
+        $defaults['weighting['.$i.']'] = 0;
214 214
         $defaults['scenario'] = $temp_scenario;
215 215
         $renderer = & $form->defaultRenderer();
216 216
 
@@ -220,31 +220,31 @@  discard block
 block discarded – undo
220 220
         );
221 221
         $renderer->setElementTemplate(
222 222
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
223
-            'counter[' . $i . ']'
223
+            'counter['.$i.']'
224 224
         );
225 225
         $renderer->setElementTemplate(
226 226
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
227
-            'answer[' . $i . ']'
227
+            'answer['.$i.']'
228 228
         );
229 229
         $renderer->setElementTemplate(
230 230
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
231
-            'comment[' . $i . ']'
231
+            'comment['.$i.']'
232 232
         );
233 233
         $renderer->setElementTemplate(
234 234
             '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
235
-            'weighting[' . $i . ']'
235
+            'weighting['.$i.']'
236 236
         );
237 237
 
238
-        $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="-"');
238
+        $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="-"');
239 239
         $answer_number->freeze();
240 240
 
241
-        $form->addElement('hidden', 'position[' . $i . ']', '666');
241
+        $form->addElement('hidden', 'position['.$i.']', '666');
242 242
 
243 243
         $form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
244
-        $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
244
+        $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
245 245
 
246
-        $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
247
-        $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
246
+        $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
247
+        $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
248 248
 
249 249
         //$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
250 250
 
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
 		    $minus = 0;
299 299
 		}
300 300
 
301
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
302
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
303
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
301
+		for ($i = 1; $i <= $nb_answers - $minus; $i++) {
302
+		    $position = trim($form -> getSubmitValue('position['.$i.']'));
303
+        	$answer = trim($form -> getSubmitValue('answer['.$i.']'));
304 304
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
305 305
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
306 306
             $scenario   = $form -> getSubmitValue('scenario');
@@ -308,8 +308,8 @@  discard block
 block discarded – undo
308 308
            	//$list_destination = $form -> getSubmitValue('destination'.$i);
309 309
            	//$destination_str = $form -> getSubmitValue('destination'.$i);
310 310
 
311
- 		    $try           = $scenario['try'.$i];
312
-            $lp            = $scenario['lp'.$i];
311
+ 		    $try = $scenario['try'.$i];
312
+            $lp = $scenario['lp'.$i];
313 313
  			$destination   = $scenario['destination'.$i];
314 314
  			$url           = trim($scenario['url'.$i]);
315 315
 
@@ -333,34 +333,34 @@  discard block
 block discarded – undo
333 333
  				$destination_str.=$destination_id.';';
334 334
  			}*/
335 335
 
336
-        	$goodAnswer= ($correct == $i) ? true : false;
336
+        	$goodAnswer = ($correct == $i) ? true : false;
337 337
 
338 338
         	if ($goodAnswer) {
339 339
         		$nbrGoodAnswers++;
340 340
         		$weighting = abs($weighting);
341
-        		if($weighting > 0) {
341
+        		if ($weighting > 0) {
342 342
                     $questionWeighting += $weighting;
343 343
                 }
344 344
         	}
345 345
 
346 346
  			if (empty($try))
347
- 				$try=0;
347
+ 				$try = 0;
348 348
 
349 349
  			if (empty($lp)) {
350
- 				$lp=0;
350
+ 				$lp = 0;
351 351
  			}
352 352
 
353 353
  			if (empty($destination)) {
354
- 				$destination=0;
354
+ 				$destination = 0;
355 355
  			}
356 356
 
357
- 			if ($url=='') {
358
- 				$url=0;
357
+ 			if ($url == '') {
358
+ 				$url = 0;
359 359
  			}
360 360
 
361 361
  			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
362
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
363
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
362
+			$dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
363
+        	$objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
364 364
         }
365 365
 
366 366
         //Create 666 answer
@@ -368,10 +368,10 @@  discard block
 block discarded – undo
368 368
         $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
369 369
         $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
370 370
         $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
371
-        $goodAnswer= ($correct == $i) ? true : false;
371
+        $goodAnswer = ($correct == $i) ? true : false;
372 372
         $dest       = '';
373 373
 
374
-        $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
374
+        $objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
375 375
 
376 376
     	// saves the answers into the data base
377 377
         $objAnswer -> save();
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 	function return_header($feedback_type = null, $counter = null, $score = null)
385 385
     {
386 386
 	    $header = parent::return_header($feedback_type, $counter, $score);
387
-	    $header .= '<table class="'.$this->question_table_class .'">
387
+	    $header .= '<table class="'.$this->question_table_class.'">
388 388
 			<tr>
389 389
 				<th>'.get_lang("Choice").'</th>
390 390
 				<th>'. get_lang("ExpectedChoice").'</th>
Please login to merge, or discard this patch.
main/exercice/question_pool.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 }
49 49
 
50 50
 $nameTools = get_lang('QuestionPool');
51
-$interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises'));
51
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
52 52
 
53 53
 if (!empty($objExercise)) {
54 54
     $interbreadcrumb[] = array(
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         if ($old_question_obj) {
75 75
             $old_question_obj->updateTitle(
76
-                $old_question_obj->selectTitle() . ' - ' . get_lang('Copy')
76
+                $old_question_obj->selectTitle().' - '.get_lang('Copy')
77 77
             );
78 78
             //Duplicating the source question, in the current course
79 79
             $new_id = $old_question_obj->duplicate($current_course);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         }
108 108
         // destruction of the Question object
109 109
         unset($objQuestionTmp);
110
-    } elseif($recup && $fromExercise) {
110
+    } elseif ($recup && $fromExercise) {
111 111
         // gets an existing question and copies it into a new exercise
112 112
         $objQuestionTmp = Question :: read($recup);
113 113
         // if the question exists
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                 $old_question_obj = Question::read($old_question_id, $origin_course_id);
140 140
                 if ($old_question_obj) {
141 141
                     $old_question_obj->updateTitle(
142
-                        $old_question_obj->selectTitle() . ' - ' . get_lang('Copy')
142
+                        $old_question_obj->selectTitle().' - '.get_lang('Copy')
143 143
                     );
144 144
 
145 145
                     //Duplicating the source question, in the current course
@@ -167,16 +167,16 @@  discard block
 block discarded – undo
167 167
                 }
168 168
             }
169 169
         }
170
-        Session::write('objExercise',$objExercise);
170
+        Session::write('objExercise', $objExercise);
171 171
     }
172 172
 }
173 173
 
174
-if (isset($_SESSION['gradebook'])){
175
-	$gradebook=	$_SESSION['gradebook'];
174
+if (isset($_SESSION['gradebook'])) {
175
+	$gradebook = $_SESSION['gradebook'];
176 176
 }
177 177
 
178
-if (!empty($gradebook) && $gradebook=='view') {
179
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
178
+if (!empty($gradebook) && $gradebook == 'view') {
179
+	$interbreadcrumb[] = array('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']), 'name' => get_lang('ToolGradebook'));
180 180
 }
181 181
 
182 182
 // if admin of course
@@ -216,11 +216,11 @@  discard block
 block discarded – undo
216 216
 }
217 217
 if (isset($fromExercise) && $fromExercise > 0) {
218 218
     echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$fromExercise.'">'.
219
-            Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
219
+            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
220 220
     $titleAdd = get_lang('AddQuestionToTest');
221 221
 } else {
222 222
     echo '<a href="exercise.php?'.api_get_cidReq().'">'.
223
-        Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
223
+        Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
224 224
     echo "<a href='admin.php?exerciseId=0'>".Display::return_icon('add_question.gif', get_lang('NewQu'), '', ICON_SIZE_MEDIUM)."</a>";
225 225
     $titleAdd = get_lang('ManageAllQuestions');
226 226
 }
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 foreach ($sessionList as $item) {
250 250
     $session_select_list[$item['session_id']] = $item['session_name'];
251 251
 }
252
-$select_session_html =  Display::select('session_id', $session_select_list, $session_id, $tabAttrParam);
252
+$select_session_html = Display::select('session_id', $session_select_list, $session_id, $tabAttrParam);
253 253
 echo Display::form_row($labelFormRow, $select_session_html);
254 254
 
255 255
 // Course list, get course list of session, or for course where user is admin
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	$course_select_list[$courseItemId] .= $courseInfo['title'];
291 291
 }
292 292
 
293
-$select_course_html =  Display::select(
293
+$select_course_html = Display::select(
294 294
     'selected_course',
295 295
     $course_select_list,
296 296
     $selected_course,
@@ -346,9 +346,9 @@  discard block
 block discarded – undo
346 346
 $my_exercise_list['0']  = get_lang('AllExercises');
347 347
 $my_exercise_list['-1'] = get_lang('OrphanQuestions');
348 348
 if (is_array($exercise_list)) {
349
-    foreach($exercise_list as $row) {
349
+    foreach ($exercise_list as $row) {
350 350
         $my_exercise_list[$row['id']] = "";
351
-        if ($row['id'] ==  $fromExercise && $selected_course == api_get_course_int_id()) {
351
+        if ($row['id'] == $fromExercise && $selected_course == api_get_course_int_id()) {
352 352
             $my_exercise_list[$row['id']] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
353 353
         }
354 354
         $my_exercise_list[$row['id']] .= $row['title'];
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 if ($exercise_id_changed == 1) {
359 359
 	reset_menu_lvl_type();
360 360
 }
361
-$select_exercise_html =  Display::select(
361
+$select_exercise_html = Display::select(
362 362
     'exerciseId',
363 363
     $my_exercise_list,
364 364
     $exerciseId,
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 $question_list = Question::get_question_type_list();
392 392
 
393 393
 $new_question_list = array();
394
-$new_question_list['-1']  = get_lang('All');
394
+$new_question_list['-1'] = get_lang('All');
395 395
 if (!empty($_course)) {
396 396
     $objExercise = new Exercise();
397 397
     $objExercise->read($fromExercise);
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
             ORDER BY question_order";
465 465
 
466 466
     $result = Database::query($sql);
467
-    while($row = Database::fetch_array($result, 'ASSOC')) {
467
+    while ($row = Database::fetch_array($result, 'ASSOC')) {
468 468
         $mainQuestionList[] = $row;
469 469
     }
470 470
 } elseif ($exerciseId == -1) {
@@ -477,11 +477,11 @@  discard block
 block discarded – undo
477 477
 		        crc.c_id = $selected_course AND
478 478
 		        crc.category_id = $courseCategoryId";
479 479
 	}
480
-	if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
480
+	if (isset($exerciseLevel) && $exerciseLevel != -1) {
481 481
 		$level_where = ' AND level='.$exerciseLevel;
482 482
 	}
483 483
 	$answer_where = '';
484
-	if (isset($answerType) && $answerType >0 -1 ) {
484
+	if (isset($answerType) && $answerType > 0 - 1) {
485 485
 		$answer_where = ' AND type='.$answerType;
486 486
 	}
487 487
 
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
                     $level_where $answer_where
522 522
              )";
523 523
     $result = Database::query($sql);
524
-    while($row = Database::fetch_array($result, 'ASSOC')) {
524
+    while ($row = Database::fetch_array($result, 'ASSOC')) {
525 525
         $mainQuestionList[] = $row;
526 526
     }
527 527
 } else {
Please login to merge, or discard this patch.
main/gradebook/gradebook_showlog_eval.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
 api_block_anonymous_users();
10 10
 GradebookUtils::block_students();
11 11
 
12
-$interbreadcrumb[] = array (
12
+$interbreadcrumb[] = array(
13 13
     'url' => $_SESSION['gradebook_dest'].'?',
14 14
     'name' => get_lang('Gradebook'
15 15
 ));
16
-$interbreadcrumb[] = array (
16
+$interbreadcrumb[] = array(
17 17
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']),
18 18
     'name' => get_lang('Details'
19 19
 ));
20
-$interbreadcrumb[] = array (
20
+$interbreadcrumb[] = array(
21 21
     'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']),
22 22
     'name' => get_lang('GradebookQualifyLog')
23 23
 );
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 $t_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
30 30
 $t_user = Database :: get_main_table(TABLE_MAIN_USER);
31
-$visible_log=Security::remove_XSS($_GET['visiblelog']);
31
+$visible_log = Security::remove_XSS($_GET['visiblelog']);
32 32
 
33 33
 $evaledit = Evaluation :: load($visible_log);
34 34
 $sql = "SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,us.username
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
     $list_info[] = $row;
43 43
 }
44 44
 
45
-foreach($list_info as $key => $info_log) {
46
-    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
47
-    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
45
+foreach ($list_info as $key => $info_log) {
46
+    $list_info[$key][5] = ($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
47
+    $list_info[$key][3] = ($info_log[3] == 1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
48 48
 }
49 49
 
50 50
 $parameters = array(
Please login to merge, or discard this patch.
main/gradebook/gradebook_edit_cat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $cat->setGenerateCertificates(false);
63 63
     }
64 64
 
65
-    if ($values['hid_parent_id'] == 0 ) {
65
+    if ($values['hid_parent_id'] == 0) {
66 66
         $cat->set_certificate_min_score($values['certif_min_score']);
67 67
     }
68 68
 
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
     }
82 82
 
83 83
     $cat->save();
84
-    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id().'&'.api_get_cidreq());
84
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat='.$cat->get_parent_id().'&'.api_get_cidreq());
85 85
     exit;
86 86
 }
87 87
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
88 88
 $interbreadcrumb[] = array(
89
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $selectcat . '&' . api_get_cidreq(),
89
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'&'.api_get_cidreq(),
90 90
     'name' => get_lang('Gradebook')
91 91
 );
92 92
 $this_section = SECTION_COURSES;
Please login to merge, or discard this patch.
main/gradebook/gradebook_edit_eval.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     null,
21 21
     'edit_eval_form',
22 22
     null,
23
-    api_get_self() . '?editeval=' . Security::remove_XSS($_GET['editeval'])
23
+    api_get_self().'?editeval='.Security::remove_XSS($_GET['editeval'])
24 24
 );
25 25
 if ($form->validate()) {
26 26
     $values = $form->exportValues();
@@ -45,11 +45,11 @@  discard block
 block discarded – undo
45 45
     }
46 46
     $eval->set_visible($visible);
47 47
     $eval->save();
48
-    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat=' . $eval->get_category_id());
48
+    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat='.$eval->get_category_id());
49 49
     exit;
50 50
 }
51
-$selectcat_inter=isset($_GET['selectcat'])?Security::remove_XSS($_GET['selectcat']):'';
52
-$interbreadcrumb[] = array (
51
+$selectcat_inter = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
52
+$interbreadcrumb[] = array(
53 53
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
54 54
     'name' => get_lang('Gradebook'
55 55
     ));
Please login to merge, or discard this patch.
main/gradebook/gradebook_display_certificate.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @package chamilo.gradebook
7 7
  */
8 8
 require_once '../inc/global.inc.php';
9
-$current_course_tool  = TOOL_GRADEBOOK;
9
+$current_course_tool = TOOL_GRADEBOOK;
10 10
 
11 11
 if (!api_is_student_boss()) {
12 12
     api_protect_course_script(true);
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 ini_set('max_execution_time', 0);
17 17
 
18 18
 //extra javascript functions for in html head:
19
-$htmlHeadXtra[] ="<script>
19
+$htmlHeadXtra[] = "<script>
20 20
 function confirmation() {
21
-	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
21
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete'))." ?\")) {
22 22
 	    return true;
23 23
 	} else {
24 24
 	    return false;
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     api_not_allowed(true);
32 32
 }
33 33
 
34
-$cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
34
+$cat_id = isset($_GET['cat_id']) ? (int) $_GET['cat_id'] : null;
35 35
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
36 36
 $filterOfficialCode = isset($_POST['filter']) ? Security::remove_XSS($_POST['filter']) : null;
37 37
 $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 
73 73
 $course_code = api_get_course_id();
74 74
 
75
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
76
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsCertificates'));
75
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
76
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsCertificates'));
77 77
 
78 78
 $this_section = SECTION_COURSES;
79 79
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         $certificate = new Certificate($_GET['certificate_id']);
86 86
         $result = $certificate->delete(true);
87 87
         Security::clear_token();
88
-        if ($result ==true) {
88
+        if ($result == true) {
89 89
             Display::display_confirmation_message(get_lang('CertificateRemoved'));
90 90
         } else {
91 91
             Display::display_error_message(get_lang('CertificateNotRemoved'));
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 
105 105
     //with this fix the teacher only can view 1 gradebook
106 106
     if (api_is_platform_admin()) {
107
-        $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
107
+        $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
108 108
     } else {
109
-        $stud_id= api_get_user_id();
109
+        $stud_id = api_get_user_id();
110 110
     }
111 111
 
112 112
     $total_weight = $cats[0]->get_weight();
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     $alleval = $cats[0]->get_evaluations($stud_id);
116 116
     $alllink = $cats[0]->get_links($stud_id);
117 117
 
118
-    $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
118
+    $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
119 119
 
120 120
     $total_resource_weight = 0;
121 121
     if (!empty($datagen)) {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                 $newarray[] = array_slice($data, 1);
133 133
             }
134 134
 
135
-            foreach($newarray as $item) {
135
+            foreach ($newarray as $item) {
136 136
                 $total_resource_weight = $total_resource_weight + $item['2'];
137 137
             }
138 138
         }
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 if ($filter === 'true') {
151 151
     echo '<br />';
152 152
     $options = UserManager::getOfficialCodeGrouped();
153
-    $options =array_merge(array('all' => get_lang('All')), $options);
153
+    $options = array_merge(array('all' => get_lang('All')), $options);
154 154
     $form = new FormValidator(
155 155
         'official_code_filter',
156 156
         'POST',
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 echo $filterForm;
198 198
 
199
-if (count($certificate_list) == 0 ) {
199
+if (count($certificate_list) == 0) {
200 200
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
201 201
 } else {
202 202
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn btn-default'));
220 220
             echo $certificates;
221 221
             echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
222
-                    '.Display::return_icon('delete.png',get_lang('Delete')).'
222
+                    '.Display::return_icon('delete.png', get_lang('Delete')).'
223 223
                   </a>';
224 224
             echo '</td></tr>';
225 225
         }
Please login to merge, or discard this patch.
main/gradebook/gradebook_display_summary.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use ChamiloSession as Session;
10 10
 
11 11
 require_once '../inc/global.inc.php';
12
-$current_course_tool  = TOOL_GRADEBOOK;
12
+$current_course_tool = TOOL_GRADEBOOK;
13 13
 
14 14
 api_protect_course_script();
15 15
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     api_not_allowed(true);
22 22
 }
23 23
 
24
-$cat_id = isset($_GET['selectcat']) ? (int)$_GET['selectcat'] : null;
24
+$cat_id = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : null;
25 25
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
26 26
 
27 27
 $userList = CourseManager::get_user_list_from_course_code(
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 
114 114
 $course_code = api_get_course_id();
115 115
 
116
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
117
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsReports'));
116
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
117
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsReports'));
118 118
 
119 119
 $this_section = SECTION_COURSES;
120 120
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 }
132 132
 echo '</div>';
133 133
 
134
-if (count($userList) == 0 ) {
134
+if (count($userList) == 0) {
135 135
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
136 136
 } else {
137 137
     echo '<br /><br /><table class="data_table">';
Please login to merge, or discard this patch.
main/gradebook/gradebook_scoring_system.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     api_not_allowed();
14 14
 }
15 15
 
16
-$htmlHeadXtra[]= '<script>
16
+$htmlHeadXtra[] = '<script>
17 17
 function plusItem(item) {
18 18
     document.getElementById(item).style.display = "inline";
19 19
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
45 45
 );
46 46
 
47 47
 $select_cat = intval($_GET['selectcat']);
48
-$displayscore= ScoreDisplay :: instance();
48
+$displayscore = ScoreDisplay :: instance();
49 49
 $customdisplays = $displayscore->get_custom_score_display_settings();
50 50
 
51
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
51
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
52 52
 $scoreform = new ScoreDisplayForm(
53 53
     'scoring_system_form',
54 54
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@  discard block
 block discarded – undo
57 57
 if ($scoreform->validate()) {
58 58
     $value_export = '';
59 59
     $value_export = $scoreform->exportValues();
60
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
60
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
61 61
     $values = $value_export;
62 62
 
63 63
     // create new array of custom display settings
64 64
     // this loop also checks if all score ranges are unique
65 65
 
66
-    $scoringdisplay= array ();
66
+    $scoringdisplay = array();
67 67
     $ranges_ok = true;
68
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
69
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
70
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
71
-        $setting= array ();
68
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
69
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
70
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
71
+        $setting = array();
72 72
         $setting['score'] = $endscore[$counter];
73 73
         $setting['display'] = $displaytext[$counter];
74 74
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
                     $ranges_ok = false;
78 78
                 }
79 79
             }
80
-            $scoringdisplay[]= $setting;
80
+            $scoringdisplay[] = $setting;
81 81
         }
82 82
     }
83 83
 
84 84
     if (!$ranges_ok) {
85
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
85
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
86 86
         exit;
87 87
     }
88 88
 
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 $this_section = SECTION_COURSES;
103 103
 Display :: display_header(get_lang('ScoreEdit'));
104 104
 
105
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
106
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
105
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
106
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
107 107
 ) {
108 108
     if (isset ($_GET['scoringupdated'])) {
109 109
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);
Please login to merge, or discard this patch.
main/gradebook/gradebook_statistics.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -9,21 +9,21 @@  discard block
 block discarded – undo
9 9
 
10 10
 api_block_anonymous_users();
11 11
 
12
-$eval= Evaluation :: load($_GET['selecteval']);
12
+$eval = Evaluation :: load($_GET['selecteval']);
13 13
 if ($eval[0]->get_category_id() < 0) {
14 14
     // if category id is negative, then the evaluation's origin is a link
15
-    $link= LinkFactory :: get_evaluation_link($eval[0]->get_id());
15
+    $link = LinkFactory :: get_evaluation_link($eval[0]->get_id());
16 16
     $currentcat = Category :: load($link->get_category_id());
17 17
 } else {
18 18
     $currentcat = Category :: load($eval[0]->get_category_id());
19 19
 }
20 20
 
21
-$interbreadcrumb[]= array (
22
-    'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
21
+$interbreadcrumb[] = array(
22
+    'url' => $_SESSION['gradebook_dest'].'?selectcat='.$currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
23 23
 
24 24
 if (api_is_allowed_to_edit()) {
25
-    $interbreadcrumb[]= array (
26
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
25
+    $interbreadcrumb[] = array(
26
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
27 27
         'name' => get_lang('ViewResult')
28 28
     );
29 29
 }
@@ -37,10 +37,10 @@  discard block
 block discarded – undo
37 37
 
38 38
 if (!$displayscore->is_custom() || empty($displays)) {
39 39
     if (api_is_platform_admin() || api_is_course_admin()) {
40
-        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'),false);
40
+        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'), false);
41 41
     }
42 42
 } else {
43
-    $allresults = Result::load(null,null,$eval[0]->get_id());
43
+    $allresults = Result::load(null, null, $eval[0]->get_id());
44 44
     $nr_items = array();
45 45
     foreach ($displays as $itemsdisplay) {
46 46
         $nr_items[$itemsdisplay['display']] = 0;
@@ -68,19 +68,19 @@  discard block
 block discarded – undo
68 68
     }
69 69
 
70 70
     // Generate table
71
-    $stattable= '<table class="data_table" cellspacing="0" cellpadding="3">';
72
-    $stattable .= '<tr><th>' . get_lang('ScoringSystem') . '</th>';
73
-    $stattable .= '<th>' . get_lang('Percentage') . '</th>';
74
-    $stattable .= '<th>' . get_lang('CountUsers') . '</th>';
71
+    $stattable = '<table class="data_table" cellspacing="0" cellpadding="3">';
72
+    $stattable .= '<tr><th>'.get_lang('ScoringSystem').'</th>';
73
+    $stattable .= '<th>'.get_lang('Percentage').'</th>';
74
+    $stattable .= '<th>'.get_lang('CountUsers').'</th>';
75 75
     //$stattable .= '<th>' . get_lang('Statistics') . '</th></tr>';
76
-    $counter=0;
76
+    $counter = 0;
77 77
     foreach ($keys as $key) {
78
-        $bar = ($highest_ratio > 0?($nr_items[$key] / $highest_ratio) * 100:0);
79
-        $stattable .= '<tr class="row_' . ($counter % 2 == 0 ? 'odd' : 'even') . '">';
80
-        $stattable .= '<td width="150">' . $key . '</td>';
78
+        $bar = ($highest_ratio > 0 ? ($nr_items[$key] / $highest_ratio) * 100 : 0);
79
+        $stattable .= '<tr class="row_'.($counter % 2 == 0 ? 'odd' : 'even').'">';
80
+        $stattable .= '<td width="150">'.$key.'</td>';
81 81
 
82 82
         $stattable .= '<td width="550">'.Display::bar_progress($bar).'</td>';
83
-        $stattable .= '<td align="right">' . $nr_items[$key] . '</td>';
83
+        $stattable .= '<td align="right">'.$nr_items[$key].'</td>';
84 84
         $counter++;
85 85
     }
86 86
     $stattable .= '</tr></table>';
Please login to merge, or discard this patch.