X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fapigroupmembership.php;h=c97b27fac425cd7e7f383e359d7738cec37a430d;hb=fee6b78e2896705b831fc98025581405e3e21e27;hp=872ee45eee1d15a8dda131f11b78ab0ff7bcae0d;hpb=bb08611def2309711f91c1ab6cdab92fb7c069b2;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 872ee45eee..c97b27fac4 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @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
@@ -31,26 +34,23 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
- * List 20 newest members of the group specified by name or ID. 
+ * List 20 newest members of the group specified by name or ID.
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @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 ApiGroupMembershipAction extends TwitterApiAction
+class ApiGroupMembershipAction extends ApiPrivateAuthAction
 {
-    var $format   = null;
-    var $page     = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
     var $group    = null;
     var $profiles = null;
 
@@ -67,15 +67,7 @@ class ApiGroupMembershipAction extends TwitterApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
-        $this->format = $this->arg('format');
-        $this->group  = $this->getTargetGroup($this->arg('id'));
-
+        $this->group    = $this->getTargetGroup($this->arg('id'));
         $this->profiles = $this->getProfiles();
 
         return true;
@@ -95,18 +87,23 @@ class ApiGroupMembershipAction extends TwitterApiAction
     {
         parent::handle($args);
 
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found.'), 404, $this->format);
+            return false;
+        }
+
         // XXX: RSS and Atom
 
         switch($this->format) {
         case 'xml':
-            $this->show_twitter_xml_users($this->profiles);
+            $this->showTwitterXmlUsers($this->profiles);
             break;
         case 'json':
-            $this->show_json_users($this->profiles);
+            $this->showJsonUsers($this->profiles);
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -117,7 +114,7 @@ class ApiGroupMembershipAction extends TwitterApiAction
     /**
      * Fetch the members of a group
      *
-     * @return array $profiles list of profiles 
+     * @return array $profiles list of profiles
      */
 
     function getProfiles()
@@ -126,10 +123,9 @@ class ApiGroupMembershipAction extends TwitterApiAction
 
         $profile = $this->group->getMembers(
             ($this->page - 1) * $this->count,
-            $this->count, 
-            $this->since_id, 
-            $this->max_id, 
-            $this->since
+            $this->count,
+            $this->since_id,
+            $this->max_id
         );
 
         while ($profile->fetch()) {
@@ -171,7 +167,7 @@ class ApiGroupMembershipAction extends TwitterApiAction
      * An entity tag for this list of groups
      *
      * Returns an Etag based on the action name, language
-     * the group id, and timestamps of the first and last 
+     * the group id, and timestamps of the first and last
      * user who has joined the group
      *
      * @return string etag