@@ -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,16 +419,14 @@ 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'; |
@@ -475,8 +468,7 @@ discard block |
||
475 | 468 | $RTR->directory = ''; |
476 | 469 | } |
477 | 470 | } |
478 | - } |
|
479 | - else |
|
471 | + } else |
|
480 | 472 | { |
481 | 473 | $e404 = FALSE; |
482 | 474 | } |
@@ -492,8 +484,7 @@ discard block |
||
492 | 484 | 1 => $class, |
493 | 485 | 2 => $method |
494 | 486 | ); |
495 | - } |
|
496 | - else |
|
487 | + } else |
|
497 | 488 | { |
498 | 489 | show_404($RTR->directory.$class.'/'.$method); |
499 | 490 | } |
@@ -158,14 +158,16 @@ discard block |
||
158 | 158 | if ($status_code < 100) |
159 | 159 | { |
160 | 160 | $exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN |
161 | - if ($exit_status > 125) // 125 is EXIT__AUTO_MAX |
|
161 | + if ($exit_status > 125) { |
|
162 | + // 125 is EXIT__AUTO_MAX |
|
162 | 163 | { |
163 | - $exit_status = 1; // EXIT_ERROR |
|
164 | + $exit_status = 1; |
|
165 | + } |
|
166 | + // EXIT_ERROR |
|
164 | 167 | } |
165 | 168 | |
166 | 169 | $status_code = 500; |
167 | - } |
|
168 | - else |
|
170 | + } else |
|
169 | 171 | { |
170 | 172 | $exit_status = 1; // EXIT_ERROR |
171 | 173 | } |
@@ -254,8 +256,7 @@ discard block |
||
254 | 256 | if (isset($stati[$code])) |
255 | 257 | { |
256 | 258 | $text = $stati[$code]; |
257 | - } |
|
258 | - else |
|
259 | + } else |
|
259 | 260 | { |
260 | 261 | show_error('No status text available. Please check your status code number or supply your own message text.', 500); |
261 | 262 | } |
@@ -281,8 +282,7 @@ discard block |
||
281 | 282 | if (strpos(PHP_SAPI, 'cgi') === 0) |
282 | 283 | { |
283 | 284 | header('Status: '.$code.' '.$text, TRUE); |
284 | - } |
|
285 | - else |
|
285 | + } else |
|
286 | 286 | { |
287 | 287 | $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1'; |
288 | 288 | header($server_protocol.' '.$code.' '.$text, TRUE, $code); |
@@ -325,8 +325,7 @@ discard block |
||
325 | 325 | if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) |
326 | 326 | { |
327 | 327 | require($file_path); |
328 | - } |
|
329 | - elseif ( ! $found) |
|
328 | + } elseif ( ! $found) |
|
330 | 329 | { |
331 | 330 | set_status_header(503); |
332 | 331 | echo 'The configuration file does not exist.'; |
@@ -192,16 +192,14 @@ discard block |
||
192 | 192 | if (empty($library)) |
193 | 193 | { |
194 | 194 | return $this; |
195 | - } |
|
196 | - elseif (is_array($library)) |
|
195 | + } elseif (is_array($library)) |
|
197 | 196 | { |
198 | 197 | foreach ($library as $key => $value) |
199 | 198 | { |
200 | 199 | if (is_int($key)) |
201 | 200 | { |
202 | 201 | $this->library($value, $params); |
203 | - } |
|
204 | - else |
|
202 | + } else |
|
205 | 203 | { |
206 | 204 | $this->library($key, $params, $value); |
207 | 205 | } |
@@ -238,8 +236,7 @@ discard block |
||
238 | 236 | if (empty($model)) |
239 | 237 | { |
240 | 238 | return $this; |
241 | - } |
|
242 | - elseif (is_array($model)) |
|
239 | + } elseif (is_array($model)) |
|
243 | 240 | { |
244 | 241 | foreach ($model as $key => $value) |
245 | 242 | { |
@@ -305,8 +302,7 @@ discard block |
||
305 | 302 | { |
306 | 303 | throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model"); |
307 | 304 | } |
308 | - } |
|
309 | - elseif ( ! class_exists('CI_Model', FALSE)) |
|
305 | + } elseif ( ! class_exists('CI_Model', FALSE)) |
|
310 | 306 | { |
311 | 307 | require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php'); |
312 | 308 | } |
@@ -457,8 +453,7 @@ discard block |
||
457 | 453 | require_once($driver_path); |
458 | 454 | $class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge'; |
459 | 455 | } |
460 | - } |
|
461 | - else |
|
456 | + } else |
|
462 | 457 | { |
463 | 458 | $class = 'CI_DB_'.$db->dbdriver.'_forge'; |
464 | 459 | } |
@@ -725,16 +720,14 @@ discard block |
||
725 | 720 | if (is_int($key)) |
726 | 721 | { |
727 | 722 | $this->driver($value, $params); |
728 | - } |
|
729 | - else |
|
723 | + } else |
|
730 | 724 | { |
731 | 725 | $this->driver($key, $params, $value); |
732 | 726 | } |
733 | 727 | } |
734 | 728 | |
735 | 729 | return $this; |
736 | - } |
|
737 | - elseif (empty($library)) |
|
730 | + } elseif (empty($library)) |
|
738 | 731 | { |
739 | 732 | return FALSE; |
740 | 733 | } |
@@ -827,8 +820,7 @@ discard block |
||
827 | 820 | array_shift($this->_ci_helper_paths); |
828 | 821 | array_shift($this->_ci_view_paths); |
829 | 822 | array_pop($config->_config_paths); |
830 | - } |
|
831 | - else |
|
823 | + } else |
|
832 | 824 | { |
833 | 825 | $path = rtrim($path, '/').'/'; |
834 | 826 | foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) |
@@ -890,8 +882,7 @@ discard block |
||
890 | 882 | { |
891 | 883 | $_ci_x = explode('/', $_ci_path); |
892 | 884 | $_ci_file = end($_ci_x); |
893 | - } |
|
894 | - else |
|
885 | + } else |
|
895 | 886 | { |
896 | 887 | $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); |
897 | 888 | $_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view; |
@@ -969,8 +960,7 @@ discard block |
||
969 | 960 | if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE) |
970 | 961 | { |
971 | 962 | echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path)))); |
972 | - } |
|
973 | - else |
|
963 | + } else |
|
974 | 964 | { |
975 | 965 | include($_ci_path); // include() vs include_once() allows for multiple views with the same name |
976 | 966 | } |
@@ -997,8 +987,7 @@ discard block |
||
997 | 987 | if (ob_get_level() > $this->_ci_ob_level + 1) |
998 | 988 | { |
999 | 989 | ob_end_flush(); |
1000 | - } |
|
1001 | - else |
|
990 | + } else |
|
1002 | 991 | { |
1003 | 992 | $_ci_CI->output->append_output(ob_get_contents()); |
1004 | 993 | @ob_end_clean(); |
@@ -1038,8 +1027,7 @@ discard block |
||
1038 | 1027 | |
1039 | 1028 | // Get the filename from the path |
1040 | 1029 | $class = substr($class, $last_slash); |
1041 | - } |
|
1042 | - else |
|
1030 | + } else |
|
1043 | 1031 | { |
1044 | 1032 | $subdir = ''; |
1045 | 1033 | } |
@@ -1180,8 +1168,7 @@ discard block |
||
1180 | 1168 | { |
1181 | 1169 | $prefix = config_item('subclass_prefix'); |
1182 | 1170 | break; |
1183 | - } |
|
1184 | - else |
|
1171 | + } else |
|
1185 | 1172 | { |
1186 | 1173 | log_message('debug', $path.' exists, but does not declare '.$subclass); |
1187 | 1174 | } |
@@ -1228,8 +1215,7 @@ discard block |
||
1228 | 1215 | { |
1229 | 1216 | include($path.'config/'.strtolower($class).'.php'); |
1230 | 1217 | $found = TRUE; |
1231 | - } |
|
1232 | - elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
1218 | + } elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
1233 | 1219 | { |
1234 | 1220 | include($path.'config/'.ucfirst(strtolower($class)).'.php'); |
1235 | 1221 | $found = TRUE; |
@@ -1239,8 +1225,7 @@ discard block |
||
1239 | 1225 | { |
1240 | 1226 | include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'); |
1241 | 1227 | $found = TRUE; |
1242 | - } |
|
1243 | - elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
1228 | + } elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
1244 | 1229 | { |
1245 | 1230 | include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'); |
1246 | 1231 | $found = TRUE; |
@@ -1428,8 +1413,7 @@ discard block |
||
1428 | 1413 | if ( ! is_array($filename)) |
1429 | 1414 | { |
1430 | 1415 | return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension)); |
1431 | - } |
|
1432 | - else |
|
1416 | + } else |
|
1433 | 1417 | { |
1434 | 1418 | foreach ($filename as $key => $val) |
1435 | 1419 | { |
@@ -80,8 +80,7 @@ discard block |
||
80 | 80 | if (version_compare(PHP_VERSION, '5.3', '>=')) |
81 | 81 | { |
82 | 82 | error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
83 | - } |
|
84 | - else |
|
83 | + } else |
|
85 | 84 | { |
86 | 85 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
87 | 86 | } |
@@ -204,8 +203,7 @@ discard block |
||
204 | 203 | if (($_temp = realpath($system_path)) !== FALSE) |
205 | 204 | { |
206 | 205 | $system_path = $_temp.DIRECTORY_SEPARATOR; |
207 | - } |
|
208 | - else |
|
206 | + } else |
|
209 | 207 | { |
210 | 208 | // Ensure there's a trailing slash |
211 | 209 | $system_path = strtr( |
@@ -247,8 +245,7 @@ discard block |
||
247 | 245 | if (($_temp = realpath($application_folder)) !== FALSE) |
248 | 246 | { |
249 | 247 | $application_folder = $_temp; |
250 | - } |
|
251 | - else |
|
248 | + } else |
|
252 | 249 | { |
253 | 250 | $application_folder = strtr( |
254 | 251 | rtrim($application_folder, '/\\'), |
@@ -256,16 +253,14 @@ discard block |
||
256 | 253 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
257 | 254 | ); |
258 | 255 | } |
259 | - } |
|
260 | - elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
256 | + } elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
261 | 257 | { |
262 | 258 | $application_folder = BASEPATH.strtr( |
263 | 259 | trim($application_folder, '/\\'), |
264 | 260 | '/\\', |
265 | 261 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
266 | 262 | ); |
267 | - } |
|
268 | - else |
|
263 | + } else |
|
269 | 264 | { |
270 | 265 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
271 | 266 | echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
@@ -278,14 +273,12 @@ discard block |
||
278 | 273 | if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) |
279 | 274 | { |
280 | 275 | $view_folder = APPPATH.'views'; |
281 | - } |
|
282 | - elseif (is_dir($view_folder)) |
|
276 | + } elseif (is_dir($view_folder)) |
|
283 | 277 | { |
284 | 278 | if (($_temp = realpath($view_folder)) !== FALSE) |
285 | 279 | { |
286 | 280 | $view_folder = $_temp; |
287 | - } |
|
288 | - else |
|
281 | + } else |
|
289 | 282 | { |
290 | 283 | $view_folder = strtr( |
291 | 284 | rtrim($view_folder, '/\\'), |
@@ -293,16 +286,14 @@ discard block |
||
293 | 286 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
294 | 287 | ); |
295 | 288 | } |
296 | - } |
|
297 | - elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
289 | + } elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
298 | 290 | { |
299 | 291 | $view_folder = APPPATH.strtr( |
300 | 292 | trim($view_folder, '/\\'), |
301 | 293 | '/\\', |
302 | 294 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
303 | 295 | ); |
304 | - } |
|
305 | - else |
|
296 | + } else |
|
306 | 297 | { |
307 | 298 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
308 | 299 | echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
@@ -173,13 +173,11 @@ |
||
173 | 173 | if (is_string($token)) |
174 | 174 | { |
175 | 175 | $new_source .= $token; |
176 | - } |
|
177 | - elseif ($i == $replacement['key']) |
|
176 | + } elseif ($i == $replacement['key']) |
|
178 | 177 | { |
179 | 178 | $new_source .= $replacement['value']; |
180 | 179 | $replacement = each(self::$replacement); |
181 | - } |
|
182 | - else |
|
180 | + } else |
|
183 | 181 | { |
184 | 182 | $new_source .= $token[1]; |
185 | 183 | } |