X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupjoin.php;h=3e571801f265ac3fd21493beb5491931367e6b65;hb=a597b2800122be618bbf620eb1e6ae61bf691d15;hp=6f3df0d8cd17a7274921c1f14cf65964b5654e28;hpb=cb183359e23ae7a5cfb483fa06c6c4b7a8b05fff;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 6f3df0d8cd..3e571801f2 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Joins the authenticated user to the group speicified by ID
  *
@@ -51,6 +49,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  */
 class ApiGroupJoinAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $group   = null;
 
     /**
@@ -60,11 +60,10 @@ class ApiGroupJoinAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
         return true;
@@ -73,66 +72,41 @@ class ApiGroupJoinAction extends ApiAuthAction
     /**
      * Handle the request
      *
-     * Save the new message
-     *
-     * @param array $args $_REQUEST data (unused)
+     * Join the authenticated user to the group
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
-        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;
-        }
-
-        if (empty($this->user)) {
+        if (empty($this->scoped)) {
             // TRANS: Client error displayed when trying to have a non-existing user join a group.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+            $this->clientError(_('No such user.'), 404);
         }
 
         if (empty($this->group)) {
             // TRANS: Client error displayed when trying to join a group that does not exist.
-            $this->clientError(_('Group not found.'), 404, $this->format);
-            return false;
+            $this->clientError(_('Group not found.'), 404);
         }
 
-        if ($this->user->isMember($this->group)) {
-            $this->clientError(
-                // TRANS: Server error displayed when trying to join a group the user is already a member of.
-                _('You are already a member of that group.'),
-                403,
-                $this->format
-            );
-            return;
+        if ($this->scoped->isMember($this->group)) {
+            // TRANS: Server error displayed when trying to join a group the user is already a member of.
+            $this->clientError(_('You are already a member of that group.'), 403);
         }
 
-        if (Group_block::isBlocked($this->group, $this->user->getProfile())) {
-            $this->clientError(
-                // TRANS: Server error displayed when trying to join a group the user is blocked from joining.
-                _('You have been blocked from that group by the admin.'),
-                403,
-                $this->format
-            );
-            return;
+        if (Group_block::isBlocked($this->group, $this->scoped)) {
+            // TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
         }
 
         try {
-            $this->user->joinGroup($this->group);
+            $this->scoped->joinGroup($this->group);
         } catch (Exception $e) {
             // TRANS: Server error displayed when joining a group failed in the database.
             // TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
             $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
-                                       $cur->nickname, $this->group->nickname));
-			return;
+                                       $this->scoped->nickname, $this->group->nickname));
         }
 
         switch($this->format) {
@@ -143,13 +117,8 @@ class ApiGroupJoinAction extends ApiAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
-            $this->clientError(
-                // TRANS: Client error displayed when coming across a non-supported API method.
-                _('API method not found.'),
-                404,
-                $this->format
-            );
-            break;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), 404);
         }
     }
 }