|
@@ -1,7 +1,7 @@
|
|
|
<?php
|
|
|
|
|
|
-define("USERNAME_REGEX", "^[a-z]{4,32}$");
|
|
|
-define("PASSWORD_REGEX", "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]{8,1024}|.{10,1024}$");
|
|
|
+define("USERNAME_REGEX", "^[\p{L}\p{N}_-]{1,64}$");
|
|
|
+define("PASSWORD_REGEX", "^(?=.*[\p{Ll}])(?=.*[\p{Lu}])(?=.*[\p{N}]).{8,1024}|.{10,1024}$");
|
|
|
|
|
|
define("PLACEHOLDER_USERNAME", "lain");
|
|
|
define("PLACEHOLDER_PASSWORD", "••••••••••••••••••••••••");
|
|
@@ -15,12 +15,12 @@ define("OPTIONS_PASSWORD", array(
|
|
|
));
|
|
|
|
|
|
function checkPasswordFormat($password) {
|
|
|
- if (preg_match("/" . PASSWORD_REGEX . "/", $password) !== 1)
|
|
|
+ if (preg_match("/" . PASSWORD_REGEX . "/u", $password) !== 1)
|
|
|
userError("Password malformed.");
|
|
|
}
|
|
|
|
|
|
function checkUsernameFormat($username) {
|
|
|
- if (preg_match("/" . USERNAME_REGEX . "/", $username) !== 1)
|
|
|
+ if (preg_match("/" . USERNAME_REGEX . "/u", $username) !== 1)
|
|
|
userError("Username malformed.");
|
|
|
}
|
|
|
|