GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Minor changes to ApiCheckNicknameAction, syntax and exception handling mostly

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-16 13:43:10 +02:00
parent b764ee8134
commit 080352b646
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
actions/apichecknickname.php
View File

@ -41,23 +41,22 @@ class ApiCheckNicknameAction extends ApiAction
if ($this->format !== 'json') { if ($this->format !== 'json') {
$this->clientError('This method currently only serves JSON.', 415); $this->clientError('This method currently only serves JSON.', 415);
} }
return true; return true;
} }
protected function handle() protected function handle()
{ {
parent::handle(); parent::handle();
$nickname = $this->trimmed('nickname'); $nickname = $this->trimmed('nickname');
if ($this->nicknameExists($nickname)) { try {
Nickname::normalize($nickname);
$nickname_ok = $this->nicknameExists($nickname) ? 0 : 1;
} catch (NicknameException $e) {
$nickname_ok = 0; $nickname_ok = 0;
} else if (!User::allowed_nickname($nickname)) { }
$nickname_ok = 0; }
else {
$nickname_ok = 1;
}
$this->initDocument('json'); $this->initDocument('json');
$this->showJsonObjects($nickname_ok); $this->showJsonObjects($nickname_ok);
@ -67,7 +66,6 @@ class ApiCheckNicknameAction extends ApiAction
function nicknameExists($nickname) function nicknameExists($nickname)
{ {
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
return is_object($user); return ($user instanceof User);
} }
} }