From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 3 Jul 2014 16:33:11 +0000 (+0200)
Subject: Disallowed e-mails as usernames
X-Git-Tag: 2.1.0_Alpha_1~631
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3d127e4896f7cfbec5699639ac481ccd38f0f03;p=GitHub%2FWoltLab%2FWCF.git

Disallowed e-mails as usernames
---

diff --git a/wcfsetup/install/files/lib/util/UserUtil.class.php b/wcfsetup/install/files/lib/util/UserUtil.class.php
index b971baf5d1..6553ea887d 100644
--- a/wcfsetup/install/files/lib/util/UserUtil.class.php
+++ b/wcfsetup/install/files/lib/util/UserUtil.class.php
@@ -36,6 +36,11 @@ final class UserUtil {
 				return false;
 			}
 		}
+		// username must not be a valid e-mail
+		if (self::isValidEmail($name)) {
+			return false;
+		}
+		
 		return true;
 	}