Harmonise UI message "No such user."

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

diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 6421712713e91ecf8dd51c57510cabe504be7af2..4f941f6c32e3a8f10b0f4d6c82454919ff59c26b 100644 (file)
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -34,12 +35,13 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
- * Blocks the user specified in the ID parameter as the authenticating user. 
- * Destroys a friendship to the blocked user if it exists. Returns the 
+ * Blocks the user specified in the ID parameter as the authenticating user.
+ * Destroys a friendship to the blocked user if it exists. Returns the
  * blocked user in the requested format when successful.
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -47,7 +49,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockCreateAction extends ApiAuthAction
 {
-    var $user    = null;
     var $other   = null;
 
     /**
@@ -63,12 +64,6 @@ class ApiBlockCreateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
 
@@ -97,22 +92,22 @@ class ApiBlockCreateAction extends ApiAuthAction
             );
             return;
         }
-        
+
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
-        
-        if ($this->user->hasBlocked($this->other) 
+
+        if ($this->user->hasBlocked($this->other)
             || $this->user->block($this->other)
         ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
             $this->serverError(_('Block user failed.'), 500, $this->format);
         }
-        
+
     }
 
 }