Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 13ed9e1fbf059a0b0897fc17e3e318d9d75d727b..97ae325cb56c125d5489a15e6a785a66f8692424 100644 (file)
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns whether a user is a member of a specified group.
  *
@@ -61,11 +59,11 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
      * @return boolean success flag
      */
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user   = $this->getTargetUser(null);
+        $this->target = $this->getTargetProfile(null);
         $this->group  = $this->getTargetGroup(null);
 
         return true;
@@ -76,27 +74,23 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
      *
      * Save the new message
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
-        if (empty($this->user)) {
+        if (empty($this->target)) {
             // TRANS: Client error displayed when checking group membership for a non-existing user.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+            $this->clientError(_('No such user.'), 404);
         }
 
         if (empty($this->group)) {
             // TRANS: Client error displayed when checking group membership for a non-existing group.
-            $this->clientError(_('Group not found.'), 404, $this->format);
-            return false;
+            $this->clientError(_('Group not found.'), 404);
         }
 
-        $is_member = $this->user->isMember($this->group);
+        $is_member = $this->target->isMember($this->group);
 
         switch($this->format) {
         case 'xml':
@@ -110,13 +104,8 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
             $this->endDocument('json');
             break;
         default:
-            $this->clientError(
-                // TRANS: Client error displayed when coming across a non-supported API method.
-                _('API method not found.'),
-                400,
-                $this->format
-            );
-            break;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'));
         }
     }
 
@@ -129,7 +118,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }