@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -135,8 +135,7 @@ discard block |
||
| 135 | 135 | return $this->callControllerMethod( |
| 136 | 136 | $http_method, $argv, $params |
| 137 | 137 | ); |
| 138 | - } |
|
| 139 | - else |
|
| 138 | + } else |
|
| 140 | 139 | { |
| 141 | 140 | return $this->requestUri($http_method, $argv, $params); |
| 142 | 141 | } |
@@ -147,8 +146,7 @@ discard block |
||
| 147 | 146 | if ($e->getCode() === 0) |
| 148 | 147 | { |
| 149 | 148 | set_status_header(200); |
| 150 | - } |
|
| 151 | - else |
|
| 149 | + } else |
|
| 152 | 150 | { |
| 153 | 151 | set_status_header($e->getCode()); |
| 154 | 152 | } |
@@ -218,8 +216,7 @@ discard block |
||
| 218 | 216 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
| 219 | 217 | { |
| 220 | 218 | new CI_Controller(); |
| 221 | - } |
|
| 222 | - else |
|
| 219 | + } else |
|
| 223 | 220 | { |
| 224 | 221 | new CI(); |
| 225 | 222 | new MX_Controller(); |
@@ -29,16 +29,14 @@ discard block |
||
| 29 | 29 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
| 30 | 30 | { |
| 31 | 31 | $e404 = TRUE; |
| 32 | - } |
|
| 33 | - else |
|
| 32 | + } else |
|
| 34 | 33 | { |
| 35 | 34 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
| 36 | 35 | |
| 37 | 36 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
| 38 | 37 | { |
| 39 | 38 | $e404 = TRUE; |
| 40 | - } |
|
| 41 | - elseif (method_exists($class, '_remap')) |
|
| 39 | + } elseif (method_exists($class, '_remap')) |
|
| 42 | 40 | { |
| 43 | 41 | $params = array($method, array_slice($URI->rsegments, 2)); |
| 44 | 42 | $method = '_remap'; |
@@ -63,8 +61,7 @@ discard block |
||
| 63 | 61 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
| 64 | 62 | { |
| 65 | 63 | new CI_Controller(); |
| 66 | - } |
|
| 67 | - else |
|
| 64 | + } else |
|
| 68 | 65 | { |
| 69 | 66 | new CI(); |
| 70 | 67 | new MX_Controller(); |