Merge branch 'repost-of-uf2' into 'master'

[quix0rs-gnu-social.git] / actions / apichecknickname.php

diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php
index 7aa1283739398e8d8b1ede3f7d07f207e960fe68..a950dee135dfc72f039edb505af6e8fcbd455f07 100644 (file)
--- a/actions/apichecknickname.php
+++ b/actions/apichecknickname.php
@@ -5,7 +5,7 @@
  *
  * Check nickname
  *
- * Returns 1 if nickname is ok, 0 if not
+ * Returns 1 if nickname is available on this instance, 0 if not. Error if site is private.
  *
  * PHP version 5
  *
@@ -23,7 +23,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  API
- * @package   GNUSocial
+ * @package   GNUsocial
  * @author    Hannes Mannerheim <h@nnesmannerhe.im>
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://www.gnu.org/software/social/
@@ -34,36 +34,36 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 class ApiCheckNicknameAction extends ApiAction
 {
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
-        
+
+        if (common_config('site', 'private')) {
+            $this->clientError(_('This site is private.'), 403);
+        }
+
+        if ($this->format !== 'json') {
+            $this->clientError('This method currently only serves JSON.', 415);
+        }
+
         return true;
     }
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
-       
+        parent::handle();
+
         $nickname = $this->trimmed('nickname');
-               
-        if ($this->nicknameExists($nickname)) {
+
+        try {
+            Nickname::normalize($nickname, true);
+            $nickname_ok = 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);
         $this->endDocument('json');
     }
-    
-    function nicknameExists($nickname)
-    {
-        $user = User::staticGet('nickname', $nickname);
-        return is_object($user);
-    }    
-    
 }