@@ -38,8 +38,7 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $patched = true; |
| 40 | 40 | $new_source = static::generateNewSource($source); |
| 41 | - } |
|
| 42 | - else |
|
| 41 | + } else |
|
| 43 | 42 | { |
| 44 | 43 | $new_source = $source; |
| 45 | 44 | } |
@@ -196,29 +196,30 @@ discard block |
||
| 196 | 196 | if (isset($array[$index])) |
| 197 | 197 | { |
| 198 | 198 | $value = $array[$index]; |
| 199 | - } |
|
| 200 | - elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation |
|
| 199 | + } elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) { |
|
| 200 | + // Does the index contain array notation |
|
| 201 | 201 | { |
| 202 | 202 | $value = $array; |
| 203 | + } |
|
| 203 | 204 | for ($i = 0; $i < $count; $i++) |
| 204 | 205 | { |
| 205 | 206 | $key = trim($matches[0][$i], '[]'); |
| 206 | - if ($key === '') // Empty notation will return the value as array |
|
| 207 | + if ($key === '') { |
|
| 208 | + // Empty notation will return the value as array |
|
| 207 | 209 | { |
| 208 | 210 | break; |
| 209 | 211 | } |
| 212 | + } |
|
| 210 | 213 | |
| 211 | 214 | if (isset($value[$key])) |
| 212 | 215 | { |
| 213 | 216 | $value = $value[$key]; |
| 214 | - } |
|
| 215 | - else |
|
| 217 | + } else |
|
| 216 | 218 | { |
| 217 | 219 | return NULL; |
| 218 | 220 | } |
| 219 | 221 | } |
| 220 | - } |
|
| 221 | - else |
|
| 222 | + } else |
|
| 222 | 223 | { |
| 223 | 224 | return NULL; |
| 224 | 225 | } |
@@ -403,8 +404,7 @@ discard block |
||
| 403 | 404 | if ( ! is_numeric($expire)) |
| 404 | 405 | { |
| 405 | 406 | $expire = time() - 86500; |
| 406 | - } |
|
| 407 | - else |
|
| 407 | + } else |
|
| 408 | 408 | { |
| 409 | 409 | $expire = ($expire > 0) ? time() + $expire : 0; |
| 410 | 410 | } |
@@ -463,8 +463,7 @@ discard block |
||
| 463 | 463 | if ( ! $this->valid_ip($spoof)) |
| 464 | 464 | { |
| 465 | 465 | $spoof = NULL; |
| 466 | - } |
|
| 467 | - else |
|
| 466 | + } else |
|
| 468 | 467 | { |
| 469 | 468 | break; |
| 470 | 469 | } |
@@ -517,8 +516,7 @@ discard block |
||
| 517 | 516 | } |
| 518 | 517 | |
| 519 | 518 | $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b'; |
| 520 | - } |
|
| 521 | - else |
|
| 519 | + } else |
|
| 522 | 520 | { |
| 523 | 521 | $ip = explode('.', $this->ip_address); |
| 524 | 522 | $sprintf = '%08b%08b%08b%08b'; |
@@ -538,8 +536,7 @@ discard block |
||
| 538 | 536 | { |
| 539 | 537 | $netaddr[$i] = intval($netaddr[$i], 16); |
| 540 | 538 | } |
| 541 | - } |
|
| 542 | - else |
|
| 539 | + } else |
|
| 543 | 540 | { |
| 544 | 541 | $netaddr = explode('.', $netaddr); |
| 545 | 542 | } |
@@ -620,8 +617,7 @@ discard block |
||
| 620 | 617 | if ($this->_allow_get_array === FALSE) |
| 621 | 618 | { |
| 622 | 619 | $_GET = array(); |
| 623 | - } |
|
| 624 | - elseif (is_array($_GET)) |
|
| 620 | + } elseif (is_array($_GET)) |
|
| 625 | 621 | { |
| 626 | 622 | foreach ($_GET as $key => $val) |
| 627 | 623 | { |
@@ -657,8 +653,7 @@ discard block |
||
| 657 | 653 | if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE) |
| 658 | 654 | { |
| 659 | 655 | $_COOKIE[$cookie_key] = $this->_clean_input_data($val); |
| 660 | - } |
|
| 661 | - else |
|
| 656 | + } else |
|
| 662 | 657 | { |
| 663 | 658 | unset($_COOKIE[$key]); |
| 664 | 659 | } |
@@ -744,8 +739,7 @@ discard block |
||
| 744 | 739 | if ($fatal === TRUE) |
| 745 | 740 | { |
| 746 | 741 | return FALSE; |
| 747 | - } |
|
| 748 | - else |
|
| 742 | + } else |
|
| 749 | 743 | { |
| 750 | 744 | set_status_header(503); |
| 751 | 745 | echo 'Disallowed Key Characters.'; |
@@ -900,8 +894,7 @@ discard block |
||
| 900 | 894 | { |
| 901 | 895 | isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input'); |
| 902 | 896 | return $this->_raw_input_stream; |
| 903 | - } |
|
| 904 | - elseif ($name === 'ip_address') |
|
| 897 | + } elseif ($name === 'ip_address') |
|
| 905 | 898 | { |
| 906 | 899 | return $this->ip_address; |
| 907 | 900 | } |
@@ -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; |
@@ -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 | } |