Improve domain restriction

Author: fguillot

Plugin.php

@@ -47,7 +47,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.6';
+        return '1.0.7';
     }
 
     public function getPluginHomepage()

Test/Validator/RegistrationValidatorTest.php

@@ -39,6 +39,24 @@ public function testWithDomainRestriction()
         ));
 
         $this->assertTrue($result);
+
+        list($result,) = $validator->validateCreation(array(
+            'username' => 'test',
+            'email' => 'test@mydomain.tld.example.org',
+            'password' => 'test123',
+            'confirmation' => 'test123',
+        ));
+
+        $this->assertFalse($result);
+
+        list($result,) = $validator->validateCreation(array(
+            'username' => 'test',
+            'email' => 'test+mydomain.tld@example.org',
+            'password' => 'test123',
+            'confirmation' => 'test123',
+        ));
+
+        $this->assertFalse($result);
     }
 
     public function testWithMultipleDomainRestriction()

Validator/RegistrationValidator.php

@@ -55,10 +55,15 @@ public function validateCreation(array $values)
      */
     private function validateDomainRestriction(array $values, $domains)
     {
-        foreach (explode(',', $domains) as $domain) {
-            $domain = trim($domain);
+        if (strpos($values['email'], '@') === false) {
+            return false;
+        }
 
-            if (strpos($values['email'], $domain) > 0) {
+        list(, $hostname) = explode('@', $values['email']);
+        $hostname = trim($hostname);
+
+        foreach (explode(',', $domains) as $domain) {
+            if ($hostname === trim($domain)) {
                 return true;
             }
         }