Completed
Push — master ( bbad3a...396f7e )
by Angel Fernando Quiroz
57:29 queued 24:33
created
main/permissions/user_permissions.inc.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -140,9 +140,11 @@  discard block
 block discarded – undo
140 140
 echo "\t</tr>\n";
141 141
 
142 142
 // the main area with the checkboxes or images
143
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
143
+foreach ($tool_rights as $tool=>$rights) {
144
+    // $tool_rights contains all the possible tools and their rights
144 145
 {
145 146
 	echo "\t<tr>\n";
147
+}
146 148
 	echo "\t\t<td>\n";
147 149
 	if (strstr($tool,'BLOG'))
148 150
 	{
@@ -152,8 +154,7 @@  discard block
 block discarded – undo
152 154
 		$blog_id = substr($tool,$tmp,strlen($tool));
153 155
 		// Get title
154 156
 		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
155
-	}
156
-	else
157
+	} else
157 158
 	{
158 159
 		echo get_lang($tool);
159 160
 	}
Please login to merge, or discard this patch.
main/permissions/roles.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,8 +26,7 @@  discard block
 block discarded – undo
26 26
 		$result=Database::query($sql);
27 27
 		$role_id=Database::insert_id();
28 28
 		$result_message=store_permissions('role', $role_id);
29
-	}
30
-	else
29
+	} else
31 30
 	{
32 31
 		$result_message=get_lang('ErrorPleaseGiveRoleName');
33 32
 	}
@@ -122,9 +121,11 @@  discard block
 block discarded – undo
122 121
 	echo "\t</tr>\n";
123 122
 
124 123
 	// the main area with the checkboxes or images
125
-	foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
124
+	foreach ($tool_rights as $tool=>$rights) {
125
+	    // $tool_rights contains all the possible tools and their rights
126 126
 	{
127 127
 		echo "\t<tr>\n";
128
+	}
128 129
 		echo "\t\t<td>\n";
129 130
 		echo get_lang($tool);
130 131
 		echo "\t\t</td>\n";
@@ -216,9 +217,11 @@  discard block
 block discarded – undo
216 217
 	echo "\t</tr>\n";
217 218
 
218 219
 	// the main area with the checkboxes or images
219
-	foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
220
+	foreach ($tool_rights as $tool=>$rights) {
221
+	    // $tool_rights contains all the possible tools and their rights
220 222
 	{
221 223
 		echo "\t<tr>\n";
224
+	}
222 225
 		echo "\t\t<td>\n";
223 226
 		echo get_lang($tool);
224 227
 		echo "\t\t</td>\n";
@@ -237,8 +240,7 @@  discard block
 block discarded – undo
237 240
 					if ($_GET['scope']=='platform')
238 241
 					{
239 242
 						$roles_editable=false;
240
-					}
241
-					else
243
+					} else
242 244
 					{
243 245
 						$roles_editable=true;
244 246
 					}
Please login to merge, or discard this patch.
main/webservices/access_url.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -58,19 +58,22 @@  discard block
 block discarded – undo
58 58
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
59 59
         $ip = trim($ip1);
60 60
     }
61
-    if ($debug)
62
-        error_log("ip: $ip");
61
+    if ($debug) {
62
+            error_log("ip: $ip");
63
+    }
63 64
     // Check if a file that limits access from webservices exists and contains
64 65
     // the restraining check
65 66
     if (is_file('webservice-auth-ip.conf.php')) {
66 67
         include 'webservice-auth-ip.conf.php';
67
-        if ($debug)
68
-            error_log("webservice-auth-ip.conf.php file included");
68
+        if ($debug) {
69
+                    error_log("webservice-auth-ip.conf.php file included");
70
+        }
69 71
         if (!empty($ws_auth_ip)) {
70 72
             $check_ip = true;
71 73
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
72
-            if ($debug)
73
-                error_log("ip_matches: $ip_matches");
74
+            if ($debug) {
75
+                            error_log("ip_matches: $ip_matches");
76
+            }
74 77
         }
75 78
     }
76 79
 
@@ -87,8 +90,9 @@  discard block
 block discarded – undo
87 90
 
88 91
     $result = api_is_valid_secret_key($secret_key, $security_key);
89 92
     //error_log($secret_key.'-'.$security_key);
90
-    if ($debug)
91
-        error_log('WSHelperVerifyKey result: '.intval($result));
93
+    if ($debug) {
94
+            error_log('WSHelperVerifyKey result: '.intval($result));
95
+    }
92 96
     return $result;
93 97
 }
94 98
 
Please login to merge, or discard this patch.
main/webservices/cm_webservice_forum.php 1 patch
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@  discard block
 block discarded – undo
32 32
                 }
33 33
             }
34 34
             return $foruns_id;
35
-        } else
36
-            return get_lang('InvalidId');
35
+        } else {
36
+                    return get_lang('InvalidId');
37
+        }
37 38
     }
38 39
 
39 40
     public function get_forum_title($username, $password, $course_code, $forum_id)
@@ -54,8 +55,9 @@  discard block
 block discarded – undo
54 55
 
55 56
             $forum_title = utf8_decode($forum_info['forum_title']);
56 57
             return $forum_title;
57
-        } else
58
-            return get_lang('InvalidId');
58
+        } else {
59
+                    return get_lang('InvalidId');
60
+        }
59 61
     }
60 62
 
61 63
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
@@ -73,8 +75,9 @@  discard block
 block discarded – undo
73 75
 
74 76
             return $threads_id;
75 77
 
76
-        } else
77
-            return get_lang('InvalidId');
78
+        } else {
79
+                    return get_lang('InvalidId');
80
+        }
78 81
     }
79 82
 
80 83
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
@@ -115,8 +118,9 @@  discard block
 block discarded – undo
115 118
 
116 119
             return $thread_info[$field_table];
117 120
 
118
-        } else
119
-            return get_lang('InvalidId');
121
+        } else {
122
+                    return get_lang('InvalidId');
123
+        }
120 124
     }
121 125
 
122 126
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
@@ -139,8 +143,9 @@  discard block
 block discarded – undo
139 143
 
140 144
             return $thread_info[$field_table];
141 145
 
142
-        } else
143
-            return get_lang('InvalidId');
146
+        } else {
147
+                    return get_lang('InvalidId');
148
+        }
144 149
     }
145 150
 
146 151
 
@@ -184,8 +189,9 @@  discard block
 block discarded – undo
184 189
                 }
185 190
             }
186 191
             return $posts_id;
187
-        } else
188
-            return get_lang('InvalidId');
192
+        } else {
193
+                    return get_lang('InvalidId');
194
+        }
189 195
     }
190 196
 
191 197
     public function get_post_data($username, $password, $course_code, $post_id, $field)
@@ -226,8 +232,9 @@  discard block
 block discarded – undo
226 232
                     $field_table = "title";
227 233
             }
228 234
             return (htmlcode) ? html_entity_decode($post_info[$field_table]) : $post_info[$field_table];
229
-        } else
230
-            return get_lang('InvalidId');
235
+        } else {
236
+                    return get_lang('InvalidId');
237
+        }
231 238
     }
232 239
 
233 240
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
@@ -269,8 +276,9 @@  discard block
 block discarded – undo
269 276
 
270 277
             //send_notification_mails($thread_id, $values);
271 278
 
272
-        } else
273
-            return get_lang('InvalidId');
279
+        } else {
280
+                    return get_lang('InvalidId');
281
+        }
274 282
 
275 283
     }
276 284
 
Please login to merge, or discard this patch.
main/webservices/cm_webservice_announcements.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,8 +26,9 @@  discard block
 block discarded – undo
26 26
             }
27 27
             return $announcements;
28 28
 
29
-        } else
30
-            return get_lang('InvalidId');
29
+        } else {
30
+                    return get_lang('InvalidId');
31
+        }
31 32
 
32 33
     }
33 34
 
@@ -69,8 +70,9 @@  discard block
 block discarded – undo
69 70
 
70 71
             return (htmlcode) ? html_entity_decode($announcements[0][$field_table]) : $announcements[0][$field_table];
71 72
 
72
-        }else
73
-            return get_lang('InvalidId');
73
+        } else {
74
+                    return get_lang('InvalidId');
75
+        }
74 76
     }
75 77
 
76 78
 
Please login to merge, or discard this patch.
main/webservices/cm_webservice_course.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -521,8 +521,9 @@
 block discarded – undo
521 521
 
522 522
 	public function nada($username, $password)
523 523
 	{
524
-		if($this->verifyUserPass($username, $password) == "valid")
525
-			return $username.$password;
524
+		if($this->verifyUserPass($username, $password) == "valid") {
525
+					return $username.$password;
526
+		}
526 527
 		return $username;
527 528
 	}
528 529
 
Please login to merge, or discard this patch.
main/webservices/cm_webservice_courses.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@
 block discarded – undo
35 35
         {
36 36
             $course_info = CourseManager::get_course_information($course_code);
37 37
             return $course_info['title'];
38
-        } else
39
-            return get_lang('InvalidId');
38
+        } else {
39
+                    return get_lang('InvalidId');
40
+        }
40 41
 
41 42
     }
42 43
 
Please login to merge, or discard this patch.
main/webservices/http-auth.php 1 patch
Braces   +10 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@  discard block
 block discarded – undo
12 12
 $digest = getDigest();
13 13
 
14 14
 // If there was no digest, show login
15
-if (is_null($digest)) requireLogin($realm,$nonce);
15
+if (is_null($digest)) {
16
+    requireLogin($realm,$nonce);
17
+}
16 18
 
17 19
 $digestParts = digestParse($digest);
18 20
 
@@ -25,9 +27,9 @@  discard block
 block discarded – undo
25 27
 
26 28
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 29
 
28
-if ($digestParts['response'] != $validResponse)
30
+if ($digestParts['response'] != $validResponse) {
29 31
   requireLogin($realm,$nonce);
30
-else {
32
+} else {
31 33
   // We're in!
32 34
   echo 'a7532ae474e5e66a0c16eddab02e02a7';
33 35
   die();
@@ -40,12 +42,11 @@  discard block
 block discarded – undo
40 42
     if (isset($_SERVER['PHP_AUTH_DIGEST'])) {
41 43
         $digest = $_SERVER['PHP_AUTH_DIGEST'];
42 44
     // most other servers
43
-    }
44
-    elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
46
-        $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47
-    }
48
-    elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
45
+    } elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
46
+      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) {
47
+              $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
48
+      }
49
+    } elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
49 50
       $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
50 51
     }
51 52
     return $digest;
Please login to merge, or discard this patch.
main/webservices/cm_webservice_inbox.php 1 patch
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
             return $message;
50 50
 
51
-        } else
52
-            return get_lang('InvalidId');
51
+        } else {
52
+                    return get_lang('InvalidId');
53
+        }
53 54
 
54 55
     }
55 56
 
@@ -92,8 +93,9 @@  discard block
 block discarded – undo
92 93
             $result = Database::fetch_row($sql_result);
93 94
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
94 95
 
95
-        }else
96
-            return get_lang('InvalidId');
96
+        } else {
97
+                    return get_lang('InvalidId');
98
+        }
97 99
 
98 100
 
99 101
     }
@@ -118,8 +120,9 @@  discard block
 block discarded – undo
118 120
 
119 121
             return $message;
120 122
 
121
-        } else
122
-            return get_lang('InvalidId');
123
+        } else {
124
+                    return get_lang('InvalidId');
125
+        }
123 126
 
124 127
     }
125 128
 
@@ -164,8 +167,9 @@  discard block
 block discarded – undo
164 167
 
165 168
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
166 169
 
167
-        }else
168
-            return get_lang('InvalidId');
170
+        } else {
171
+                    return get_lang('InvalidId');
172
+        }
169 173
 
170 174
 
171 175
     }
@@ -199,8 +203,9 @@  discard block
 block discarded – undo
199 203
 
200 204
             return $inbox_last_id;
201 205
 
202
-        } else
203
-            return get_lang('InvalidId');
206
+        } else {
207
+                    return get_lang('InvalidId');
208
+        }
204 209
 
205 210
     }
206 211
 
Please login to merge, or discard this patch.