From 080352b64612f8a7dc9f3086832497dc1218f200 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 16 Oct 2013 13:43:10 +0200
Subject: [PATCH] Minor changes to ApiCheckNicknameAction, syntax and exception
 handling mostly

---
 actions/apichecknickname.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php
index b0e1c1c1db..4f80a7f29e 100644
--- a/actions/apichecknickname.php
+++ b/actions/apichecknickname.php
@@ -41,23 +41,22 @@ class ApiCheckNicknameAction extends ApiAction
         if ($this->format !== 'json') {
             $this->clientError('This method currently only serves JSON.', 415);
         }
-        
+
         return true;
     }
 
     protected function handle()
     {
         parent::handle();
-	
+
         $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;
-        } else if (!User::allowed_nickname($nickname)) {
-            $nickname_ok = 0;        }
-        else {
-            $nickname_ok = 1;        	
-        	}
+        }
 
         $this->initDocument('json');
         $this->showJsonObjects($nickname_ok);
@@ -67,7 +66,6 @@ class ApiCheckNicknameAction extends ApiAction
     function nicknameExists($nickname)
     {
         $user = User::staticGet('nickname', $nickname);
-        return is_object($user);
-    }    
-    
+        return ($user instanceof User);
+    }
 }