diff options
author | Brion Vibber <brion@pobox.com> | 2010-11-29 14:15:25 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-11-29 14:15:25 -0800 |
commit | dc350b5463e7d64a46d7f90143c2d001be99e280 (patch) | |
tree | bdf19094f16b2cfd35dac1ef309954e89ac3494b /plugins/Facebook | |
parent | 6e249b4ab5aa292d78cfaa9be9dce8706e27ad80 (diff) |
Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.
Diffstat (limited to 'plugins/Facebook')
-rw-r--r-- | plugins/Facebook/FBConnectAuth.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index d6d378626..84d51578f 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -257,13 +257,10 @@ class FBConnectauthAction extends Action } } - $nickname = $this->trimmed('newname'); - - if (!Validate::string($nickname, array('min_length' => 1, - 'max_length' => 64, - 'format' => NICKNAME_FMT))) { - $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.')); - return; + try { + $nickname = Nickname::normalize($this->trimmed('newname')); + } catch (NicknameException $e) { + $this->showForm($e->getMessage()); } if (!User::allowed_nickname($nickname)) { @@ -447,9 +444,7 @@ class FBConnectauthAction extends Action function isNewNickname($str) { - if (!Validate::string($str, array('min_length' => 1, - 'max_length' => 64, - 'format' => NICKNAME_FMT))) { + if (!Nickname::isValid($str)) { return false; } if (!User::allowed_nickname($str)) { |