@@ -251,18 +251,20 @@ protected static function processWithSlash($range)
251
251
protected static function processWithAsterisk ($ range )
252
252
{
253
253
if (strpos ($ range , '* ' ) !== false ) {
254
- if ( self :: $ isv6 ) {
255
- $ lower = str_replace ( ' * ' , ' 0000 ' , $ range ) ;
256
- $ upper = str_replace ( ' * ' , ' ffff ' , $ range ) ;
257
- } else {
258
- $ lower = str_replace ('* ' , ' 0 ' , $ range );
259
- $ upper = str_replace ('* ' , ' 255 ' , $ range );
260
- }
254
+
255
+ $ lowerRange = self :: $ isv6 ? ' 0000 ' : ' 0 ' ;
256
+ $ upperRange = self :: $ isv6 ? ' ffff ' : ' 255 ' ;
257
+
258
+ $ lower = str_replace ('* ' ,$ lowerRange , $ range );
259
+ $ upper = str_replace ('* ' ,$ upperRange , $ range );
260
+
261
261
$ range = $ lower . '- ' . $ upper ;
262
262
}
263
+
263
264
if (strpos ($ range , '- ' ) !== false ) {
264
265
return self ::processWithMinus ($ range );
265
266
}
267
+
266
268
return false ;
267
269
}
268
270
@@ -353,18 +355,14 @@ public static function long2ip($dec, $ipv6 = false)
353
355
354
356
public static function matchRange ($ ip , $ range )
355
357
{
356
- $ ipItems = explode ('. ' , $ ip );
357
- $ rangeItems = explode ('. ' , $ range );
358
+ $ ipParts = explode ('. ' , $ ip );
359
+ $ rangeParts = explode ('. ' , $ range );
358
360
359
- $ ipItems = array_filter ($ ipItems , function ($ subnet ) {
360
- return $ subnet !== '' ;
361
- });
362
- $ rangeItems = array_filter ($ rangeItems , function ($ subnet ) {
363
- return $ subnet !== '' ;
364
- });
361
+ $ ipParts = array_filter ($ ipParts );
362
+ $ rangeParts = array_filter ($ rangeParts );
365
363
366
- $ ipItems = array_slice ($ ipItems , 0 , count ($ rangeItems ));
364
+ $ ipParts = array_slice ($ ipParts , 0 , count ($ rangeParts ));
367
365
368
- return implode ('. ' , $ rangeItems ) === implode ('. ' , $ ipItems );
366
+ return implode ('. ' , $ rangeParts ) === implode ('. ' , $ ipParts );
369
367
}
370
368
}
0 commit comments