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 b699077849c5ffa025dc678d5d877b5c19171d31..d5b291397083747ad8873d768633c9d8ffa3c946 100644 (file)
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -32,8 +32,6 @@ 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.
@@ -47,6 +45,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  */
 class ApiBlockDestroyAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $other   = null;
 
     /**
@@ -55,13 +55,11 @@ 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);
 
-        $this->user   = $this->auth_user;
         $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
@@ -72,27 +70,15 @@ 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);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                // TRANS: Client error. POST is a HTTP command. It should not be translated.
-                _('This method requires a POST.'),
-                400,
-                $this->format
-            );
-            return;
-        }
+        parent::handle();
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+            // 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 ($this->user->hasBlocked($this->other)) {