@@ -97,9 +97,11 @@ |
||
| 97 | 97 | echo "\t</tr>\n"; |
| 98 | 98 | |
| 99 | 99 | // the main area with the checkboxes or images |
| 100 | -foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights |
|
| 100 | +foreach ($tool_rights as $tool=>$rights) { |
|
| 101 | + // $tool_rights contains all the possible tools and their rights |
|
| 101 | 102 | { |
| 102 | 103 | echo "\t<tr>\n"; |
| 104 | +} |
|
| 103 | 105 | echo "\t\t<td>\n"; |
| 104 | 106 | echo get_lang($tool); |
| 105 | 107 | echo "\t\t</td>\n"; |
@@ -132,24 +132,20 @@ discard block |
||
| 132 | 132 | { |
| 133 | 133 | $table=Database::get_course_table(TABLE_PERMISSION_USER); |
| 134 | 134 | $id_field = 'user_id'; |
| 135 | - } |
|
| 136 | - elseif ($content == 'group') |
|
| 135 | + } elseif ($content == 'group') |
|
| 137 | 136 | { |
| 138 | 137 | $table=Database::get_course_table(TABLE_PERMISSION_GROUP); |
| 139 | 138 | $id_field = 'group_id'; |
| 140 | - } |
|
| 141 | - elseif ($content == 'role') |
|
| 139 | + } elseif ($content == 'role') |
|
| 142 | 140 | { |
| 143 | 141 | $table=Database::get_course_table(TABLE_ROLE_PERMISSION); |
| 144 | 142 | $id_field = 'role_id'; |
| 145 | - } |
|
| 146 | - elseif ($content == 'platform_role') |
|
| 143 | + } elseif ($content == 'platform_role') |
|
| 147 | 144 | { |
| 148 | 145 | $table=Database::get_main_table(TABLE_ROLE_PERMISSION); |
| 149 | 146 | $id_field = 'role_id'; |
| 150 | 147 | $course_id_condition = ''; |
| 151 | - } |
|
| 152 | - elseif ($content == 'task') |
|
| 148 | + } elseif ($content == 'task') |
|
| 153 | 149 | { |
| 154 | 150 | $table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS); |
| 155 | 151 | $id_field = 'task_id'; |
@@ -162,8 +158,9 @@ discard block |
||
| 162 | 158 | WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'"; |
| 163 | 159 | $result = Database::query($sql); |
| 164 | 160 | |
| 165 | - while($row = Database::fetch_array($result)) |
|
| 166 | - $currentpermissions[$row['tool']][] = $row['action']; |
|
| 161 | + while($row = Database::fetch_array($result)) { |
|
| 162 | + $currentpermissions[$row['tool']][] = $row['action']; |
|
| 163 | + } |
|
| 167 | 164 | |
| 168 | 165 | return $currentpermissions; |
| 169 | 166 | } |
@@ -321,14 +318,12 @@ discard block |
||
| 321 | 318 | if ($course_admin) |
| 322 | 319 | { |
| 323 | 320 | echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">"; |
| 324 | - } |
|
| 325 | - else |
|
| 321 | + } else |
|
| 326 | 322 | { |
| 327 | 323 | if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool])) |
| 328 | 324 | { |
| 329 | 325 | echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">"; |
| 330 | - } |
|
| 331 | - else |
|
| 326 | + } else |
|
| 332 | 327 | { |
| 333 | 328 | if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) |
| 334 | 329 | { |
@@ -439,8 +434,7 @@ discard block |
||
| 439 | 434 | $checked='checked'; |
| 440 | 435 | $image='checkbox_on2.gif'; |
| 441 | 436 | $action='revoke'; |
| 442 | - } |
|
| 443 | - else |
|
| 437 | + } else |
|
| 444 | 438 | { |
| 445 | 439 | $checked=''; |
| 446 | 440 | $image='wrong.gif'; |
@@ -140,9 +140,11 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -26,8 +26,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -58,19 +58,22 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -32,8 +32,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -26,8 +26,9 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -521,8 +521,9 @@ |
||
| 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 | |
@@ -35,8 +35,9 @@ |
||
| 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 | |