X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fatompubmembershipfeed.php;h=1a77e60ff5e9c5c2bed0129196f6c736d29ca503;hb=ac09bc0a792ea5eaf324f3f03a1f143604f3b4b9;hp=37e4a386a20cfb27e4f4ec6f85f4ced8f55ed3f4;hpb=1e73ba00bdd37f46415eb45b1b904dc894fb801c;p=quix0rs-gnu-social.git

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 37e4a386a2..1a77e60ff5 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -28,13 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiauth.php';
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * Feed of group memberships for a user, in ActivityStreams format
@@ -46,67 +40,34 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class AtompubmembershipfeedAction extends ApiAuthAction
+class AtompubmembershipfeedAction extends AtompubAction
 {
     private $_profile     = null;
     private $_memberships = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
+    protected function atompubPrepare()
     {
-        parent::prepare($argarray);
-
-        $profileId = $this->trimmed('profile');
+        $this->_profile = Profile::getKV('id', $this->trimmed('profile'));
 
-        $this->_profile = Profile::staticGet('id', $profileId);
-
-        if (empty($this->_profile)) {
+        if (!$this->_profile instanceof Profile) {
             // TRANS: Client exception.
             throw new ClientException(_('No such profile.'), 404);
         }
 
-        $offset = ($this->page-1) * $this->count;
-        $limit  = $this->count + 1;
-
         $this->_memberships = Group_member::byMember($this->_profile->id,
-                                                     $offset,
-                                                     $limit);
-
+                                                     $this->offset,
+                                                     $this->limit);
         return true;
     }
 
-    /**
-     * Handler method
-     *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
-     * @return void
-     */
-    function handle($argarray=null)
+    protected function handleGet()
     {
-        parent::handle($argarray);
-
-        switch ($_SERVER['REQUEST_METHOD']) {
-        case 'HEAD':
-        case 'GET':
-            $this->showFeed();
-            break;
-        case 'POST':
-            $this->addMembership();
-            break;
-        default:
-            // TRANS: Client exception thrown when using an unsupported HTTP method.
-            throw new ClientException(_('HTTP method not supported.'), 405);
-            return;
-        }
+        return $this->showFeed();
+    }
 
-        return;
+    protected function handlePost()
+    {
+        return $this->addMembership();
     }
 
     /**
@@ -239,18 +200,16 @@ class AtompubmembershipfeedAction extends ApiAuthAction
             if ($activity->verb != ActivityVerb::JOIN) {
                 // TRANS: Client error displayed when not using the join verb.
                 throw new ClientException(_('Can only handle join activities.'));
-                return;
             }
 
             $groupObj = $activity->objects[0];
 
             if ($groupObj->type != ActivityObject::GROUP) {
-                // TRANS: Client exception thrown when trying favorite an object that is not a notice.
-                throw new ClientException(_('Can only fave notices.'));
-                return;
+                // TRANS: Client exception thrown when trying to join something which is not a group
+                throw new ClientException(_('Can only join groups.'));
             }
 
-            $group = User_group::staticGet('uri', $groupObj->id);
+            $group = User_group::getKV('uri', $groupObj->id);
 
             if (empty($group)) {
                 // XXX: import from listed URL or something
@@ -291,25 +250,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
         }
     }
 
-    /**
-     * Return true if read only.
-     *
-     * MAY override
-     *
-     * @param array $args other arguments
-     *
-     * @return boolean is read only action?
-     */
-    function isReadOnly($args)
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
-            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     /**
      * Return last modified, if applicable.
      *
@@ -335,19 +275,4 @@ class AtompubmembershipfeedAction extends ApiAuthAction
     {
         return null;
     }
-
-    /**
-     * Does this require authentication?
-     *
-     * @return boolean true if delete, else false
-     */
-    function requiresAuth()
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
-            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
-            return false;
-        } else {
-            return true;
-        }
-    }
 }