Passed
Push — 1.10.x ( d9a04b...aeb152 )
by Yannick
123:06 queued 74:04
created
main/exercice/Draggable.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
                 for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
64 64
                     if ($answer->isCorrect($i)) {
65 65
                         $nb_matches++;
66
-                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
67
-                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
66
+                        $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i);
67
+                        $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1);
68 68
                         $answerInfo = $answer->getAnswerByAutoId($answer->correct[$i]);
69
-                        $defaults['matches[' . $nb_matches . ']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
69
+                        $defaults['matches['.$nb_matches.']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
70 70
                     } else {
71 71
                         $nb_options++;
72
-                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
72
+                        $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i);
73 73
                     }
74 74
                 }
75 75
             }
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
         $html = '<table class="table table-striped table-hover">
93 93
             <thead>
94 94
                 <tr>
95
-                    <th width="85%">' . get_lang('Answer') . '</th>
96
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
97
-                    <th width="10">' . get_lang('Weighting') . '</th>
95
+                    <th width="85%">' . get_lang('Answer').'</th>
96
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
97
+                    <th width="10">' . get_lang('Weighting').'</th>
98 98
                 </tr>
99 99
             </thead>
100 100
             <tbody>';
@@ -189,9 +189,9 @@  discard block
 block discarded – undo
189 189
         for ($i = 1; $i <= $nb_matches; ++$i) {
190 190
             $position++;
191 191
 
192
-            $answer = $form->getSubmitValue('answer[' . $i . ']');
193
-            $matches = $form->getSubmitValue('matches[' . $i . ']');
194
-            $weighting = $form->getSubmitValue('weighting[' . $i . ']');
192
+            $answer = $form->getSubmitValue('answer['.$i.']');
193
+            $matches = $form->getSubmitValue('matches['.$i.']');
194
+            $weighting = $form->getSubmitValue('weighting['.$i.']');
195 195
             $this->weighting += $weighting;
196 196
             $objAnswer->createAnswer(
197 197
                 $answer,
@@ -216,10 +216,10 @@  discard block
 block discarded – undo
216 216
     public function return_header($feedback_type = null, $counter = null, $score = null)
217 217
     {
218 218
         $header = parent::return_header($feedback_type, $counter, $score);
219
-        $header .= '<table class="' . $this->question_table_class . '">
219
+        $header .= '<table class="'.$this->question_table_class.'">
220 220
             <tr>
221
-                <th>' . get_lang('ElementList') . '</th>
222
-                <th>' . get_lang('Status') . '</th>
221
+                <th>' . get_lang('ElementList').'</th>
222
+                <th>' . get_lang('Status').'</th>
223 223
             </tr>';
224 224
 
225 225
         return $header;
Please login to merge, or discard this patch.
main/exercice/exercise_admin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 require_once '../inc/global.inc.php';
14 14
 $this_section = SECTION_COURSES;
15 15
 
16
-if (!api_is_allowed_to_edit(null,true)) {
16
+if (!api_is_allowed_to_edit(null, true)) {
17 17
     api_not_allowed(true);
18 18
 }
19 19
 
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
         $gradebook = $_SESSION['gradebook'];
132 132
     }
133 133
 
134
-    if (!empty($gradebook) && $gradebook=='view') {
135
-        $interbreadcrumb[]= array (
134
+    if (!empty($gradebook) && $gradebook == 'view') {
135
+        $interbreadcrumb[] = array(
136 136
             'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
137 137
             'name' => get_lang('ToolGradebook')
138 138
         );
@@ -152,19 +152,19 @@  discard block
 block discarded – undo
152 152
     echo '<div class="actions">';
153 153
 
154 154
     if ($objExercise->id != 0) {
155
-        echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' .
155
+        echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">'.
156 156
             Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
157 157
     } else {
158
-        if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
159
-            if (!empty($_POST['lp_id'])){
158
+        if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])) {
159
+            if (!empty($_POST['lp_id'])) {
160 160
                 $lp_id = intval($_POST['lp_id']);
161 161
                 //TODO:this remains to be implemented after press the first post
162 162
             } else {
163 163
                 $lp_id = intval($_GET['lp_id']);
164 164
             }
165
-            echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'',ICON_SIZE_MEDIUM)."</a>";
165
+            echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"), '', ICON_SIZE_MEDIUM)."</a>";
166 166
         } else {
167
-            echo '<a href="exercise.php?'.api_get_cidreq().'">' .
167
+            echo '<a href="exercise.php?'.api_get_cidreq().'">'.
168 168
                 Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).
169 169
                 '</a>';
170 170
         }
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             get_lang('DirectFeedbackCantModifyTypeQuestion')
177 177
         );
178 178
 
179
-    if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
179
+    if (api_get_setting('search_enabled') == 'true' && !extension_loaded('xapian')) {
180 180
         Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
181 181
     }
182 182
 
Please login to merge, or discard this patch.
main/exercice/exercise_reminder.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 // notice for unauthorized people.
15 15
 api_protect_course_script(true);
16 16
 
17
-if ($debug>0) {
17
+if ($debug > 0) {
18 18
     error_log('Entered exercise_result.php: '.print_r($_POST, 1));
19 19
 }
20 20
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 if (isset($_SESSION['exe_id'])) {
94 94
     $exe_id = intval($_SESSION['exe_id']);
95 95
 }
96
-$exercise_stat_info	= $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
96
+$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
97 97
 if (!empty($exercise_stat_info['data_tracking'])) {
98 98
     $question_list = explode(',', $exercise_stat_info['data_tracking']);
99 99
 }
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 $remind_list = $exercise_stat_info['questions_to_check'];
174 174
 $remind_list = explode(',', $remind_list);
175 175
 
176
-$exercise_result    = array();
176
+$exercise_result = array();
177 177
 
178 178
 foreach ($attempt_list as $question_id => $options) {
179 179
     foreach ($options as $item) {
@@ -204,10 +204,10 @@  discard block
 block discarded – undo
204 204
     unset($objQuestionTmp);
205 205
 
206 206
     // creates a temporary Question object
207
-    $objQuestionTmp        = Question :: read($questionId);
207
+    $objQuestionTmp = Question :: read($questionId);
208 208
 
209 209
     $quesId         = $objQuestionTmp->selectId();
210
-    $check_id 		= 'remind_list['.$questionId.']';
210
+    $check_id = 'remind_list['.$questionId.']';
211 211
     $attributes     = array('id'=>$check_id, 'onclick'=>"save_remind_item(this, '$questionId');");
212 212
 
213 213
     if (in_array($questionId, $remind_list)) {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 echo Display::div($table, array('class'=>'span10'));
240 240
 
241 241
 $exercise_actions = Display::url(get_lang('EndTest'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-warning'));
242
-$exercise_actions .=  '&nbsp;'.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn btn-success'));
242
+$exercise_actions .= '&nbsp;'.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();', 'class'=>'btn btn-success'));
243 243
 
244 244
 echo Display::div('', array('class'=>'clear'));
245 245
 echo Display::div($exercise_actions, array('class'=>'form-actions'));
Please login to merge, or discard this patch.
main/exercice/exercise_result.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 
60 60
 $gradebook = '';
61 61
 if (isset($_SESSION['gradebook'])) {
62
-	$gradebook=	$_SESSION['gradebook'];
62
+	$gradebook = $_SESSION['gradebook'];
63 63
 }
64
-if (!empty($gradebook) && $gradebook=='view') {
64
+if (!empty($gradebook) && $gradebook == 'view') {
65 65
     $interbreadcrumb[] = array(
66 66
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
67 67
         'name' => get_lang('ToolGradebook'),
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
     "name" => get_lang('Exercises'),
76 76
 );
77 77
 
78
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
79
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
78
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
79
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
80 80
 
81 81
 if ($origin != 'learnpath') {
82 82
 	// So we are not in learnpath tool
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 $max_score = $objExercise->get_max_score();
156 156
 
157
-Display :: display_normal_message(get_lang('Saved').'<br />',false);
157
+Display :: display_normal_message(get_lang('Saved').'<br />', false);
158 158
 
159 159
 // Display and save questions
160 160
 ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true);
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 } else {
185 185
 	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
186 186
 	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
187
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
187
+	$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"';
188 188
 
189 189
     if (api_is_allowed_to_session_edit()) {
190 190
         Session::erase('objExercise');
Please login to merge, or discard this patch.
main/exercice/exercise_result.class.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         $course_id = api_get_course_int_id();
60 60
         $user_id = intval($user_id);
61 61
         $sessionId = api_get_session_id();
62
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
62
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
63 63
         $exercise_id = intval($exercise_id);
64 64
 
65 65
         if (!empty($exercise_id)) {
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
93 93
                     ce.active <>-1";
94 94
 		} else {
95
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
95
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
96 96
 			// get only this user's results
97
-            $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
97
+            $sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
98 98
                     official_code,
99 99
                     ce.title as extitle,
100 100
                     te.exe_result as exresult,
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$results = array();
125 125
 		$resx = Database::query($sql);
126 126
         $bestAttemptPerUser = array();
127
-		while ($rowx = Database::fetch_array($resx,'ASSOC')) {
127
+		while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
128 128
             if ($this->onlyBestAttempts) {
129 129
                 if (!isset($bestAttemptPerUser[$rowx['excruid']])) {
130 130
                     $bestAttemptPerUser[$rowx['excruid']] = $rowx;
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
 				$return[$i] = array();
194 194
 				if (empty($user_id)) {
195
-                    $return[$i]['official_code']   = $result['official_code'];
195
+                    $return[$i]['official_code'] = $result['official_code'];
196 196
                     if (api_is_western_name_order()) {
197 197
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
198 198
                         $return[$i]['last_name']    = $results[$i]['userpart2'];
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
                         $isWestern = api_is_western_name_order();
237 237
 
238 238
                         if (empty($user_id)) {
239
-                            $return[$i]['official_code']   = $student['official_code'];
239
+                            $return[$i]['official_code'] = $student['official_code'];
240 240
                             if ($isWestern) {
241 241
                                 $return[$i]['first_name']   = $student['firstname'];
242 242
                                 $return[$i]['last_name']    = $student['lastname'];
@@ -289,22 +289,22 @@  discard block
 block discarded – undo
289 289
 		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
290 290
 
291 291
 		$filename = 'exercise_results_'.date('YmdGis').'.csv';
292
-		if(!empty($user_id)) {
292
+		if (!empty($user_id)) {
293 293
 			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
294 294
 		}
295 295
 		$data = '';
296 296
         if (api_is_western_name_order()) {
297
-            if(!empty($this->results[0]['first_name'])) {
297
+            if (!empty($this->results[0]['first_name'])) {
298 298
                 $data .= get_lang('FirstName').';';
299 299
             }
300
-            if(!empty($this->results[0]['last_name'])) {
300
+            if (!empty($this->results[0]['last_name'])) {
301 301
                 $data .= get_lang('LastName').';';
302 302
             }
303 303
         } else {
304
-            if(!empty($this->results[0]['last_name'])) {
304
+            if (!empty($this->results[0]['last_name'])) {
305 305
                 $data .= get_lang('LastName').';';
306 306
             }
307
-            if(!empty($this->results[0]['first_name'])) {
307
+            if (!empty($this->results[0]['first_name'])) {
308 308
                 $data .= get_lang('FirstName').';';
309 309
             }
310 310
         }
@@ -318,17 +318,17 @@  discard block
 block discarded – undo
318 318
 
319 319
 		if ($export_user_fields) {
320 320
 			//show user fields section with a big th colspan that spans over all fields
321
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
321
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
322 322
 			$num = count($extra_user_fields);
323
-			foreach($extra_user_fields as $field) {
324
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
323
+			foreach ($extra_user_fields as $field) {
324
+				$data .= '"'.str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
325 325
 			}
326 326
 		}
327 327
 
328 328
 		$data .= get_lang('Title').';';
329 329
 		$data .= get_lang('StartDate').';';
330 330
         $data .= get_lang('EndDate').';';
331
-        $data .= get_lang('Duration'). ' ('.get_lang('MinMinutes').') ;';
331
+        $data .= get_lang('Duration').' ('.get_lang('MinMinutes').') ;';
332 332
 		$data .= get_lang('Score').';';
333 333
 		$data .= get_lang('Total').';';
334 334
         $data .= get_lang('Status').';';
@@ -340,37 +340,37 @@  discard block
 block discarded – undo
340 340
 		foreach ($this->results as $row) {
341 341
 
342 342
             if (api_is_western_name_order()) {
343
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
344
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
343
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
344
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
345 345
             } else {
346
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
347
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
346
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
347
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
348 348
             }
349 349
 
350 350
             if ($officialCodeInList) {
351 351
                 $data .= $row['official_code'].';';
352 352
             }
353 353
 
354
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
355
-            $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
354
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
355
+            $data .= str_replace("\r\n", '  ', implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
356 356
 
357 357
 			if ($export_user_fields) {
358 358
 				//show user fields data, if any, for this user
359
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
360
-				foreach($user_fields_values as $value) {
361
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
359
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
360
+				foreach ($user_fields_values as $value) {
361
+					$data .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
362 362
 				}
363 363
 			}
364 364
 
365
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
366
-			$data .= str_replace("\r\n",'  ',$row['start_date']).';';
367
-            $data .= str_replace("\r\n",'  ',$row['end_date']).';';
368
-            $data .= str_replace("\r\n",'  ',$row['duration']).';';
369
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
370
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
371
-            $data .= str_replace("\r\n",'  ',$row['status']).';';
372
-            $data .= str_replace("\r\n",'  ',$row['lp_name']).';';
373
-            $data .= str_replace("\r\n",'  ',$row['is_user_subscribed']).';';
365
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
366
+			$data .= str_replace("\r\n", '  ', $row['start_date']).';';
367
+            $data .= str_replace("\r\n", '  ', $row['end_date']).';';
368
+            $data .= str_replace("\r\n", '  ', $row['duration']).';';
369
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
370
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
371
+            $data .= str_replace("\r\n", '  ', $row['status']).';';
372
+            $data .= str_replace("\r\n", '  ', $row['lp_name']).';';
373
+            $data .= str_replace("\r\n", '  ', $row['is_user_subscribed']).';';
374 374
 			$data .= "\n";
375 375
 		}
376 376
 
@@ -434,14 +434,14 @@  discard block
 block discarded – undo
434 434
 
435 435
 		if ($with_column_user) {
436 436
             if (api_is_western_name_order()) {
437
-    			$worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
437
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
438 438
     			$column++;
439
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
439
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
440 440
                 $column++;
441 441
             } else {
442
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
442
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
443 443
                 $column++;
444
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
444
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
445 445
                 $column++;
446 446
             }
447 447
 
@@ -458,11 +458,11 @@  discard block
 block discarded – undo
458 458
 
459 459
 		if ($export_user_fields) {
460 460
 			//show user fields section with a big th colspan that spans over all fields
461
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
461
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
462 462
 
463 463
 			//show the fields names for user fields
464 464
 			foreach ($extra_user_fields as $field) {
465
-				$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
465
+				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
466 466
 				$column++;
467 467
 			}
468 468
 		}
@@ -491,39 +491,39 @@  discard block
 block discarded – undo
491 491
 
492 492
             if ($with_column_user) {
493 493
                 if (api_is_western_name_order()) {
494
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
494
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
495 495
                     $column++;
496
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
496
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
497 497
                     $column++;
498 498
                 } else {
499
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
499
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
500 500
                     $column++;
501
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
501
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
502 502
                     $column++;
503 503
                 }
504 504
 
505 505
                 if ($officialCodeInList === 'true') {
506
-                    $worksheet->SetCellValueByColumnAndRow($line, $column,api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
506
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
507 507
                     $column++;
508 508
                 }
509 509
 
510
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
510
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
511 511
                 $column++;
512 512
 			}
513 513
 
514
-            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
514
+            $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
515 515
             $column++;
516 516
 
517 517
 			if ($export_user_fields) {
518 518
 				//show user fields data, if any, for this user
519
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
520
-				foreach($user_fields_values as $value) {
521
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
519
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
520
+				foreach ($user_fields_values as $value) {
521
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
522 522
 					$column++;
523 523
 				}
524 524
 			}
525 525
 
526
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
526
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
527 527
 			$column++;
528 528
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
529 529
             $column++;
Please login to merge, or discard this patch.
main/exercice/addlimits.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -51,24 +51,24 @@  discard block
 block discarded – undo
51 51
     $objExercise = $_SESSION['objExercise'];
52 52
 }
53 53
 $exercise_id = intval($_GET['exercise_id']);
54
-$is_allowedToEdit=$is_courseAdmin;
54
+$is_allowedToEdit = $is_courseAdmin;
55 55
 
56
-if (isset($_SESSION['gradebook'])){
57
-	$gradebook=	$_SESSION['gradebook'];
56
+if (isset($_SESSION['gradebook'])) {
57
+	$gradebook = $_SESSION['gradebook'];
58 58
 }
59 59
 
60
-if (!empty($gradebook) && $gradebook=='view') {
61
-	$interbreadcrumb[]= array (
60
+if (!empty($gradebook) && $gradebook == 'view') {
61
+	$interbreadcrumb[] = array(
62 62
 			'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
63 63
 			'name' => get_lang('ToolGradebook')
64 64
 		);
65 65
 }
66
-$nameTools=get_lang('Exercises');
66
+$nameTools = get_lang('Exercises');
67 67
 $interbreadcrumb[] = array(
68 68
     "url" => "exercise.php",
69 69
     "name" => get_lang('Exercises'),
70 70
 );
71
-Display::display_header($nameTools,"Exercises");
71
+Display::display_header($nameTools, "Exercises");
72 72
 
73 73
 if (isset($_POST['ok'])) {
74 74
 	$message = get_lang('TestLimitsAdded');
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
  */
141 141
 if (isset($_POST['ok'])) {
142 142
 	$exercise_id = intval($_POST['exe_id']);
143
-	if ($_POST['limit']==1) {
143
+	if ($_POST['limit'] == 1) {
144 144
 		$minutes = intval($_POST['minutes']);
145 145
 		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
146 146
 		Database::query($query);
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 		Database::query($query);
150 150
 	}
151 151
 
152
-	if ($_POST['attempt']==1) {
152
+	if ($_POST['attempt'] == 1) {
153 153
 		$attempts = intval($_POST['attempts']);
154 154
 		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
155 155
 		Database::query($query);
Please login to merge, or discard this patch.
main/exercice/upload_exercise.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
 require_once '../inc/global.inc.php';
16 16
 
17
-require_once api_get_path(LIBRARY_PATH) . 'pear/excelreader/reader.php';
17
+require_once api_get_path(LIBRARY_PATH).'pear/excelreader/reader.php';
18 18
 
19 19
 // Security check
20 20
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -59,14 +59,14 @@  discard block
 block discarded – undo
59 59
 function lp_upload_quiz_actions()
60 60
 {
61 61
     $return = '<a href="exercise.php?'.api_get_cidReq().'">'.
62
-        Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
62
+        Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
63 63
     return $return;
64 64
 }
65 65
 
66 66
 function lp_upload_quiz_secondary_actions()
67 67
 {
68
-    $return = '<a href="exercise_report.php?' . api_get_cidreq() . '">' .
69
-        Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . '</a>';
68
+    $return = '<a href="exercise_report.php?'.api_get_cidreq().'">'.
69
+        Display :: return_icon('reporting32.png', get_lang('Tracking')).get_lang('Tracking').'</a>';
70 70
     return $return;
71 71
 }
72 72
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     $table->setHeaderContents(0, 1, '#');
105 105
 
106 106
     $row = 1;
107
-    foreach ($tableList as $key => $label ) {
107
+    foreach ($tableList as $key => $label) {
108 108
         $table->setCellContents($row, 0, $label);
109 109
         $table->setCellContents($row, 1, $key);
110 110
         $row++;
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
                                     $comment = $feedback_true_list[$i][2];
444 444
                                 } else {
445 445
                                     $comment = $feedback_false_list[$i][2];
446
-                                    $floatVal = (float)$answer_data[3];
446
+                                    $floatVal = (float) $answer_data[3];
447 447
                                     if (is_numeric($floatVal)) {
448 448
                                         $score = $answer_data[3];
449 449
                                     }
Please login to merge, or discard this patch.
main/exercice/export/exercise_import.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -39,22 +39,22 @@  discard block
 block discarded – undo
39 39
 // EXECUTE COMMAND
40 40
 //----------------------------------
41 41
 
42
-$cmd = (isset($_REQUEST['cmd'])? $_REQUEST['cmd'] : 'show_import');
42
+$cmd = (isset($_REQUEST['cmd']) ? $_REQUEST['cmd'] : 'show_import');
43 43
 
44 44
 switch ($cmd) {
45 45
     case 'show_import' :
46 46
     {
47 47
         $display = '<p>'
48
-        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.') . '<br>'
48
+        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.').'<br>'
49 49
         .            '</p>'
50 50
         .            '<form enctype="multipart/form-data" action="" method="post">'
51 51
         .            '<input name="cmd" type="hidden" value="import" />'
52 52
         .            '<input name="uploadedExercise" type="file" /><br><br>'
53
-        .            get_lang('Import exercise') . ' : '
54
-        .            '<input value="' . get_lang('Ok') . '" type="submit" /> '
55
-        .            claro_html_button( $_SERVER['PHP_SELF'], get_lang('Cancel'))
53
+        .            get_lang('Import exercise').' : '
54
+        .            '<input value="'.get_lang('Ok').'" type="submit" /> '
55
+        .            claro_html_button($_SERVER['PHP_SELF'], get_lang('Cancel'))
56 56
         .            '<br><br>'
57
-        .            '<small>' . get_lang('Max file size') . ' :  2&nbsp;MB</small>'
57
+        .            '<small>'.get_lang('Max file size').' :  2&nbsp;MB</small>'
58 58
         .            '</form>';
59 59
     }
60 60
     break;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 // DISPLAY
86 86
 //----------------------------------
87 87
 
88
-include api_get_path(INCLUDE_PATH) . '/header.inc.php';
88
+include api_get_path(INCLUDE_PATH).'/header.inc.php';
89 89
 
90 90
 //display title
91 91
 
@@ -114,5 +114,5 @@  discard block
 block discarded – undo
114 114
 
115 115
 //footer display
116 116
 
117
-include api_get_path(INCLUDE_PATH) . '/footer.inc.php';
117
+include api_get_path(INCLUDE_PATH).'/footer.inc.php';
118 118
 ?>
Please login to merge, or discard this patch.
main/exercice/export/qti2/qti2_export.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Code
10 10
  */
11
-require dirname(__FILE__) . '/qti2_classes.php';
11
+require dirname(__FILE__).'/qti2_classes.php';
12 12
 /**
13 13
  * Classes
14 14
 */
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
      {
39 39
         $this->question = $question;
40 40
         $this->answer = $this->question->setAnswer();
41
-        $this->questionIdent = "QST_" . $question->id ;
41
+        $this->questionIdent = "QST_".$question->id;
42 42
      }
43 43
 
44 44
      /**
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
       */
74 74
      function start_item_body()
75 75
      {
76
-        return '  <itemBody>' . "\n";
76
+        return '  <itemBody>'."\n";
77 77
      }
78 78
 
79 79
      /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
       function add_response_processing()
94 94
       {
95
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
95
+          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
96 96
       }
97 97
 
98 98
      /**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         $head = $foot = "";
109 109
 
110 110
         if ($standalone) {
111
-            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
111
+            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'."\n";
112 112
         }
113 113
         //TODO understand why answer might be a non-object sometimes
114 114
         if (!is_object($this->answer)) {
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
     function start_section()
166 166
     {
167
-        $out = '<section ident="EXO_' . $this->exercise->selectId() . '" title="' .cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())) . '">' . "\n";
167
+        $out = '<section ident="EXO_'.$this->exercise->selectId().'" title="'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'">'."\n";
168 168
         return $out;
169 169
     }
170 170
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
             // return exercise duration in ISO8601 format.
181 181
             $minutes = floor($max_time / 60);
182 182
             $seconds = $max_time % 60;
183
-            return '<duration>PT' . $minutes . 'M' . $seconds . "S</duration>\n";
183
+            return '<duration>PT'.$minutes.'M'.$seconds."S</duration>\n";
184 184
         } else {
185 185
             return '';
186 186
         }
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
     function export_presentation()
194 194
     {
195 195
         $out = "<presentation_material><flow_mat><material>\n"
196
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
196
+             . "  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
197 197
              . "</material></flow_mat></presentation_material>\n";
198 198
         return $out;
199 199
     }
@@ -207,14 +207,14 @@  discard block
 block discarded – undo
207 207
     {
208 208
         $out = '';
209 209
         if ($n = $this->exercise->getShuffle()) {
210
-            $out.= "<selection_ordering>"
210
+            $out .= "<selection_ordering>"
211 211
                  . "  <selection>\n"
212
-                 . "    <selection_number>" . $n . "</selection_number>\n"
212
+                 . "    <selection_number>".$n."</selection_number>\n"
213 213
                  . "  </selection>\n"
214 214
                  . '  <order order_type="Random" />'
215 215
                  . "\n</selection_ordering>\n";
216 216
         } else {
217
-            $out.= '<selection_ordering sequence_type="Normal">' . "\n"
217
+            $out .= '<selection_ordering sequence_type="Normal">'."\n"
218 218
                  . "  <selection />\n"
219 219
                  . "</selection_ordering>\n";
220 220
         }
@@ -246,8 +246,8 @@  discard block
 block discarded – undo
246 246
     {
247 247
         $head = $foot = "";
248 248
         if ($standalone) {
249
-            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
250
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
249
+            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n"
250
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
251 251
                   . "<questestinterop>\n";
252 252
             $foot = "</questestinterop>\n";
253 253
         }
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
      {
309 309
         $this->question = $question;
310 310
         $this->answer = $question->answer;
311
-        $this->questionIdent = "QST_" . $question->selectId() ;
311
+        $this->questionIdent = "QST_".$question->selectId();
312 312
      }
313 313
 
314 314
      /**
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
       */
321 321
       function start_item()
322 322
       {
323
-        return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
323
+        return '<item title="'.cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())).'" ident="'.$this->questionIdent.'">'."\n";
324 324
       }
325 325
 
326 326
       /**
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
       */
344 344
      function start_presentation()
345 345
      {
346
-        return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
347
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
346
+        return '<presentation label="'.$this->questionIdent.'"><flow>'."\n"
347
+             . '<material><mattext>'.formatExerciseQtiDescription($this->question->selectDescription())."</mattext></material>\n";
348 348
      }
349 349
 
350 350
      /**
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
       */
365 365
      function start_processing()
366 366
      {
367
-        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
367
+        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>'."\n";
368 368
      }
369 369
 
370 370
      /**
@@ -392,8 +392,8 @@  discard block
 block discarded – undo
392 392
         $head = $foot = "";
393 393
 
394 394
         if ($standalone) {
395
-            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
396
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
395
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
396
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
397 397
                   . "<questestinterop>\n";
398 398
             $foot = "</questestinterop>\n";
399 399
         }
@@ -447,9 +447,9 @@  discard block
 block discarded – undo
447 447
     $question->type = $qst->type;
448 448
     $question->question = $qst->question;
449 449
     $question->description = $qst->description;
450
-	$question->weighting=$qst->weighting;
451
-	$question->position=$qst->position;
452
-	$question->picture=$qst->picture;
450
+	$question->weighting = $qst->weighting;
451
+	$question->position = $qst->position;
452
+	$question->picture = $qst->picture;
453 453
     $ims = new ImsAssessmentItem($question);
454 454
 
455 455
     return $ims->export($standalone);
Please login to merge, or discard this patch.