@@ -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 | } |
@@ -19,8 +19,7 @@ |
||
19 | 19 | if ($class === null) |
20 | 20 | { |
21 | 21 | $message = 'exit() called in ' . $method . '() function'; |
22 | - } |
|
23 | - else |
|
22 | + } else |
|
24 | 23 | { |
25 | 24 | $message = 'exit() called in ' . $class . '::' . $method . '()'; |
26 | 25 | } |
@@ -63,16 +63,14 @@ discard block |
||
63 | 63 | if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE) |
64 | 64 | { |
65 | 65 | $method = 'refresh'; |
66 | - } |
|
67 | - elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) |
|
66 | + } elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) |
|
68 | 67 | { |
69 | 68 | if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1') |
70 | 69 | { |
71 | 70 | $code = ($_SERVER['REQUEST_METHOD'] !== 'GET') |
72 | 71 | ? 303 // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get |
73 | 72 | : 307; |
74 | - } |
|
75 | - else |
|
73 | + } else |
|
76 | 74 | { |
77 | 75 | $code = 302; |
78 | 76 | } |
@@ -97,8 +95,7 @@ discard block |
||
97 | 95 | if (ENVIRONMENT !== 'testing') |
98 | 96 | { |
99 | 97 | exit; |
100 | - } |
|
101 | - else |
|
98 | + } else |
|
102 | 99 | { |
103 | 100 | while (ob_get_level() > 1) |
104 | 101 | { |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | if (strpos($class, 'Mock_') === 0) |
64 | 64 | { |
65 | 65 | $class = strtolower(str_replace(array('Mock_', '_'), array('', DIRECTORY_SEPARATOR), $class)); |
66 | - } |
|
67 | - elseif (strpos($class, 'CI_') === 0) |
|
66 | + } elseif (strpos($class, 'CI_') === 0) |
|
68 | 67 | { |
69 | 68 | $subclass = substr($class, 3); |
70 | 69 | |
@@ -72,39 +71,32 @@ discard block |
||
72 | 71 | { |
73 | 72 | $dir = SYSTEM_PATH.'core'.DIRECTORY_SEPARATOR; |
74 | 73 | $class = $subclass; |
75 | - } |
|
76 | - elseif (in_array($subclass, $ci_libraries)) |
|
74 | + } elseif (in_array($subclass, $ci_libraries)) |
|
77 | 75 | { |
78 | 76 | $dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR; |
79 | 77 | $class = ($subclass === 'Driver_Library') ? 'Driver' : $subclass; |
80 | - } |
|
81 | - elseif (in_array($subclass, $ci_drivers)) |
|
78 | + } elseif (in_array($subclass, $ci_drivers)) |
|
82 | 79 | { |
83 | 80 | $dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$subclass.DIRECTORY_SEPARATOR; |
84 | 81 | $class = $subclass; |
85 | - } |
|
86 | - elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) { |
|
82 | + } elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) { |
|
87 | 83 | $dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$parent.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR; |
88 | 84 | $class = $subclass; |
89 | - } |
|
90 | - elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4) |
|
85 | + } elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4) |
|
91 | 86 | { |
92 | 87 | $driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR; |
93 | 88 | $dir = $driver_path.$m[1].DIRECTORY_SEPARATOR.'subdrivers'.DIRECTORY_SEPARATOR; |
94 | 89 | $file = $dir.$m[1].'_'.$m[2].'_'.$m[3].'.php'; |
95 | - } |
|
96 | - elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3) |
|
90 | + } elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3) |
|
97 | 91 | { |
98 | 92 | $driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR; |
99 | 93 | $dir = $driver_path.$m[1].DIRECTORY_SEPARATOR; |
100 | 94 | $file = $dir.$m[1].'_'.$m[2].'.php'; |
101 | - } |
|
102 | - elseif (strpos($class, 'CI_DB') === 0) |
|
95 | + } elseif (strpos($class, 'CI_DB') === 0) |
|
103 | 96 | { |
104 | 97 | $dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR; |
105 | 98 | $file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php'; |
106 | - } |
|
107 | - else |
|
99 | + } else |
|
108 | 100 | { |
109 | 101 | $class = strtolower($class); |
110 | 102 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |