diff options
| author | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-06 14:39:02 +0200 |
|---|---|---|
| committer | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-06 14:39:02 +0200 |
| commit | 0723617703dda3660597d9cdef59e7cdded1c497 (patch) | |
| tree | 1c5656de4cddc83e576a65abdd5dfd49438a6dfb | |
| parent | 6c8515459e4c631b0882532e8c44ee6435fd3809 (diff) | |
follow styling guide
| -rwxr-xr-x | system/core/Input.php | 2 | ||||
| -rw-r--r-- | tests/codeigniter/core/Input_test.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index 6a5a9d8f0..ac67aaf4f 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -383,7 +383,7 @@ class CI_Input { */ public function valid_ip($ip) { - if($this->ip_version($ip) === '4') + if ($this->ip_version($ip) === '4') { return (bool) filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4); } diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php index 27e152d6a..2aa3a6246 100644 --- a/tests/codeigniter/core/Input_test.php +++ b/tests/codeigniter/core/Input_test.php @@ -152,7 +152,8 @@ class Input_test extends CI_TestCase { $this->assertTrue($this->input->valid_ip($ip_v4)); $ip_v6 = array('2001:0db8:0000:85a3:0000:0000:ac1f:8001', '2001:db8:0:85a3:0:0:ac1f:8001', '2001:db8:0:85a3::ac1f:8001'); - foreach($ip_v6 as $ip) { + foreach($ip_v6 as $ip) + { $this->assertTrue($this->input->valid_ip($ip)); } } @@ -165,7 +166,8 @@ class Input_test extends CI_TestCase { $this->assertEquals('4', $this->input->ip_version($ip_v4)); $ip_v6 = array('2001:0db8:0000:85a3:0000:0000:ac1f:8001', '2001:db8:0:85a3:0:0:ac1f:8001', '2001:db8:0:85a3::ac1f:8001'); - foreach($ip_v6 as $ip) { + foreach($ip_v6 as $ip) + { $this->assertEquals('6', $this->input->ip_version($ip)); } } |