Changeset 3053310

Timestamp:

03/18/2024 10:04:23 AM (12 months ago)

Author:

dynahsty

Message:

v1.23.1

File:

• ip-guard/tags/v1.23.1/ip-guard.php (modified) (2 diffs)

ip-guard/tags/v1.23.1/ip-guard.php

@@ -56 +56 @@
 
 function ip_addresses_similar($ip_addresses) {
-    $subnet_mask = ip2long('255.255.0.0');
-
-    $first_ip = reset($ip_addresses);
+    $ip_groups = [];
     foreach ($ip_addresses as $ip) {
-        if (!subnet_match($first_ip, $ip, $subnet_mask)) {
+        $first_octet = explode('.', $ip)[0];
+        $ip_groups[$first_octet][] = $ip;
+    }
+    
+    foreach ($ip_groups as $group) {
+        if (!all_ip_addresses_similar_in_group($group)) {
             return false;
         }
     }
+
     return true;
 }
 
-function subnet_match($ip1, $ip2, $subnet_mask) {
-    $ip1_long = ip2long($ip1);
-    $ip2_long = ip2long($ip2);
-    $network1 = $ip1_long & $subnet_mask;
-    $network2 = $ip2_long & $subnet_mask;
-    return ($network1 === $network2);
+function all_ip_addresses_similar_in_group($ip_group) {
+    $first_ip_octets = explode('.', reset($ip_group));
+
+    foreach ($ip_group as $ip) {
+        $current_ip_octets = explode('.', $ip);
+
+        if (count($first_ip_octets) !== count($current_ip_octets)) {
+            return false;
+        }
+
+        for ($i = 1; $i < count($first_ip_octets); $i++) {
+            if ($first_ip_octets[$i] !== $current_ip_octets[$i]) {
+                return false;
+            }
+        }
+    }
+
+    return true;
 }
 
@@ -257 +273 @@
     add_submenu_page(
         'ip_guard_admin_page',
-        __('Donation', 'ip-guard'),
-        __('Donation', 'ip-guard'),
+        __('Donate', 'ip-guard'),
+        __('Donate', 'ip-guard'),
         'manage_options',
         'ip_guard_donation_page',