Don't accept non-objects before testing with "instanceof".

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

diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 0f24be3aaf31f8570593f98b862fdded63e1e74b..d5b291397083747ad8873d768633c9d8ffa3c946 100644 (file)
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -21,8 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -31,23 +32,21 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Un-blocks the user specified in the ID parameter for the authenticating user.
  * Returns the un-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/
  */
-
 class ApiBlockDestroyAction extends ApiAuthAction
 {
-    var $format  = null;
-    var $user    = null;
+    protected $needPost = true;
+
     var $other   = null;
 
     /**
@@ -56,22 +55,12 @@ class ApiBlockDestroyAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
-        $this->user   = $this->auth_user;
-        $this->other  = $this->getTargetUser($this->arg('id'));
-        $this->format = $this->arg('format');
+        $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
     }
@@ -81,40 +70,33 @@ class ApiBlockDestroyAction extends ApiAuthAction
      *
      * Save the new message
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                _('This method requires a POST.'),
-                400,
-                $this->format
-            );
-            return;
+        if (empty($this->user) || empty($this->other)) {
+            // TRANS: Client error when user not found for an API action to remove a block for a user.
+            $this->clientError(_('No such user.'), 404);
         }
 
-        if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
-            return;
+        if ($this->user->hasBlocked($this->other)) {
+            if (Event::handle('StartUnblockProfile', array($this->user, $this->other))) {
+                $result = $this->user->unblock($this->other);
+                if ($result) {
+                    Event::handle('EndUnblockProfile', array($this->user, $this->other));
+                }
+            }
         }
 
-        if (!$this->user->hasBlocked($this->other)
-            || $this->user->unblock($this->other)
-        ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+        if (!$this->user->hasBlocked($this->other)) {
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
+            // TRANS: Server error displayed when unblocking a user has failed.
             $this->serverError(_('Unblock user failed.'));
         }
-
     }
-
 }
-