@@ -200,29 +200,30 @@ discard block |
||
| 200 | 200 | if (isset($array[$index])) |
| 201 | 201 | { |
| 202 | 202 | $value = $array[$index]; |
| 203 | - } |
|
| 204 | - elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation |
|
| 203 | + } elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) { |
|
| 204 | + // Does the index contain array notation |
|
| 205 | 205 | { |
| 206 | 206 | $value = $array; |
| 207 | + } |
|
| 207 | 208 | for ($i = 0; $i < $count; $i++) |
| 208 | 209 | { |
| 209 | 210 | $key = trim($matches[0][$i], '[]'); |
| 210 | - if ($key === '') // Empty notation will return the value as array |
|
| 211 | + if ($key === '') { |
|
| 212 | + // Empty notation will return the value as array |
|
| 211 | 213 | { |
| 212 | 214 | break; |
| 213 | 215 | } |
| 216 | + } |
|
| 214 | 217 | |
| 215 | 218 | if (isset($value[$key])) |
| 216 | 219 | { |
| 217 | 220 | $value = $value[$key]; |
| 218 | - } |
|
| 219 | - else |
|
| 221 | + } else |
|
| 220 | 222 | { |
| 221 | 223 | return NULL; |
| 222 | 224 | } |
| 223 | 225 | } |
| 224 | - } |
|
| 225 | - else |
|
| 226 | + } else |
|
| 226 | 227 | { |
| 227 | 228 | return NULL; |
| 228 | 229 | } |
@@ -421,8 +422,7 @@ discard block |
||
| 421 | 422 | if ( ! is_numeric($expire)) |
| 422 | 423 | { |
| 423 | 424 | $expire = time() - 86500; |
| 424 | - } |
|
| 425 | - else |
|
| 425 | + } else |
|
| 426 | 426 | { |
| 427 | 427 | $expire = ($expire > 0) ? time() + $expire : 0; |
| 428 | 428 | } |
@@ -483,8 +483,7 @@ discard block |
||
| 483 | 483 | if ( ! $this->valid_ip($spoof)) |
| 484 | 484 | { |
| 485 | 485 | $spoof = NULL; |
| 486 | - } |
|
| 487 | - else |
|
| 486 | + } else |
|
| 488 | 487 | { |
| 489 | 488 | break; |
| 490 | 489 | } |
@@ -537,8 +536,7 @@ discard block |
||
| 537 | 536 | } |
| 538 | 537 | |
| 539 | 538 | $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b'; |
| 540 | - } |
|
| 541 | - else |
|
| 539 | + } else |
|
| 542 | 540 | { |
| 543 | 541 | $ip = explode('.', $this->ip_address); |
| 544 | 542 | $sprintf = '%08b%08b%08b%08b'; |
@@ -558,8 +556,7 @@ discard block |
||
| 558 | 556 | { |
| 559 | 557 | $netaddr[$j] = intval($netaddr[$j], 16); |
| 560 | 558 | } |
| 561 | - } |
|
| 562 | - else |
|
| 559 | + } else |
|
| 563 | 560 | { |
| 564 | 561 | $netaddr = explode('.', $netaddr); |
| 565 | 562 | } |
@@ -646,8 +643,7 @@ discard block |
||
| 646 | 643 | if ($this->_allow_get_array === FALSE) |
| 647 | 644 | { |
| 648 | 645 | $_GET = array(); |
| 649 | - } |
|
| 650 | - elseif (is_array($_GET)) |
|
| 646 | + } elseif (is_array($_GET)) |
|
| 651 | 647 | { |
| 652 | 648 | foreach ($_GET as $key => $val) |
| 653 | 649 | { |
@@ -683,8 +679,7 @@ discard block |
||
| 683 | 679 | if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE) |
| 684 | 680 | { |
| 685 | 681 | $_COOKIE[$cookie_key] = $this->_clean_input_data($val); |
| 686 | - } |
|
| 687 | - else |
|
| 682 | + } else |
|
| 688 | 683 | { |
| 689 | 684 | unset($_COOKIE[$key]); |
| 690 | 685 | } |
@@ -774,8 +769,7 @@ discard block |
||
| 774 | 769 | if ($fatal === TRUE) |
| 775 | 770 | { |
| 776 | 771 | return FALSE; |
| 777 | - } |
|
| 778 | - else |
|
| 772 | + } else |
|
| 779 | 773 | { |
| 780 | 774 | set_status_header(503); |
| 781 | 775 | echo 'Disallowed Key Characters.'; |
@@ -814,8 +808,7 @@ discard block |
||
| 814 | 808 | if (function_exists('apache_request_headers')) |
| 815 | 809 | { |
| 816 | 810 | $this->headers = apache_request_headers(); |
| 817 | - } |
|
| 818 | - else |
|
| 811 | + } else |
|
| 819 | 812 | { |
| 820 | 813 | isset($_SERVER['CONTENT_TYPE']) && $this->headers['Content-Type'] = $_SERVER['CONTENT_TYPE']; |
| 821 | 814 | |
@@ -944,8 +937,7 @@ discard block |
||
| 944 | 937 | { |
| 945 | 938 | isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input'); |
| 946 | 939 | return $this->_raw_input_stream; |
| 947 | - } |
|
| 948 | - elseif ($name === 'ip_address') |
|
| 940 | + } elseif ($name === 'ip_address') |
|
| 949 | 941 | { |
| 950 | 942 | return $this->ip_address; |
| 951 | 943 | } |
@@ -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.'; |