@@ -160,8 +160,7 @@ discard block |
||
160 | 160 | $exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN |
161 | 161 | |
162 | 162 | $status_code = 500; |
163 | - } |
|
164 | - else |
|
163 | + } else |
|
165 | 164 | { |
166 | 165 | $exit_status = 1; // EXIT_ERROR |
167 | 166 | } |
@@ -256,8 +255,7 @@ discard block |
||
256 | 255 | if (isset($stati[$code])) |
257 | 256 | { |
258 | 257 | $text = $stati[$code]; |
259 | - } |
|
260 | - else |
|
258 | + } else |
|
261 | 259 | { |
262 | 260 | show_error('No status text available. Please check your status code number or supply your own message text.', 500); |
263 | 261 | } |
@@ -327,8 +325,7 @@ discard block |
||
327 | 325 | if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) |
328 | 326 | { |
329 | 327 | require($file_path); |
330 | - } |
|
331 | - elseif ( ! $found) |
|
328 | + } elseif ( ! $found) |
|
332 | 329 | { |
333 | 330 | set_status_header(503); |
334 | 331 | echo 'The configuration file does not exist.'; |
@@ -200,16 +200,14 @@ discard block |
||
200 | 200 | if (empty($library)) |
201 | 201 | { |
202 | 202 | return $this; |
203 | - } |
|
204 | - elseif (is_array($library)) |
|
203 | + } elseif (is_array($library)) |
|
205 | 204 | { |
206 | 205 | foreach ($library as $key => $value) |
207 | 206 | { |
208 | 207 | if (is_int($key)) |
209 | 208 | { |
210 | 209 | $this->library($value, $params); |
211 | - } |
|
212 | - else |
|
210 | + } else |
|
213 | 211 | { |
214 | 212 | $this->library($key, $params, $value); |
215 | 213 | } |
@@ -246,8 +244,7 @@ discard block |
||
246 | 244 | if (empty($model)) |
247 | 245 | { |
248 | 246 | return $this; |
249 | - } |
|
250 | - elseif (is_array($model)) |
|
247 | + } elseif (is_array($model)) |
|
251 | 248 | { |
252 | 249 | foreach ($model as $key => $value) |
253 | 250 | { |
@@ -313,8 +310,7 @@ discard block |
||
313 | 310 | { |
314 | 311 | throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model"); |
315 | 312 | } |
316 | - } |
|
317 | - elseif ( ! class_exists('CI_Model', FALSE)) |
|
313 | + } elseif ( ! class_exists('CI_Model', FALSE)) |
|
318 | 314 | { |
319 | 315 | require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php'); |
320 | 316 | } |
@@ -471,8 +467,7 @@ discard block |
||
471 | 467 | require_once($driver_path); |
472 | 468 | $class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge'; |
473 | 469 | } |
474 | - } |
|
475 | - else |
|
470 | + } else |
|
476 | 471 | { |
477 | 472 | $class = 'CI_DB_'.$db->dbdriver.'_forge'; |
478 | 473 | } |
@@ -761,16 +756,14 @@ discard block |
||
761 | 756 | if (is_int($key)) |
762 | 757 | { |
763 | 758 | $this->driver($value, $params); |
764 | - } |
|
765 | - else |
|
759 | + } else |
|
766 | 760 | { |
767 | 761 | $this->driver($key, $params, $value); |
768 | 762 | } |
769 | 763 | } |
770 | 764 | |
771 | 765 | return $this; |
772 | - } |
|
773 | - elseif (empty($library)) |
|
766 | + } elseif (empty($library)) |
|
774 | 767 | { |
775 | 768 | return FALSE; |
776 | 769 | } |
@@ -869,8 +862,7 @@ discard block |
||
869 | 862 | array_shift($this->_ci_helper_paths); |
870 | 863 | array_shift($this->_ci_view_paths); |
871 | 864 | array_pop($config->_config_paths); |
872 | - } |
|
873 | - else |
|
865 | + } else |
|
874 | 866 | { |
875 | 867 | $path = rtrim($path, '/').'/'; |
876 | 868 | foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) |
@@ -934,8 +926,7 @@ discard block |
||
934 | 926 | { |
935 | 927 | $_ci_x = explode('/', $_ci_path); |
936 | 928 | $_ci_file = end($_ci_x); |
937 | - } |
|
938 | - else |
|
929 | + } else |
|
939 | 930 | { |
940 | 931 | $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); |
941 | 932 | $_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view; |
@@ -1002,8 +993,7 @@ discard block |
||
1002 | 993 | if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE) |
1003 | 994 | { |
1004 | 995 | echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path)))); |
1005 | - } |
|
1006 | - else |
|
996 | + } else |
|
1007 | 997 | { |
1008 | 998 | include($_ci_path); // include() vs include_once() allows for multiple views with the same name |
1009 | 999 | } |
@@ -1030,8 +1020,7 @@ discard block |
||
1030 | 1020 | if (ob_get_level() > $this->_ci_ob_level + 1) |
1031 | 1021 | { |
1032 | 1022 | ob_end_flush(); |
1033 | - } |
|
1034 | - else |
|
1023 | + } else |
|
1035 | 1024 | { |
1036 | 1025 | $_ci_CI->output->append_output(ob_get_contents()); |
1037 | 1026 | @ob_end_clean(); |
@@ -1071,8 +1060,7 @@ discard block |
||
1071 | 1060 | |
1072 | 1061 | // Get the filename from the path |
1073 | 1062 | $class = substr($class, $last_slash); |
1074 | - } |
|
1075 | - else |
|
1063 | + } else |
|
1076 | 1064 | { |
1077 | 1065 | $subdir = ''; |
1078 | 1066 | } |
@@ -1210,8 +1198,7 @@ discard block |
||
1210 | 1198 | if (file_exists(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php')) |
1211 | 1199 | { |
1212 | 1200 | include_once(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php'); |
1213 | - } |
|
1214 | - else |
|
1201 | + } else |
|
1215 | 1202 | { |
1216 | 1203 | include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php'); |
1217 | 1204 | } |
@@ -1227,8 +1214,7 @@ discard block |
||
1227 | 1214 | { |
1228 | 1215 | $prefix = config_item('subclass_prefix'); |
1229 | 1216 | break; |
1230 | - } |
|
1231 | - else |
|
1217 | + } else |
|
1232 | 1218 | { |
1233 | 1219 | log_message('debug', $path.' exists, but does not declare '.$subclass); |
1234 | 1220 | } |
@@ -1277,8 +1263,7 @@ discard block |
||
1277 | 1263 | { |
1278 | 1264 | include($path.'config/'.strtolower($class).'.php'); |
1279 | 1265 | $found = TRUE; |
1280 | - } |
|
1281 | - elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
1266 | + } elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
1282 | 1267 | { |
1283 | 1268 | include($path.'config/'.ucfirst(strtolower($class)).'.php'); |
1284 | 1269 | $found = TRUE; |
@@ -1288,8 +1273,7 @@ discard block |
||
1288 | 1273 | { |
1289 | 1274 | include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'); |
1290 | 1275 | $found = TRUE; |
1291 | - } |
|
1292 | - elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
1276 | + } elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
1293 | 1277 | { |
1294 | 1278 | include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'); |
1295 | 1279 | $found = TRUE; |
@@ -169,12 +169,10 @@ discard block |
||
169 | 169 | file_exists(APPPATH.'vendor/autoload.php') |
170 | 170 | ? require_once(APPPATH.'vendor/autoload.php') |
171 | 171 | : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.'); |
172 | - } |
|
173 | - elseif (file_exists($composer_autoload)) |
|
172 | + } elseif (file_exists($composer_autoload)) |
|
174 | 173 | { |
175 | 174 | require_once($composer_autoload); |
176 | - } |
|
177 | - else |
|
175 | + } else |
|
178 | 176 | { |
179 | 177 | log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload); |
180 | 178 | } |
@@ -253,8 +251,7 @@ discard block |
||
253 | 251 | // This is required for mb_convert_encoding() to strip invalid characters. |
254 | 252 | // That's utilized by CI_Utf8, but it's also done for consistency with iconv. |
255 | 253 | mb_substitute_character('none'); |
256 | - } |
|
257 | - else |
|
254 | + } else |
|
258 | 255 | { |
259 | 256 | define('MB_ENABLED', FALSE); |
260 | 257 | } |
@@ -267,8 +264,7 @@ discard block |
||
267 | 264 | // iconv.internal_encoding is deprecated starting with PHP 5.6 |
268 | 265 | // and it's usage triggers E_DEPRECATED messages. |
269 | 266 | @ini_set('iconv.internal_encoding', $charset); |
270 | - } |
|
271 | - else |
|
267 | + } else |
|
272 | 268 | { |
273 | 269 | define('ICONV_ENABLED', FALSE); |
274 | 270 | } |
@@ -378,8 +374,7 @@ discard block |
||
378 | 374 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
379 | 375 | { |
380 | 376 | return CI_Controller::get_instance(); |
381 | - } |
|
382 | - else |
|
377 | + } else |
|
383 | 378 | { |
384 | 379 | return CI::$APP; |
385 | 380 | } |
@@ -424,21 +419,18 @@ discard block |
||
424 | 419 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
425 | 420 | { |
426 | 421 | $e404 = TRUE; |
427 | - } |
|
428 | - else |
|
422 | + } else |
|
429 | 423 | { |
430 | 424 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
431 | 425 | |
432 | 426 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
433 | 427 | { |
434 | 428 | $e404 = TRUE; |
435 | - } |
|
436 | - elseif (method_exists($class, '_remap')) |
|
429 | + } elseif (method_exists($class, '_remap')) |
|
437 | 430 | { |
438 | 431 | $params = array($method, array_slice($URI->rsegments, 2)); |
439 | 432 | $method = '_remap'; |
440 | - } |
|
441 | - elseif ( ! method_exists($class, $method)) |
|
433 | + } elseif ( ! method_exists($class, $method)) |
|
442 | 434 | { |
443 | 435 | $e404 = TRUE; |
444 | 436 | } |
@@ -490,8 +482,7 @@ discard block |
||
490 | 482 | $RTR->directory = ''; |
491 | 483 | } |
492 | 484 | } |
493 | - } |
|
494 | - else |
|
485 | + } else |
|
495 | 486 | { |
496 | 487 | $e404 = FALSE; |
497 | 488 | } |
@@ -507,8 +498,7 @@ discard block |
||
507 | 498 | 1 => $class, |
508 | 499 | 2 => $method |
509 | 500 | ); |
510 | - } |
|
511 | - else |
|
501 | + } else |
|
512 | 502 | { |
513 | 503 | show_404($RTR->directory.$class.'/'.$method); |
514 | 504 | } |
@@ -181,8 +181,7 @@ discard block |
||
181 | 181 | if (is_string($token)) |
182 | 182 | { |
183 | 183 | $new_source .= $token; |
184 | - } |
|
185 | - elseif ($i == $replacement['key']) |
|
184 | + } elseif ($i == $replacement['key']) |
|
186 | 185 | { |
187 | 186 | $new_source .= $replacement['value']; |
188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
192 | 191 | { |
193 | 192 | $replacement = false; |
194 | 193 | } |
195 | - } |
|
196 | - else |
|
194 | + } else |
|
197 | 195 | { |
198 | 196 | $new_source .= $token[1]; |
199 | 197 | } |
@@ -70,13 +70,11 @@ |
||
70 | 70 | { |
71 | 71 | $replacement = false; |
72 | 72 | } |
73 | - } |
|
74 | - else |
|
73 | + } else |
|
75 | 74 | { |
76 | 75 | $new_source .= $token; |
77 | 76 | } |
78 | - } |
|
79 | - else |
|
77 | + } else |
|
80 | 78 | { |
81 | 79 | $new_source .= $token[1]; |
82 | 80 | } |
@@ -181,8 +181,7 @@ discard block |
||
181 | 181 | if (is_string($token)) |
182 | 182 | { |
183 | 183 | $new_source .= $token; |
184 | - } |
|
185 | - elseif ($i == $replacement['key']) |
|
184 | + } elseif ($i == $replacement['key']) |
|
186 | 185 | { |
187 | 186 | $new_source .= $replacement['value']; |
188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
192 | 191 | { |
193 | 192 | $replacement = false; |
194 | 193 | } |
195 | - } |
|
196 | - else |
|
194 | + } else |
|
197 | 195 | { |
198 | 196 | $new_source .= $token[1]; |
199 | 197 | } |
@@ -181,8 +181,7 @@ discard block |
||
181 | 181 | if (is_string($token)) |
182 | 182 | { |
183 | 183 | $new_source .= $token; |
184 | - } |
|
185 | - elseif ($i == $replacement['key']) |
|
184 | + } elseif ($i == $replacement['key']) |
|
186 | 185 | { |
187 | 186 | $new_source .= $replacement['value']; |
188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
192 | 191 | { |
193 | 192 | $replacement = false; |
194 | 193 | } |
195 | - } |
|
196 | - else |
|
194 | + } else |
|
197 | 195 | { |
198 | 196 | $new_source .= $token[1]; |
199 | 197 | } |
@@ -70,13 +70,11 @@ |
||
70 | 70 | { |
71 | 71 | $replacement = false; |
72 | 72 | } |
73 | - } |
|
74 | - else |
|
73 | + } else |
|
75 | 74 | { |
76 | 75 | $new_source .= $token; |
77 | 76 | } |
78 | - } |
|
79 | - else |
|
77 | + } else |
|
80 | 78 | { |
81 | 79 | $new_source .= $token[1]; |
82 | 80 | } |
@@ -181,8 +181,7 @@ discard block |
||
181 | 181 | if (is_string($token)) |
182 | 182 | { |
183 | 183 | $new_source .= $token; |
184 | - } |
|
185 | - elseif ($i == $replacement['key']) |
|
184 | + } elseif ($i == $replacement['key']) |
|
186 | 185 | { |
187 | 186 | $new_source .= $replacement['value']; |
188 | 187 | $replacement['key'] = key(self::$replacement); |
@@ -192,8 +191,7 @@ discard block |
||
192 | 191 | { |
193 | 192 | $replacement = false; |
194 | 193 | } |
195 | - } |
|
196 | - else |
|
194 | + } else |
|
197 | 195 | { |
198 | 196 | $new_source .= $token[1]; |
199 | 197 | } |