Passed
Push — 1.10.x ( 08890a...2189d7 )
by Yannick
116:38 queued 75:46
created
main/exercice/hotspot_lang_conversion.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,10 +18,11 @@
 block discarded – undo
18 18
 	$lang = urldecode($_GET['lang']);
19 19
 	if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
20 20
 		//$lang = str_replace($search,$replace,urldecode($_GET['lang']));
21
-		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
22
-			$hotspot_lang_file .= $lang . '/hotspot.inc.php';
23
-		else
24
-			$hotspot_lang_file .= 'english/hotspot.inc.php';
21
+		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) {
22
+					$hotspot_lang_file .= $lang . '/hotspot.inc.php';
23
+		} else {
24
+					$hotspot_lang_file .= 'english/hotspot.inc.php';
25
+		}
25 26
 	} else {
26 27
 		$hotspot_lang_file .= 'english/hotspot.inc.php';
27 28
 	}
Please login to merge, or discard this patch.
main/exercice/hotspot_savescore.inc.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,12 +15,13 @@
 block discarded – undo
15 15
 $exerciseId   = $objExcercise->selectId();
16 16
 // Save clicking order
17 17
 $answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
18
-if ($_GET['answerId'] == "0") // click is NOT on a hotspot
18
+if ($_GET['answerId'] == "0") {
19
+    // click is NOT on a hotspot
19 20
 {
20 21
 	$hit = 0;
21
-	$answerId = NULL;
22 22
 }
23
-else // user clicked ON a hotspot
23
+	$answerId = NULL;
24
+} else // user clicked ON a hotspot
24 25
 {
25 26
 	$hit = 1;
26 27
 	$answerId = api_substr($_GET['answerId'],22,2);
Please login to merge, or discard this patch.
main/exercice/exercise_admin.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -171,10 +171,11 @@
 block discarded – undo
171 171
     }
172 172
     echo '</div>';
173 173
 
174
-    if ($objExercise->feedback_type == 1)
175
-        Display::display_normal_message(
174
+    if ($objExercise->feedback_type == 1) {
175
+            Display::display_normal_message(
176 176
             get_lang('DirectFeedbackCantModifyTypeQuestion')
177 177
         );
178
+    }
178 179
 
179 180
     if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
180 181
         Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
Please login to merge, or discard this patch.
main/exercice/export/qti2/qti2_classes.php 1 patch
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,11 @@
 block discarded – undo
104 104
     {
105 105
 		$this->answerList = $this->getAnswersList(true);
106 106
 		$type = $this->getQuestionType();
107
-        if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
107
+        if ($type == MCMA) {
108
+            $cardinality = 'multiple';
109
+        } else {
110
+            $cardinality = 'single';
111
+        }
108 112
 
109 113
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
110 114
 
Please login to merge, or discard this patch.
main/exercice/export/aiken/aiken_import.inc.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@  discard block
 block discarded – undo
10 10
 /**
11 11
  * Security check
12 12
  */
13
-if (count(get_included_files()) == 1)
13
+if (count(get_included_files()) == 1) {
14 14
     die('---');
15
+}
15 16
 
16 17
 /**
17 18
  * Creates a temporary directory
@@ -21,8 +22,9 @@  discard block
 block discarded – undo
21 22
  * @return string
22 23
  */
23 24
 function tempdir($dir, $prefix = 'tmp', $mode = 0777) {
24
-    if (substr($dir, -1) != '/')
25
-        $dir .= '/';
25
+    if (substr($dir, -1) != '/') {
26
+            $dir .= '/';
27
+    }
26 28
 
27 29
     do {
28 30
         $path = $dir . $prefix . mt_rand(0, 9999999);
Please login to merge, or discard this patch.
main/exercice/export/aiken/aiken_classes.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,9 @@
 block discarded – undo
7 7
  * @package chamilo.exercise
8 8
  */
9 9
 
10
-if ( count( get_included_files() ) == 1 ) die( '---' );
10
+if ( count( get_included_files() ) == 1 ) {
11
+    die( '---' );
12
+}
11 13
 
12 14
 if (!function_exists('mime_content_type')) {
13 15
 	function mime_content_type($filename) {
Please login to merge, or discard this patch.
main/exercice/export/scorm/scorm_classes.php 1 patch
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -327,8 +327,7 @@  discard block
 block discarded – undo
327 327
 		if($this->response == 'TRUE')
328 328
 		{
329 329
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
330
-		}
331
-		else
330
+		} else
332 331
 		{
333 332
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
334 333
 		}
@@ -471,8 +470,11 @@  discard block
 block discarded – undo
471 470
 
472 471
 				$s.='</select>&nbsp;&nbsp;</td>'."\n";
473 472
 				$s.='<td width="40%" valign="top">';
474
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
475
-					else $s.='&nbsp;';
473
+				if(isset($Select[$cpt2])) {
474
+				    $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
475
+				} else {
476
+					    $s.='&nbsp;';
477
+					}
476 478
 				$s.="</td>\n</tr>\n";
477 479
 
478 480
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
@@ -577,8 +579,7 @@  discard block
 block discarded – undo
577 579
 			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
578 580
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
579 581
 	    	$header .= $jstmpw;
580
-		}
581
-		else
582
+		} else
582 583
 		{
583 584
 			$header = '';
584 585
 			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -885,8 +886,7 @@  discard block
 block discarded – undo
885 886
                 . $this->end_body()
886 887
                 . $this->end_page();
887 888
             return $res;
888
-        }
889
-        else
889
+        } else
890 890
         {
891 891
             return array($js,$html);
892 892
         }
Please login to merge, or discard this patch.
main/exercice/question.class.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -607,10 +607,11 @@
 block discarded – undo
607 607
             $current_width = $current_image_size['width'];
608 608
             $current_height = $current_image_size['height'];
609 609
 
610
-            if ($current_width < $Max && $current_height < $Max)
611
-                return true;
612
-            elseif ($current_height == "")
613
-                return false;
610
+            if ($current_width < $Max && $current_height < $Max) {
611
+                            return true;
612
+            } elseif ($current_height == "") {
613
+                            return false;
614
+            }
614 615
 
615 616
             // Resize according to height.
616 617
             if ($Dimension == "height") {
Please login to merge, or discard this patch.
main/exercice/exercise_submit.php 1 patch
Braces   +35 added lines, -14 removed lines patch added patch discarded remove patch
@@ -239,8 +239,9 @@  discard block
 block discarded – undo
239 239
 		}
240 240
 
241 241
 		echo $attempt_html;
242
-		if ($origin != 'learnpath')
243
-			Display :: display_footer();
242
+		if ($origin != 'learnpath') {
243
+					Display :: display_footer();
244
+		}
244 245
 		exit;
245 246
 	}
246 247
 }
@@ -260,7 +261,9 @@  discard block
 block discarded – undo
260 261
 $clock_expired_time = null;
261 262
 
262 263
 if (empty($exercise_stat_info)) {
263
-    if ($debug)  error_log('5  $exercise_stat_info is empty ');
264
+    if ($debug) {
265
+        error_log('5  $exercise_stat_info is empty ');
266
+    }
264 267
 	$total_weight = 0;
265 268
 	$questionList = $objExercise->get_validated_question_list();
266 269
 	foreach ($questionList as $question_id) {
@@ -271,11 +274,17 @@  discard block
 block discarded – undo
271 274
 	if ($time_control) {
272 275
 		$expected_time = $current_timestamp + $total_seconds;
273 276
 
274
-		if ($debug)  error_log('5.1. $current_timestamp '.$current_timestamp);
275
-		if ($debug)  error_log('5.2. $expected_time '.$expected_time);
277
+		if ($debug) {
278
+		    error_log('5.1. $current_timestamp '.$current_timestamp);
279
+		}
280
+		if ($debug) {
281
+		    error_log('5.2. $expected_time '.$expected_time);
282
+		}
276 283
 
277 284
 		$clock_expired_time 	= api_get_utc_datetime($expected_time);
278
-		if ($debug) error_log('5.3. $expected_time '.$clock_expired_time);
285
+		if ($debug) {
286
+		    error_log('5.3. $expected_time '.$clock_expired_time);
287
+		}
279 288
 
280 289
 		//Sessions  that contain the expired time
281 290
 		$_SESSION['expired_time'][$current_expired_time_key] 	 = $clock_expired_time;
@@ -295,8 +304,10 @@  discard block
 block discarded – undo
295 304
         $learnpath_item_id,
296 305
         $learnpath_item_view_id
297 306
     );
298
-    if ($debug)  error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
299
-} else {
307
+    if ($debug) {
308
+        error_log("5.5  exercise_stat_info[] exists getting exe_id $exe_id");
309
+    }
310
+    } else {
300 311
 	$exe_id = $exercise_stat_info['exe_id'];
301 312
     // Remember last question id position.
302 313
     $isFirstTime = Session::read('firstTime');
@@ -318,8 +329,10 @@  discard block
 block discarded – undo
318 329
         }
319 330
     }
320 331
 
321
-    if ($debug)  error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
322
-}
332
+    if ($debug) {
333
+        error_log("5  exercise_stat_info[] exists getting exe_id $exe_id ");
334
+    }
335
+    }
323 336
 
324 337
 // Array to check in order to block the chat
325 338
 ExerciseLib::create_chat_exercise_session($exe_id);
@@ -346,9 +359,15 @@  discard block
 block discarded – undo
346 359
  * If the expired time is major that zero(0) then the expired time is compute on this time.
347 360
  */
348 361
 if ($time_control) {
349
-	if ($debug) error_log('7.1. Time control is enabled');
350
-	if ($debug) error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
351
-	if ($debug) error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
362
+	if ($debug) {
363
+	    error_log('7.1. Time control is enabled');
364
+	}
365
+	if ($debug) {
366
+	    error_log('7.2. $current_expired_time_key  '.$current_expired_time_key);
367
+	}
368
+	if ($debug) {
369
+	    error_log('7.3. $_SESSION[expired_time][$current_expired_time_key]  '.$_SESSION['expired_time'][$current_expired_time_key]);
370
+	}
352 371
 
353 372
     if (!isset($_SESSION['expired_time'][$current_expired_time_key])) {
354 373
         //Timer - Get expired_time for a student
@@ -436,7 +455,9 @@  discard block
 block discarded – undo
436 455
 	}
437 456
 }
438 457
 
439
-if ($debug) error_log('8. Question list loaded '.print_r($questionList, 1));
458
+if ($debug) {
459
+    error_log('8. Question list loaded '.print_r($questionList, 1));
460
+}
440 461
 
441 462
 //Real question count
442 463
 $question_count = 0;
Please login to merge, or discard this patch.