1 files changed, 80 insertions, 0 deletions
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index b6e9a9026..369426d33 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -58,6 +58,19 @@ class RegisterThrottlePlugin extends Plugin
                               3600 => 3); // per hour
 
     /**
+     * Disallow registration if a silenced user has registered from
+     * this IP address.
+     */
+
+    public $silenced = true;
+
+    /**
+     * Whether we're enabled; prevents recursion.
+     */
+
+    static private $enabled = true;
+
+    /**
      * Database schema setup
      *
      * We store user registrations in a table registration_ip.
@@ -138,6 +151,18 @@ class RegisterThrottlePlugin extends Plugin
             }
         }
 
+        // Check for silenced users
+
+        if ($this->silenced) {
+            $ids = Registration_ip::usersByIP($ipaddress);
+            foreach ($ids as $id) {
+                $profile = Profile::staticGet('id', $id);
+                if ($profile->isSilenced()) {
+                    throw new Exception(_("A banned user has registered from this address."));
+                }
+            }
+        }
+
         return true;
     }
 
@@ -245,4 +270,59 @@ class RegisterThrottlePlugin extends Plugin
             return null;
         }
     }
+
+    /**
+     * When silencing a user, silence all other users registered from that IP
+     * address.
+     *
+     * @param Profile $profile Person getting a new role
+     * @param string  $role    Role being assigned like 'moderator' or 'silenced'
+     *
+     * @return boolean hook value
+     */
+
+    function onEndGrantRole($profile, $role)
+    {
+        if (!self::$enabled) {
+            return true;
+        }
+
+        if ($role != Profile_role::SILENCED) {
+            return true;
+        }
+
+        if (!$this->silenced) {
+            return true;
+        }
+
+        $ri = Registration_ip::staticGet('user_id', $profile->id);
+
+        if (empty($ri)) {
+            return true;
+        }
+
+        $ids = Registration_ip::usersByIP($ri->ipaddress);
+
+        foreach ($ids as $id) {
+
+            if ($id == $profile->id) {
+                continue;
+            }
+
+            $other = Profile::staticGet('id', $id);
+
+            if (empty($other)) {
+                continue;
+            }
+
+            if ($other->isSilenced()) {
+                continue;
+            }
+
+            $old = self::$enabled;
+            self::$enabled = false;
+            $other->silence();
+            self::$enabled = $old;
+        }
+    }
 }