Completed
Push — 1.11.x ( ae642b...8fe553 )
by José
74:31 queued 35:16
created
main/inc/lib/fileDisplay.lib.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -213,16 +213,19 @@
 block discarded – undo
213 213
     if (is_dir($dir)) {
214 214
         while(($entry = $dir->read()) !== false)
215 215
         {
216
-            if ($entry != '.' && $entry != '..')
217
-                continue;
216
+            if ($entry != '.' && $entry != '..') {
217
+                            continue;
218
+            }
218 219
 
219
-            if (!is_dir($dir_name.'/'.$entry))
220
-                $current_modified = filemtime($dir_name.'/'.$entry);
221
-            elseif ($do_recursive)
222
-                $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
220
+            if (!is_dir($dir_name.'/'.$entry)) {
221
+                            $current_modified = filemtime($dir_name.'/'.$entry);
222
+            } elseif ($do_recursive) {
223
+                            $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
224
+            }
223 225
 
224
-            if ($current_modified > $last_modified)
225
-                $last_modified = $current_modified;
226
+            if ($current_modified > $last_modified) {
227
+                            $last_modified = $current_modified;
228
+            }
226 229
         }
227 230
 
228 231
         $dir->close();
Please login to merge, or discard this patch.
main/inc/lib/fileUpload.lib.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -993,7 +993,9 @@
 block discarded – undo
993 993
                     if ($file != '.' && $file != '..') {
994 994
 
995 995
                         $filetype = 'file';
996
-                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) $filetype = 'folder';
996
+                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) {
997
+                            $filetype = 'folder';
998
+                        }
997 999
 
998 1000
                         $safe_file = api_replace_dangerous_char($file, 'strict');
999 1001
                         @rename($base_work_dir.$upload_path.'/'.$file,$base_work_dir.$upload_path.'/'.$safe_file);
Please login to merge, or discard this patch.
main/inc/lib/usergroup.lib.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1906,8 +1906,9 @@
 block discarded – undo
1906 1906
                 $new_relation_type[] ="'$rel'";
1907 1907
             }
1908 1908
             $relation_type = implode(',', $new_relation_type);
1909
-            if (!empty($relation_type))
1910
-                $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
1909
+            if (!empty($relation_type)) {
1910
+                            $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
1911
+            }
1911 1912
         }
1912 1913
 
1913 1914
         $sql = "SELECT picture_uri as image, u.id, u.firstname, u.lastname, relation_type
Please login to merge, or discard this patch.
main/inc/lib/agenda.lib.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3122,8 +3122,9 @@
 block discarded – undo
3122 3122
         global $DaysShort, $course_path;
3123 3123
         //Handle leap year
3124 3124
         $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
3125
-        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
3126
-            $numberofdays[2] = 29;
3125
+        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
3126
+                    $numberofdays[2] = 29;
3127
+        }
3127 3128
         //Get the first day of the month
3128 3129
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
3129 3130
         //Start the week on monday
Please login to merge, or discard this patch.
main/inc/lib/userportal.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/text.lib.php 1 patch
Braces   +31 added lines, -20 removed lines patch added patch discarded remove patch
@@ -351,8 +351,9 @@  discard block
 block discarded – undo
351 351
     }
352 352
 
353 353
     $url = esc_url($url);
354
-    if ( empty($url) )
355
-        return $matches[0];
354
+    if ( empty($url) ) {
355
+            return $matches[0];
356
+    }
356 357
 
357 358
     return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
358 359
 }
@@ -377,8 +378,9 @@  discard block
 block discarded – undo
377 378
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
378 379
     //$original_url = $url;
379 380
 
380
-    if ( '' == $url )
381
-        return $url;
381
+    if ( '' == $url ) {
382
+            return $url;
383
+    }
382 384
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
383 385
     $strip = array('%0d', '%0a', '%0D', '%0A');
384 386
     $url = _deep_replace($strip, $url);
@@ -388,8 +390,9 @@  discard block
 block discarded – undo
388 390
      * link starting with /, # or ? or a php file).
389 391
      */
390 392
     if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
391
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
392
-        $url = 'http://' . $url;
393
+        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
394
+            $url = 'http://' . $url;
395
+    }
393 396
 
394 397
     return Security::remove_XSS($url);
395 398
 
@@ -466,8 +469,9 @@  discard block
 block discarded – undo
466 469
     $dest = $matches[2];
467 470
     $dest = 'http://' . $dest;
468 471
     $dest = esc_url($dest);
469
-    if ( empty($dest) )
470
-        return $matches[0];
472
+    if ( empty($dest) ) {
473
+            return $matches[0];
474
+    }
471 475
 
472 476
     // removed trailing [.,;:)] from URL
473 477
     if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -511,10 +515,11 @@  discard block
 block discarded – undo
511 515
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
512 516
     foreach ( $textarr as $piece ) {
513 517
 
514
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
515
-            $nested_code_pre++;
516
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
517
-            $nested_code_pre--;
518
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
519
+                    $nested_code_pre++;
520
+        } elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
521
+                    $nested_code_pre--;
522
+        }
518 523
 
519 524
         if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
520 525
             $r .= $piece;
@@ -723,15 +728,13 @@  discard block
 block discarded – undo
723 728
 			if($length>$maxchar)
724 729
 			{
725 730
 				break;
726
-			}
727
-			else
731
+			} else
728 732
 			{
729 733
 				$output = $output." ".$words[$i];
730 734
 				$i++;
731 735
 			};
732 736
 		};
733
-	}
734
-	else
737
+	} else
735 738
 	{
736 739
 		$output = $text;
737 740
 		return $output;
@@ -782,13 +785,21 @@  discard block
 block discarded – undo
782 785
     if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
783 786
         $year = $array['Y'];
784 787
         $month = isset($array['F'])?$array['F']:$array['M'];
785
-        if (intval($month) < 10 ) $month = '0'.$month;
788
+        if (intval($month) < 10 ) {
789
+            $month = '0'.$month;
790
+        }
786 791
         $day = $array['d'];
787
-        if (intval($day) < 10 ) $day = '0'.$day;
792
+        if (intval($day) < 10 ) {
793
+            $day = '0'.$day;
794
+        }
788 795
         $hours = $array['H'];
789
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
796
+        if (intval($hours) < 10 ) {
797
+            $hours = '0'.$hours;
798
+        }
790 799
         $minutes = $array['i'];
791
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
800
+        if (intval($minutes) < 10 ) {
801
+            $minutes = '0'.$minutes;
802
+        }
792 803
     }
793 804
     if (checkdate($month,$day,$year)) {
794 805
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
Please login to merge, or discard this patch.
main/tracking/lp_results_by_user.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,8 +73,9 @@
 block discarded – undo
73 73
 //$form->addElement('submit','submit',get_lang('Filter'));
74 74
 $form->addButtonFilter(get_lang('Filter'));
75 75
 
76
-if (!empty($_REQUEST['course_code']))
76
+if (!empty($_REQUEST['course_code'])) {
77 77
     $selected_course = $_REQUEST['course_code'];
78
+}
78 79
 if (!empty($selected_course)) {
79 80
     $selected_course = api_get_course_info($selected_course);
80 81
     $course_list = array($selected_course);
Please login to merge, or discard this patch.
main/tracking/toolaccess_details.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -90,7 +90,9 @@  discard block
 block discarded – undo
90 90
             echo "<tr>
91 91
                     <td>
92 92
                     ";
93
-            if(isset($_cid)) echo "<b>$_cid : </b>";
93
+            if(isset($_cid)) {
94
+                echo "<b>$_cid : </b>";
95
+            }
94 96
             echo "		<b>".get_lang('ToolList')."</b>
95 97
 					</td>
96 98
                 </tr>
@@ -116,27 +118,28 @@  discard block
 block discarded – undo
116 118
                         echo"</tr>";
117 119
                 }
118 120
 
119
-            }
120
-            else
121
+            } else
121 122
             {
122 123
                 echo "<tr>";
123 124
                 echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
124 125
                 echo"</tr>";
125 126
             }
126 127
             echo "</table></td></tr>";
127
-        }
128
-        else
128
+        } else
129 129
         {
130 130
             // this can prevent bug if there is special chars in $tool
131 131
             $encodedTool = urlencode($tool);
132 132
             $tool = urldecode($tool);
133 133
 
134
-            if( !isset($reqdate) )
135
-                $reqdate = time();
134
+            if( !isset($reqdate) ) {
135
+                            $reqdate = time();
136
+            }
136 137
             echo "<tr>
137 138
                     <td>
138 139
 					";
139
-            if(isset($_cid)) echo "<b>$_cid : </b>";
140
+            if(isset($_cid)) {
141
+                echo "<b>$_cid : </b>";
142
+            }
140 143
             echo "        <b>".get_lang($tool)."</b>
141 144
 					</td>
142 145
                 </tr>
Please login to merge, or discard this patch.
main/tracking/logins_details.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -182,10 +182,11 @@
 block discarded – undo
182 182
                 echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
183 183
                 echo"</tr>";
184 184
                 // $limit is used to select only results between $results[$j] (current login) and next one
185
-                if ($j == ( sizeof($results) - 1 ))
186
-                    $limit = date("Y-m-d H:i:s", $nextReqDate);
187
-                else
188
-                    $limit = $results[$j + 1];
185
+                if ($j == ( sizeof($results) - 1 )) {
186
+                                    $limit = date("Y-m-d H:i:s", $nextReqDate);
187
+                } else {
188
+                                    $limit = $results[$j + 1];
189
+                }
189 190
                 // select all access to tool between displayed date and next displayed date or now() if
190 191
                 // displayed date is the last login date
191 192
                 $sql = "SELECT access_tool, count(access_tool)
Please login to merge, or discard this patch.