@@ -56,12 +56,10 @@ discard block |
||
| 56 | 56 | if (isset($info['class_method'])) |
| 57 | 57 | { |
| 58 | 58 | $called_method = $info['class_method']; |
| 59 | - } |
|
| 60 | - elseif (isset($info['function'])) |
|
| 59 | + } elseif (isset($info['function'])) |
|
| 61 | 60 | { |
| 62 | 61 | $called_method = $info['function']; |
| 63 | - } |
|
| 64 | - else |
|
| 62 | + } else |
|
| 65 | 63 | { |
| 66 | 64 | $called_method = 'n/a'; |
| 67 | 65 | } |
@@ -88,8 +86,7 @@ discard block |
||
| 88 | 86 | ) |
| 89 | 87 | { |
| 90 | 88 | $patch = self::$patches[$class][$method]; |
| 91 | - } |
|
| 92 | - else |
|
| 89 | + } else |
|
| 93 | 90 | { |
| 94 | 91 | return __GO_TO_ORIG__; |
| 95 | 92 | } |
@@ -47,8 +47,7 @@ discard block |
||
| 47 | 47 | ? $backtrace[$offset+2]['class'] |
| 48 | 48 | : null; |
| 49 | 49 | $function = $backtrace[$offset+2]['function']; |
| 50 | - } |
|
| 51 | - else |
|
| 50 | + } else |
|
| 52 | 51 | { |
| 53 | 52 | $class = null; |
| 54 | 53 | $function = null; |
@@ -59,8 +58,7 @@ discard block |
||
| 59 | 58 | $method = $function; |
| 60 | 59 | $class_method = $class . '::' . $function; |
| 61 | 60 | $function = null; |
| 62 | - } |
|
| 63 | - else |
|
| 61 | + } else |
|
| 64 | 62 | { |
| 65 | 63 | $method = null; |
| 66 | 64 | $class_method = null; |
@@ -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 | } |
@@ -58,13 +58,11 @@ |
||
| 58 | 58 | $new_source .= '{ ' . self::CODE; |
| 59 | 59 | $start_method = false; |
| 60 | 60 | $replacement = each(self::$replacement); |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $new_source .= $token; |
| 65 | 64 | } |
| 66 | - } |
|
| 67 | - else |
|
| 65 | + } else |
|
| 68 | 66 | { |
| 69 | 67 | $new_source .= $token[1]; |
| 70 | 68 | } |
@@ -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 | } |
@@ -70,8 +70,7 @@ |
||
| 70 | 70 | if (isset($config['root_dir'])) |
| 71 | 71 | { |
| 72 | 72 | Cache::setProjectRootDir($config['root_dir']); |
| 73 | - } |
|
| 74 | - else |
|
| 73 | + } else |
|
| 75 | 74 | { |
| 76 | 75 | // APPPATH is constant in CodeIgniter |
| 77 | 76 | Cache::setProjectRootDir(APPPATH . '../'); |
@@ -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 | { |
@@ -427,8 +424,7 @@ discard block |
||
| 427 | 424 | require_once($driver_path); |
| 428 | 425 | $class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge'; |
| 429 | 426 | } |
| 430 | - } |
|
| 431 | - else |
|
| 427 | + } else |
|
| 432 | 428 | { |
| 433 | 429 | $class = 'CI_DB_'.$db->dbdriver.'_forge'; |
| 434 | 430 | } |
@@ -696,8 +692,7 @@ discard block |
||
| 696 | 692 | } |
| 697 | 693 | |
| 698 | 694 | return $this; |
| 699 | - } |
|
| 700 | - elseif (empty($library)) |
|
| 695 | + } elseif (empty($library)) |
|
| 701 | 696 | { |
| 702 | 697 | return FALSE; |
| 703 | 698 | } |
@@ -790,8 +785,7 @@ discard block |
||
| 790 | 785 | array_shift($this->_ci_helper_paths); |
| 791 | 786 | array_shift($this->_ci_view_paths); |
| 792 | 787 | array_pop($config->_config_paths); |
| 793 | - } |
|
| 794 | - else |
|
| 788 | + } else |
|
| 795 | 789 | { |
| 796 | 790 | $path = rtrim($path, '/').'/'; |
| 797 | 791 | foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) |
@@ -853,8 +847,7 @@ discard block |
||
| 853 | 847 | { |
| 854 | 848 | $_ci_x = explode('/', $_ci_path); |
| 855 | 849 | $_ci_file = end($_ci_x); |
| 856 | - } |
|
| 857 | - else |
|
| 850 | + } else |
|
| 858 | 851 | { |
| 859 | 852 | $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); |
| 860 | 853 | $_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view; |
@@ -924,8 +917,7 @@ discard block |
||
| 924 | 917 | if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE) |
| 925 | 918 | { |
| 926 | 919 | echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path)))); |
| 927 | - } |
|
| 928 | - else |
|
| 920 | + } else |
|
| 929 | 921 | { |
| 930 | 922 | include($_ci_path); // include() vs include_once() allows for multiple views with the same name |
| 931 | 923 | } |
@@ -952,8 +944,7 @@ discard block |
||
| 952 | 944 | if (ob_get_level() > $this->_ci_ob_level + 1) |
| 953 | 945 | { |
| 954 | 946 | ob_end_flush(); |
| 955 | - } |
|
| 956 | - else |
|
| 947 | + } else |
|
| 957 | 948 | { |
| 958 | 949 | $_ci_CI->output->append_output(ob_get_contents()); |
| 959 | 950 | @ob_end_clean(); |
@@ -993,8 +984,7 @@ discard block |
||
| 993 | 984 | |
| 994 | 985 | // Get the filename from the path |
| 995 | 986 | $class = substr($class, $last_slash); |
| 996 | - } |
|
| 997 | - else |
|
| 987 | + } else |
|
| 998 | 988 | { |
| 999 | 989 | $subdir = ''; |
| 1000 | 990 | } |
@@ -1135,8 +1125,7 @@ discard block |
||
| 1135 | 1125 | { |
| 1136 | 1126 | $prefix = config_item('subclass_prefix'); |
| 1137 | 1127 | break; |
| 1138 | - } |
|
| 1139 | - else |
|
| 1128 | + } else |
|
| 1140 | 1129 | { |
| 1141 | 1130 | log_message('debug', $path.' exists, but does not declare '.$subclass); |
| 1142 | 1131 | } |
@@ -1183,8 +1172,7 @@ discard block |
||
| 1183 | 1172 | { |
| 1184 | 1173 | include($path.'config/'.strtolower($class).'.php'); |
| 1185 | 1174 | $found = TRUE; |
| 1186 | - } |
|
| 1187 | - elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
| 1175 | + } elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
| 1188 | 1176 | { |
| 1189 | 1177 | include($path.'config/'.ucfirst(strtolower($class)).'.php'); |
| 1190 | 1178 | $found = TRUE; |
@@ -1194,8 +1182,7 @@ discard block |
||
| 1194 | 1182 | { |
| 1195 | 1183 | include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'); |
| 1196 | 1184 | $found = TRUE; |
| 1197 | - } |
|
| 1198 | - elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
| 1185 | + } elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
| 1199 | 1186 | { |
| 1200 | 1187 | include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'); |
| 1201 | 1188 | $found = TRUE; |
@@ -1386,8 +1373,7 @@ discard block |
||
| 1386 | 1373 | if ( ! is_array($filename)) |
| 1387 | 1374 | { |
| 1388 | 1375 | return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension)); |
| 1389 | - } |
|
| 1390 | - else |
|
| 1376 | + } else |
|
| 1391 | 1377 | { |
| 1392 | 1378 | foreach ($filename as $key => $val) |
| 1393 | 1379 | { |
@@ -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 | { |
@@ -413,8 +410,7 @@ discard block |
||
| 413 | 410 | require_once($driver_path); |
| 414 | 411 | $class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge'; |
| 415 | 412 | } |
| 416 | - } |
|
| 417 | - else |
|
| 413 | + } else |
|
| 418 | 414 | { |
| 419 | 415 | $class = 'CI_DB_'.$db->dbdriver.'_forge'; |
| 420 | 416 | } |
@@ -682,8 +678,7 @@ discard block |
||
| 682 | 678 | } |
| 683 | 679 | |
| 684 | 680 | return $this; |
| 685 | - } |
|
| 686 | - elseif (empty($library)) |
|
| 681 | + } elseif (empty($library)) |
|
| 687 | 682 | { |
| 688 | 683 | return FALSE; |
| 689 | 684 | } |
@@ -776,8 +771,7 @@ discard block |
||
| 776 | 771 | array_shift($this->_ci_helper_paths); |
| 777 | 772 | array_shift($this->_ci_view_paths); |
| 778 | 773 | array_pop($config->_config_paths); |
| 779 | - } |
|
| 780 | - else |
|
| 774 | + } else |
|
| 781 | 775 | { |
| 782 | 776 | $path = rtrim($path, '/').'/'; |
| 783 | 777 | foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) |
@@ -839,8 +833,7 @@ discard block |
||
| 839 | 833 | { |
| 840 | 834 | $_ci_x = explode('/', $_ci_path); |
| 841 | 835 | $_ci_file = end($_ci_x); |
| 842 | - } |
|
| 843 | - else |
|
| 836 | + } else |
|
| 844 | 837 | { |
| 845 | 838 | $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); |
| 846 | 839 | $_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view; |
@@ -910,8 +903,7 @@ discard block |
||
| 910 | 903 | if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE && function_usable('eval')) |
| 911 | 904 | { |
| 912 | 905 | echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path)))); |
| 913 | - } |
|
| 914 | - else |
|
| 906 | + } else |
|
| 915 | 907 | { |
| 916 | 908 | include($_ci_path); // include() vs include_once() allows for multiple views with the same name |
| 917 | 909 | } |
@@ -938,8 +930,7 @@ discard block |
||
| 938 | 930 | if (ob_get_level() > $this->_ci_ob_level + 1) |
| 939 | 931 | { |
| 940 | 932 | ob_end_flush(); |
| 941 | - } |
|
| 942 | - else |
|
| 933 | + } else |
|
| 943 | 934 | { |
| 944 | 935 | $_ci_CI->output->append_output(ob_get_contents()); |
| 945 | 936 | @ob_end_clean(); |
@@ -979,8 +970,7 @@ discard block |
||
| 979 | 970 | |
| 980 | 971 | // Get the filename from the path |
| 981 | 972 | $class = substr($class, $last_slash); |
| 982 | - } |
|
| 983 | - else |
|
| 973 | + } else |
|
| 984 | 974 | { |
| 985 | 975 | $subdir = ''; |
| 986 | 976 | } |
@@ -1121,8 +1111,7 @@ discard block |
||
| 1121 | 1111 | { |
| 1122 | 1112 | $prefix = config_item('subclass_prefix'); |
| 1123 | 1113 | break; |
| 1124 | - } |
|
| 1125 | - else |
|
| 1114 | + } else |
|
| 1126 | 1115 | { |
| 1127 | 1116 | log_message('debug', APPPATH.'libraries/'.$file_path.$subclass.'.php exists, but does not declare '.$subclass); |
| 1128 | 1117 | } |
@@ -1169,8 +1158,7 @@ discard block |
||
| 1169 | 1158 | { |
| 1170 | 1159 | include($path.'config/'.strtolower($class).'.php'); |
| 1171 | 1160 | $found = TRUE; |
| 1172 | - } |
|
| 1173 | - elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
| 1161 | + } elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php')) |
|
| 1174 | 1162 | { |
| 1175 | 1163 | include($path.'config/'.ucfirst(strtolower($class)).'.php'); |
| 1176 | 1164 | $found = TRUE; |
@@ -1180,8 +1168,7 @@ discard block |
||
| 1180 | 1168 | { |
| 1181 | 1169 | include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'); |
| 1182 | 1170 | $found = TRUE; |
| 1183 | - } |
|
| 1184 | - elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
| 1171 | + } elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) |
|
| 1185 | 1172 | { |
| 1186 | 1173 | include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'); |
| 1187 | 1174 | $found = TRUE; |
@@ -1375,8 +1362,7 @@ discard block |
||
| 1375 | 1362 | if ( ! is_array($filename)) |
| 1376 | 1363 | { |
| 1377 | 1364 | return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension)); |
| 1378 | - } |
|
| 1379 | - else |
|
| 1365 | + } else |
|
| 1380 | 1366 | { |
| 1381 | 1367 | foreach ($filename as $key => $val) |
| 1382 | 1368 | { |
@@ -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 | } |