Completed
Push — master ( 7cc4c8...8ca755 )
by Martijn van
02:45
created
code/model/IpAccess.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -119,8 +119,10 @@  discard block
 block discarded – undo
119 119
         $ipFirstPart = substr($this->ip, 0, strrpos($this->ip, '.') + 1);
120 120
         $ipLastpart  = substr(strrchr($this->ip, '.'), 1);
121 121
 
122
-        if (!empty($ranges)) foreach ($ranges as $range) {
122
+        if (!empty($ranges)) {
123
+        	foreach ($ranges as $range) {
123 124
             $rangeFirstPart = substr($range, 0, strrpos($range, '.') + 1);
125
+        }
124 126
             list ($start, $end) = explode('-', substr(strrchr($range, '.'), 1));
125 127
             if ($ipFirstPart === $rangeFirstPart && $ipLastpart >= $start && $ipLastpart <= $end) {
126 128
                 return $range;
@@ -141,8 +143,10 @@  discard block
 block discarded – undo
141 143
             return strstr($ip, '/');
142 144
         });
143 145
 
144
-        if (!empty($ranges)) foreach ($ranges as $range) {
146
+        if (!empty($ranges)) {
147
+        	foreach ($ranges as $range) {
145 148
             list ($net, $mask) = explode('/', $cidr);
149
+        }
146 150
             if ((ip2long($this->ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($net)) {
147 151
                 return $cidr;
148 152
             }
@@ -163,9 +167,11 @@  discard block
 block discarded – undo
163 167
             return substr($ip, -1) === '*';
164 168
         });
165 169
 
166
-        if (!empty($ranges)) foreach ($ranges as $range) {
170
+        if (!empty($ranges)) {
171
+        	foreach ($ranges as $range) {
167 172
             if (substr($this->ip, 0, strlen(substr($range, 0, -1))) === substr($range, 0, -1)) {
168 173
                 return $range;
174
+        }
169 175
             }
170 176
         }
171 177
         return '';
Please login to merge, or discard this patch.