Passed
Push — 1.10.x ( 08890a...2189d7 )
by Yannick
116:38 queued 75:46
created
main/gradebook/lib/fe/usertable.class.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,8 +95,9 @@
 block discarded – undo
95 95
 				$row[] = $data[3];
96 96
 				$row[] = $data[4];
97 97
 				$row[] = $data[5];
98
-				if ($scoredisplay->is_custom())
99
-					$row[] = $data[6];
98
+				if ($scoredisplay->is_custom()) {
99
+									$row[] = $data[6];
100
+				}
100 101
 				$sortable_data[] = $row;
101 102
 			}
102 103
 		}
Please login to merge, or discard this patch.
main/gradebook/lib/be/abstractlink.class.php 1 patch
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -235,21 +235,27 @@  discard block
 block discarded – undo
235 235
             $paramcount ++;
236 236
         }
237 237
         if (isset ($type)) {
238
-            if ($paramcount != 0) $sql .= ' AND';
239
-            else $sql .= ' WHERE';
238
+            if ($paramcount != 0) {
239
+                $sql .= ' AND';
240
+            } else {
241
+                $sql .= ' WHERE';
242
+            }
240 243
             $sql .= ' type = '.intval($type);
241 244
             $paramcount ++;
242 245
         }
243 246
         if (isset ($ref_id)) {
244
-            if ($paramcount != 0) $sql .= ' AND';
245
-            else $sql .= ' WHERE';
247
+            if ($paramcount != 0) {
248
+                $sql .= ' AND';
249
+            } else {
250
+                $sql .= ' WHERE';
251
+            }
246 252
             $sql .= ' ref_id = '.intval($ref_id);
247 253
             $paramcount ++;
248 254
         }
249 255
         if (isset ($user_id)) {
250 256
             if ($paramcount != 0) {
251 257
                 $sql .= ' AND';
252
-            }else {
258
+            } else {
253 259
                 $sql .= ' WHERE';
254 260
             }
255 261
             $sql .= ' user_id = '.intval($user_id);
@@ -267,7 +273,7 @@  discard block
 block discarded – undo
267 273
         if (isset ($category_id)) {
268 274
             if ($paramcount != 0) {
269 275
                 $sql .= ' AND';
270
-            }else {
276
+            } else {
271 277
                 $sql .= ' WHERE';
272 278
             }
273 279
             $sql .= ' category_id = '.intval($category_id);
Please login to merge, or discard this patch.
main/gradebook/lib/be/category.class.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1179,7 +1179,7 @@
 block discarded – undo
1179 1179
                             cu.status = '.COURSEMANAGER.'
1180 1180
                     )';
1181 1181
             }
1182
-        }elseif (api_is_platform_admin()) {
1182
+        } elseif (api_is_platform_admin()) {
1183 1183
             if (isset($session_id) && $session_id!=0) {
1184 1184
                 $sql.=' AND session_id='.intval($session_id);
1185 1185
             } else {
Please login to merge, or discard this patch.
main/gradebook/lib/be/learnpathlink.class.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 	public function get_not_created_links()
30 30
 	{
31 31
 		return false;
32
-		if (empty($this->course_code))
33
-			die('Error in get_not_created_links() : course code not set');
32
+		if (empty($this->course_code)) {
33
+					die('Error in get_not_created_links() : course code not set');
34
+		}
34 35
 
35 36
 		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
36 37
 
@@ -57,8 +58,9 @@  discard block
 block discarded – undo
57 58
 	 */
58 59
 	public function get_all_links()
59 60
 	{
60
-		if (empty($this->course_code))
61
-			die('Error in get_not_created_links() : course code not set');
61
+		if (empty($this->course_code)) {
62
+					die('Error in get_not_created_links() : course code not set');
63
+		}
62 64
 
63 65
 		$session_id = api_get_session_id();
64 66
 		if (empty($session_id)) {
@@ -111,8 +113,9 @@  discard block
 block discarded – undo
111 113
                     lp_id = ".$this->get_ref_id()." AND
112 114
                     session_id = $session_id ";
113 115
 
114
-		if (isset($stud_id))
115
-			$sql .= ' AND user_id = '.intval($stud_id);
116
+		if (isset($stud_id)) {
117
+					$sql .= ' AND user_id = '.intval($stud_id);
118
+		}
116 119
 
117 120
 		// order by id, that way the student's first attempt is accessed first
118 121
 		$sql .= ' ORDER BY view_count DESC';
@@ -122,8 +125,9 @@  discard block
 block discarded – undo
122 125
 		if (isset($stud_id)) {
123 126
 			if ($data = Database::fetch_array($scores)) {
124 127
 				return array ($data['progress'], 100);
125
-			} else
126
-				return null;
128
+			} else {
129
+							return null;
130
+			}
127 131
 		} else {
128 132
 			// all students -> get average
129 133
 			$students = array();  // user list, needed to make sure we only
Please login to merge, or discard this patch.
main/gradebook/lib/be/result.class.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -152,10 +152,11 @@
 block discarded – undo
152 152
             $paramcount ++;
153 153
         }
154 154
         if (!empty($user_id)) {
155
-            if ($paramcount != 0)
156
-                $sql .= ' AND';
157
-            else
158
-                $sql .= ' WHERE';
155
+            if ($paramcount != 0) {
156
+                            $sql .= ' AND';
157
+            } else {
158
+                            $sql .= ' WHERE';
159
+            }
159 160
             $sql .= ' gr.user_id = ' . intval($user_id);
160 161
             $paramcount ++;
161 162
         }
Please login to merge, or discard this patch.
main/gradebook/lib/be/evaluation.class.php 1 patch
Braces   +27 added lines, -12 removed lines patch added patch discarded remove patch
@@ -228,36 +228,51 @@  discard block
 block discarded – undo
228 228
 		}
229 229
 
230 230
 		if (isset ($user_id)) {
231
-			if ($paramcount != 0) $sql .= ' AND';
232
-			else $sql .= ' WHERE';
231
+			if ($paramcount != 0) {
232
+			    $sql .= ' AND';
233
+			} else {
234
+			    $sql .= ' WHERE';
235
+			}
233 236
 			$sql .= ' user_id = '.intval($user_id);
234 237
 			$paramcount ++;
235 238
 		}
236 239
 
237 240
 		if (isset ($course_code) && $course_code <> '-1') {
238
-			if ($paramcount != 0) $sql .= ' AND';
239
-			else $sql .= ' WHERE';
241
+			if ($paramcount != 0) {
242
+			    $sql .= ' AND';
243
+			} else {
244
+			    $sql .= ' WHERE';
245
+			}
240 246
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
241 247
 			$paramcount ++;
242 248
 		}
243 249
 
244 250
 		if (isset ($category_id)) {
245
-			if ($paramcount != 0) $sql .= ' AND';
246
-			else $sql .= ' WHERE';
251
+			if ($paramcount != 0) {
252
+			    $sql .= ' AND';
253
+			} else {
254
+			    $sql .= ' WHERE';
255
+			}
247 256
 			$sql .= ' category_id = '.intval($category_id);
248 257
 			$paramcount ++;
249 258
 		}
250 259
 
251 260
 		if (isset ($visible)) {
252
-			if ($paramcount != 0) $sql .= ' AND';
253
-			else $sql .= ' WHERE';
261
+			if ($paramcount != 0) {
262
+			    $sql .= ' AND';
263
+			} else {
264
+			    $sql .= ' WHERE';
265
+			}
254 266
 			$sql .= ' visible = '.intval($visible);
255 267
 			$paramcount ++;
256 268
 		}
257 269
 
258 270
 		if (isset ($locked)) {
259
-			if ($paramcount != 0) $sql .= ' AND';
260
-			else $sql .= ' WHERE';
271
+			if ($paramcount != 0) {
272
+			    $sql .= ' AND';
273
+			} else {
274
+			    $sql .= ' WHERE';
275
+			}
261 276
 			$sql .= ' locked = '.intval($locked);
262 277
 		}
263 278
 
@@ -397,7 +412,7 @@  discard block
 block discarded – undo
397 412
 			.', description = ';
398 413
 		if (isset($this->description)) {
399 414
 			$sql .= "'".Database::escape_string($this->get_description())."'";
400
-		}else {
415
+		} else {
401 416
 			$sql .= 'null';
402 417
 		}
403 418
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,7 +483,7 @@  discard block
 block discarded – undo
468 483
 				$sql .= ' AND user_id = '.api_get_user_id();
469 484
 			}
470 485
 
471
-		}else {
486
+		} else {
472 487
 			$sql .= ' AND user_id = '.api_get_user_id();
473 488
 		}
474 489
 
Please login to merge, or discard this patch.
main/admin/ldap_import_students.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -269,8 +269,7 @@
 block discarded – undo
269 269
     echo '<br /><br />';
270 270
     echo '</div>';
271 271
 
272
-}
273
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
272
+} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
274 273
 {
275 274
 	$id=$_POST['username_form'];
276 275
 	$UserList=array();
Please login to merge, or discard this patch.
main/admin/access_url_add_usergroup_to_url.php 1 patch
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,10 @@  discard block
 block discarded – undo
99 99
         <td width="40%" align="center">
100 100
         <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;">
101 101
 		<?php foreach ($dbUserGroups as $item) { ?>
102
-			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?>
102
+			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) {
103
+    echo 'selected="selected"';
104
+}
105
+?>><?php echo $item['name']; ?>
103 106
             </option>
104 107
         <?php } ?>
105 108
     </select>
@@ -110,7 +113,10 @@  discard block
 block discarded – undo
110 113
    <td width="40%" align="center">
111 114
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
112 115
 		<?php foreach ($db_urls as $url_obj) { ?>
113
-        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
116
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) {
117
+    echo 'selected="selected"';
118
+}
119
+?>><?php echo $url_obj['url']; ?>
114 120
         </option>
115 121
 		<?php } ?>
116 122
     </select>
Please login to merge, or discard this patch.
main/admin/subscribe_class2course.php 1 patch
Braces   +11 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,14 +46,15 @@  discard block
 block discarded – undo
46 46
         if (count($classes) == 0 || count($courses) == 0)
47 47
         {
48 48
             Display::display_error_message(get_lang('AtLeastOneClassAndOneCourse'));
49
-        }
50
-        elseif (api_substr($_POST['formSubmit'], -2) == '>>') // add classes to courses
49
+        } elseif (api_substr($_POST['formSubmit'], -2) == '>>') {
50
+            // add classes to courses
51 51
         {
52 52
             foreach ($courses as $course_code)
53 53
             {
54 54
                 foreach ($classes as $class_id)
55 55
                 {
56 56
                     ClassManager :: subscribe_to_course($class_id, $course_code);
57
+        }
57 58
                 }
58 59
             }
59 60
             Display::display_normal_message(get_lang('ClassesSubscribed'));
@@ -114,7 +115,10 @@  discard block
 block discarded – undo
114 115
 foreach ($db_classes as $class)
115 116
 {
116 117
 ?>
117
-    <option value="<?php echo $class['id']; ?>" <?php if(in_array($class['id'],$classes)) echo 'selected="selected"'; ?>><?php echo $class['name']; ?></option>
118
+    <option value="<?php echo $class['id']; ?>" <?php if(in_array($class['id'],$classes)) {
119
+    echo 'selected="selected"';
120
+}
121
+?>><?php echo $class['name']; ?></option>
118 122
 <?php
119 123
 }
120 124
 ?>
@@ -131,7 +135,10 @@  discard block
 block discarded – undo
131 135
 foreach ($db_courses as $course)
132 136
 {
133 137
 ?>
134
-    <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
138
+    <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
139
+    echo 'selected="selected"';
140
+}
141
+?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
135 142
 <?php
136 143
 }
137 144
 ?>
Please login to merge, or discard this patch.