eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.

Browse Source
This commit is contained in:
Brion Vibber
2010-11-29 14:15:25 -08:00
parent 6e249b4ab5
commit dc350b5463
13 changed files with 139 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/Facebook/FBConnectAuth.php
View File

@@ -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)) {