Completed
Pull Request — 1.11.x (#1293)
by José
387:57 queued 349:55
created
src/Chamilo/ThemeBundle/EventListener/SidebarSetupMenuDemoListener.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -250,8 +250,7 @@
 block discarded – undo
250 250
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
251 251
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
252 252
                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
253
-            }
254
-            else {
253
+            } else {
255 254
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));
256 255
             }
257 256
             break;
Please login to merge, or discard this patch.
main/admin/user_update_import.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -454,7 +454,10 @@
 block discarded – undo
454 454
     <blockquote>
455 455
         <pre>
456 456
             <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
457
-            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
457
+            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
458
+    echo implode(';', $list_reponse).';';
459
+}
460
+?></span>xxx1|xxx2|xxx3;1;<br />
458 461
         </pre>
459 462
     </blockquote>
460 463
 <p><?php
Please login to merge, or discard this patch.
main/inc/lib/exercise_show_functions.lib.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -434,8 +434,7 @@
 block discarded – undo
434 434
             } else {
435 435
                 echo $question->options[2];
436 436
             }
437
-        }
438
-        else {
437
+        } else {
439 438
             echo '-';
440 439
         }
441 440
         ?>
Please login to merge, or discard this patch.
main/dropbox/dropbox_functions.inc.php 1 patch
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -734,7 +734,9 @@  discard block
 block discarded – undo
734 734
             WHERE user_id='$id'";
735 735
     $result = Database::query($sql);
736 736
     $res = Database::fetch_array($result);
737
-    if (!$res) return false;
737
+    if (!$res) {
738
+        return false;
739
+    }
738 740
 
739 741
     return stripslashes($res['username']);
740 742
 }
@@ -810,10 +812,15 @@  discard block
 block discarded – undo
810 812
             ";
811 813
     $result = Database::query($sql);
812 814
 
813
-    if (!($res = Database::fetch_array($result)))
814
-        die(get_lang('GeneralError').' (code 901)');
815
-    if ($owner == 0) return $res['uploader_id'];
816
-    if ($res['uploader_id'] == $owner) return true;
815
+    if (!($res = Database::fetch_array($result))) {
816
+            die(get_lang('GeneralError').' (code 901)');
817
+    }
818
+    if ($owner == 0) {
819
+        return $res['uploader_id'];
820
+    }
821
+    if ($res['uploader_id'] == $owner) {
822
+        return true;
823
+    }
817 824
     die(get_lang('GeneralError').' (code '.$or_die.')');
818 825
 }
819 826
 
Please login to merge, or discard this patch.
main/inc/lib/geometry.lib.php 1 patch
Braces   +49 added lines, -28 removed lines patch added patch discarded remove patch
@@ -65,8 +65,10 @@  discard block
 block discarded – undo
65 65
     $bords = array_fill(0, $bord_lenght, array()); // building this array
66 66
 
67 67
     /* adding the first point of the polygone */
68
-    if (is_array($bords[$poly[0]['y']])) //avoid warning
68
+    if (is_array($bords[$poly[0]['y']])) {
69
+        //avoid warning
69 70
     	array_push($bords[$poly[0]['y']], $poly[0]['x']);
71
+    }
70 72
 
71 73
     $i = 1; // we re-use $i and $old_pente bellow the loop
72 74
     $old_pente=0;
@@ -75,11 +77,14 @@  discard block
 block discarded – undo
75 77
 
76 78
         /* special cases */
77 79
         if ($poly[$i-1]['y'] == $poly[$i]['y']) {
78
-            if ($poly[$i-1]['x'] == $poly[$i]['x'])
79
-                continue; // twice the same point
80
+            if ($poly[$i-1]['x'] == $poly[$i]['x']) {
81
+                            continue;
82
+            }
83
+            // twice the same point
80 84
             else {    //  infinite elevation of the edge
81
-            	if (is_array($bords[$poly[$i]['y']]))
82
-                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
85
+            	if (is_array($bords[$poly[$i]['y']])) {
86
+            	                	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
87
+            	}
83 88
                 $old_pente=0;
84 89
                 continue;
85 90
             }
@@ -87,9 +92,13 @@  discard block
 block discarded – undo
87 92
 
88 93
 		//echo 'point:'.$poly[$i]['y']; bug here
89 94
         // adding the point as a part of an edge
90
-        if (is_array($bords[$poly[$i]['y']])) //avoid warning
95
+        if (is_array($bords[$poly[$i]['y']])) {
96
+            //avoid warning
91 97
         array_push($bords[$poly[$i]['y']], $poly[$i]['x']);
92
-        if (DEBUG) echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
98
+        }
99
+        if (DEBUG) {
100
+            echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].')   ';
101
+        }
93 102
 
94 103
         /* computing the elevation of the edge going */
95 104
         //        from $poly[$i-1] to $poly[$i]
@@ -99,15 +108,17 @@  discard block
 block discarded – undo
99 108
         // if the sign of the elevation change from the one of the
100 109
         // previous edge, the point must be added a second time inside
101 110
         // $bords
102
-        if ($i>1)
103
-            if (($old_pente<0 && $pente>0)
111
+        if ($i>1) {
112
+                    if (($old_pente<0 && $pente>0)
104 113
                     || ($old_pente>0 && $pente<0)) {
105 114
 				if (is_array($bords[$poly[$i]['y']])) //avoid warning
106 115
                 	array_push($bords[$poly[$i]['y']],$poly[$i]['x']);
116
+        }
107 117
 
108
-                if (DEBUG)
109
-                    echo '*('.$poly[$i]['x'].
118
+                if (DEBUG) {
119
+                                    echo '*('.$poly[$i]['x'].
110 120
                         ';'.$poly[$i]['y'].')   ';
121
+                }
111 122
         	}
112 123
 
113 124
         /* detect the direction of the elevation in Y */
@@ -136,10 +147,11 @@  discard block
 block discarded – undo
136 147
 
137 148
         // elevation between $poly[0]['x'] and $poly[1]['x'])
138 149
         $rest = $poly[0]['y']-$poly[1]['y'];
139
-        if ($rest!=0)
140
-        	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
141
-        else
142
-			$pente1 = 0;
150
+        if ($rest!=0) {
151
+                	$pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest);
152
+        } else {
153
+        			$pente1 = 0;
154
+        }
143 155
 
144 156
         // elevation between $poly[$i-1]['x'] and $poly[0]['x'])
145 157
         $pente = ($poly[$i-1]['x']-$poly[0]['x'])/
@@ -151,14 +163,17 @@  discard block
 block discarded – undo
151 163
 
152 164
         // doubling the first point if needed (see above)
153 165
         if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) {
154
-        	if (is_array($bords[$poly[$i - 1]['y']]))
155
-            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
166
+        	if (is_array($bords[$poly[$i - 1]['y']])) {
167
+        	            	array_push($bords[$poly[$i - 1]['y']],  round($poly[$i - 1]['x']));
168
+        	}
156 169
             //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
157 170
         }
158 171
         //  doubling the last point if neededd
159 172
         if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) {
160
-        	if (is_array($bords[$poly[$i-1]['y']])) //avoid warning
173
+        	if (is_array($bords[$poly[$i-1]['y']])) {
174
+        	    //avoid warning
161 175
             	array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x']));
176
+        	}
162 177
             //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].')   ';
163 178
         }
164 179
 
@@ -227,11 +242,13 @@  discard block
 block discarded – undo
227 242
         $s = "<div style='font-size: 8px; line-height:3px'><pre>\n";
228 243
     }
229 244
     for ($i=0; $i<$max['y']; $i++) {
230
-        for($j=0; $j<$max['x']; $j++)
231
-            if($poly[$j][$i] == TRUE)
245
+        for($j=0; $j<$max['x']; $j++) {
246
+                    if($poly[$j][$i] == TRUE)
232 247
                 $s .= ($format=='html'?"<b>1</b>":'1');
233
-            else
234
-                $s .= "0";
248
+        }
249
+            else {
250
+                            $s .= "0";
251
+            }
235 252
         $s .= ($format=='html'?"<br />\n":"\n");
236 253
     }
237 254
     $s .= ($format=='html'?"</pre></div>\n":"\n");
@@ -252,15 +269,19 @@  discard block
 block discarded – undo
252 269
     $surfaceOf1 = 0;
253 270
     $surfaceOf2 = 0;
254 271
 
255
-    for ($i=0; $i<$max['x']; $i++)
256
-        for($j=0; $j<$max['y']; $j++) {
272
+    for ($i=0; $i<$max['x']; $i++) {
273
+            for($j=0;
274
+    }
275
+    $j<$max['y']; $j++) {
257 276
             if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) {
258 277
                 $surfaceOf1++;
259
-                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE))
260
-                    $onlyIn1++;
278
+                if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE)) {
279
+                                    $onlyIn1++;
280
+                }
281
+            }
282
+            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE)) {
283
+                            $surfaceOf2++;
261 284
             }
262
-            if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE))
263
-                $surfaceOf2++;
264 285
         }
265 286
 
266 287
     return array (
Please login to merge, or discard this patch.
main/reports/templates/exercicesMultiCourses.reports.php 1 patch
Braces   +17 added lines, -10 removed lines patch added patch discarded remove patch
@@ -41,28 +41,35 @@
 block discarded – undo
41 41
 		'where r.course_id=c.id and r.tool_id='.
42 42
 		reports_getToolId(TOOL_QUIZ).
43 43
 		' order by r.course_id, r.child_name');
44
-	if (Database::num_rows($columns) == 0)
45
-		die('<b>'.get_lang('no data found').'</b>');
44
+	if (Database::num_rows($columns) == 0) {
45
+			die('<b>'.get_lang('no data found').'</b>');
46
+	}
46 47
 	$query = 'select u.lastname Name, u.firstname Firstname';
47 48
 	$columns = Database::store_result($columns);
48
-	if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max')
49
-		$function = $_REQUEST['tattempt'];
50
-	else
51
-		$function = 'avg';
52
-	foreach ($columns as $key => $column)
53
-		$query .= ', '.$function.'(k'.$key.'.score) as `'.
49
+	if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') {
50
+			$function = $_REQUEST['tattempt'];
51
+	} else {
52
+			$function = 'avg';
53
+	}
54
+	foreach ($columns as $key => $column) {
55
+			$query .= ', '.$function.'(k'.$key.'.score) as `'.
54 56
 				$column['course'].' - '.
55 57
 				$column['test'].'` ';
58
+	}
56 59
 	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
57
-	foreach ($columns as $key => $column) // fixme sessions
60
+	foreach ($columns as $key => $column) {
61
+	    // fixme sessions
58 62
 		$query .= 'left outer join '.
59 63
 			Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
60 64
 			' k'.$key.
61 65
 			' on k'.$key.'.key_id = '.$column['kid'].
62 66
 				' and k'.$key.'.user_id = u.user_id ';
67
+	}
63 68
 	$query .= ' group by ';
64
-	foreach ($columns as $key => $column) // grouping attempt
69
+	foreach ($columns as $key => $column) {
70
+	    // grouping attempt
65 71
 		$query .= 'k'.$key.'.attempt, ';
72
+	}
66 73
 	$query = substr($query, 0, -2); // removing last ', ';
67 74
 
68 75
 
Please login to merge, or discard this patch.
main/inc/lib/template.lib.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -338,7 +338,7 @@
 block discarded – undo
338 338
 
339 339
         if (empty($certificatesItem) && empty($searchItem)) {
340 340
             return null;
341
-        }else{
341
+        } else{
342 342
             $content.= $certificatesItem;
343 343
             $content.= $searchItem;
344 344
         }
Please login to merge, or discard this patch.
main/inc/lib/blog.lib.php 1 patch
Braces   +26 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1009,8 +1009,9 @@  discard block
 block discarded – undo
1009 1009
             $blog_post_actions .= '</a>';
1010 1010
         }
1011 1011
 
1012
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
1013
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
1012
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) {
1013
+					$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
1014
+		}
1014 1015
 
1015 1016
 		$blog_post_text=stripslashes($blog_post_text);
1016 1017
 
@@ -1654,8 +1655,9 @@  discard block
 block discarded – undo
1654 1655
 
1655 1656
 						$arrPermissions = array();
1656 1657
 
1657
-						while ($row = Database::fetch_array($result))
1658
-							$arrPermissions[] = $row['action'];
1658
+						while ($row = Database::fetch_array($result)) {
1659
+													$arrPermissions[] = $row['action'];
1660
+						}
1659 1661
 
1660 1662
 						    echo '<tr>';
1661 1663
 							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
@@ -2332,8 +2334,9 @@  discard block
 block discarded – undo
2332 2334
 		//Handle leap year
2333 2335
 		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
2334 2336
 
2335
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
2336
-			$numberofdays[2] = 29;
2337
+		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
2338
+					$numberofdays[2] = 29;
2339
+		}
2337 2340
 
2338 2341
 		//Get the first day of the month
2339 2342
 		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
@@ -2363,8 +2366,9 @@  discard block
 block discarded – undo
2363 2366
 		if( Database::num_rows($result) > 0) {
2364 2367
 			while($blog_post = Database::fetch_array($result)) {
2365 2368
 				// If the day of this post is not yet in the array, add it.
2366
-				if (!in_array($blog_post['post_day'], $posts))
2367
-					$posts[] = $blog_post['post_day'];
2369
+				if (!in_array($blog_post['post_day'], $posts)) {
2370
+									$posts[] = $blog_post['post_day'];
2371
+				}
2368 2372
 			}
2369 2373
 		}
2370 2374
 
@@ -2403,8 +2407,9 @@  discard block
 block discarded – undo
2403 2407
 
2404 2408
 		echo "<tr>\n";
2405 2409
 
2406
-		for($ii = 1; $ii < 8; $ii ++)
2407
-			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
2410
+		for($ii = 1; $ii < 8; $ii ++) {
2411
+					echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
2412
+		}
2408 2413
 
2409 2414
 		echo "</tr>";
2410 2415
 
@@ -2414,8 +2419,9 @@  discard block
 block discarded – undo
2414 2419
 		while ($curday <= $numberofdays[$month]) {
2415 2420
 			echo "<tr>";
2416 2421
 			for ($ii = 0; $ii < 7; $ii ++) {
2417
-				if (($curday == -1) && ($ii == $startdayofweek))
2418
-					$curday = 1;
2422
+				if (($curday == -1) && ($ii == $startdayofweek)) {
2423
+									$curday = 1;
2424
+				}
2419 2425
 
2420 2426
 			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
2421 2427
 					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
@@ -2429,10 +2435,11 @@  discard block
 block discarded – undo
2429 2435
 					echo "<td " . $class.">";
2430 2436
 
2431 2437
 					// If there are posts on this day, create a filter link.
2432
-					if(in_array($curday, $posts))
2433
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
2434
-					else
2435
-						echo $dayheader;
2438
+					if(in_array($curday, $posts)) {
2439
+											echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
2440
+					} else {
2441
+											echo $dayheader;
2442
+					}
2436 2443
 
2437 2444
 					if (count($tasks) > 0) {
2438 2445
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
@@ -2446,8 +2453,9 @@  discard block
 block discarded – undo
2446 2453
 
2447 2454
 					echo "</td>";
2448 2455
 					$curday ++;
2449
-				} else
2450
-					echo "<td>&nbsp;</td>";
2456
+				} else {
2457
+									echo "<td>&nbsp;</td>";
2458
+				}
2451 2459
 			}
2452 2460
 			echo "</tr>";
2453 2461
 		}
Please login to merge, or discard this patch.
app/Resources/public/assets/ckeditor/samples/old/assets/posteddata.php 1 patch
Braces   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,14 +29,16 @@
 block discarded – undo
29 29
 {
30 30
 	foreach ( $_POST as $key => $value )
31 31
 	{
32
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
33
-			continue;
32
+		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) {
33
+					continue;
34
+		}
34 35
 
35
-		if ( get_magic_quotes_gpc() )
36
-			$value = htmlspecialchars( stripslashes((string)$value) );
37
-		else
38
-			$value = htmlspecialchars( (string)$value );
39
-?>
36
+		if ( get_magic_quotes_gpc() ) {
37
+					$value = htmlspecialchars( stripslashes((string)$value) );
38
+		} else {
39
+					$value = htmlspecialchars( (string)$value );
40
+		}
41
+		?>
40 42
 		<tr>
41 43
 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
42 44
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
Please login to merge, or discard this patch.