X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupleave.php;h=d0a6c08798a021e26e960a7579db6d813c78a373;hb=261ccfac8699534ff584a2f93d5dcd384529d855;hp=083ebd890f2c0b38e85e4f927b95e120ed08913c;hpb=dc41e3dc2d1b965efedbffe9f0d1295bb7d11878;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 083ebd890f..d0a6c08798 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Removes the authenticated user from the group specified by ID
  *
@@ -51,6 +49,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  */
 class ApiGroupLeaveAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $group   = null;
 
     /**
@@ -60,11 +60,10 @@ class ApiGroupLeaveAction 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;
@@ -75,58 +74,39 @@ class ApiGroupLeaveAction extends ApiAuthAction
      *
      * Save the new message
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @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 (!$this->scoped instanceof Profile) {
             // TRANS: Client error displayed when trying to have a non-existing user leave a group.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+            $this->clientError(_('No such user.'), 404);
         }
 
-        if (empty($this->group)) {
+        if (!$this->group instanceof User_group) {
             // TRANS: Client error displayed when trying to leave a group that does not exist.
-            $this->clientError(_('Group not found.'), 404, $this->format);
-            return false;
+            $this->clientError(_('Group not found.'), 404);
         }
 
         $member = new Group_member();
 
         $member->group_id   = $this->group->id;
-        $member->profile_id = $this->auth_user->id;
+        $member->profile_id = $this->scoped->id;
 
         if (!$member->find(true)) {
             // TRANS: Server error displayed when trying to leave a group the user is not a member of.
             $this->serverError(_('You are not a member of this group.'));
-            return;
         }
 
         try {
-            if (Event::handle('StartLeaveGroup', array($this->group,$this->user))) {
-                Group_member::leave($this->group->id, $this->user->id);
-                Event::handle('EndLeaveGroup', array($this->group, $this->user));
-            }
+            $this->user->leaveGroup($this->group);
         } catch (Exception $e) {
             // TRANS: Server error displayed when leaving a group failed in the database.
             // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
             $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
-                                       $cur->nickname, $this->group->nickname));
-            return;
+                                       $this->scoped->getNickname(), $this->group->nickname));
         }
         switch($this->format) {
         case 'xml':
@@ -136,13 +116,8 @@ class ApiGroupLeaveAction extends ApiAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
-            $this->clientError(
-                // TRANS: Client error displayed trying to execute an unknown API method leaving a group.
-                _('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);
         }
     }
 }