Changeset 3049438

Timestamp:

03/12/2024 01:19:26 AM (12 months ago)

Author:

dynahsty

Message:

v1.23

File:

• ip-guard/tags/v1.23/ip-guard.php (modified) (3 diffs)

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

@@ -16 +16 @@
 */
 
-defined('ABSPATH') or die('No direct access allowed. Kindly exist');
 $max_ip_addresses = get_option('ip_guard_max_ip_addresses', 2);
 
@@ -25 +24 @@
 
 function ip_guard_authenticate($user, $username, $password) {
-    if ($user instanceof WP_User) {
-        if (in_array('administrator', (array) $user->roles)) {
-            return $user;
-        }
+    if ($user instanceof WP_User && !in_array('administrator', (array) $user->roles)) {
         $stored_ips = get_user_meta($user->ID, '_stored_ips', true);
-
         if (!$stored_ips) {
             $stored_ips = array();
@@ -38 +33 @@
 
         if (filter_var($client_ip, FILTER_VALIDATE_IP)) {
-           $escaped_ip = esc_attr($client_ip);
-
-        } else {
-        }
-
-        if (!in_array($client_ip, $stored_ips)) {
-            $stored_ips[] = $client_ip;
-            update_user_meta($user->ID, '_stored_ips', $stored_ips);
-        }
-
-        $max_ip_addresses = intval(get_option('ip_guard_max_ip_addresses', 2));
-
-        $all_similar = count(array_unique($stored_ips)) === 1;
-
-        if (!$all_similar && count($stored_ips) >= $max_ip_addresses) {
-            ip_guard_lock_user($user->ID);
-            return new WP_Error('account_locked', __('Account locked due to unusual activity. Contact our support team.', 'ip-guard'));
+            if (!in_array($client_ip, $stored_ips)) {
+                $stored_ips[] = $client_ip;
+                update_user_meta($user->ID, '_stored_ips', $stored_ips);
+            }
+
+            $max_ip_addresses = intval(get_option('ip_guard_max_ip_addresses', 2));
+
+            $all_similar = ip_addresses_similar($stored_ips);
+
+            if (!$all_similar && count($stored_ips) >= $max_ip_addresses) {
+                ip_guard_lock_user($user->ID);
+                return new WP_Error('account_locked', __('Account locked due to unusual activity. Contact our support team.', 'ip-guard'));
+            }
         }
     }
 
     return $user;
+}
+
+function ip_addresses_similar($ip_addresses) {
+    $first_ip = reset($ip_addresses);
+    foreach ($ip_addresses as $ip) {
+        if ($ip !== $first_ip) {
+            return false;
+        }
+    }
+    return true;
 }