X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupleave.php;h=bdfa36aa432bf682623a09bd6e82f9e44a80e32f;hb=cc34bb48c7243f78e198ad4d8c1806d5fe886a81;hp=c838f6c878b5a4cf16d13293b5ffa9058a28cbc5;hpb=a9fad9a7ac85270e2a45cfad28c6017b200496eb;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index c838f6c878..bdfa36aa43 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
  *
@@ -49,7 +47,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiGroupLeaveAction extends ApiAuthAction
 {
     var $group   = null;
@@ -60,9 +57,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -82,7 +77,6 @@ class ApiGroupLeaveAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -98,11 +92,13 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when trying to have a non-existing user leave a group.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->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;
         }
@@ -113,24 +109,20 @@ class ApiGroupLeaveAction extends ApiAuthAction
         $member->profile_id = $this->auth_user->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;
         }
 
-        $result = $member->delete();
-
-        if (!$result) {
-            common_log_db_error($member, 'DELETE', __FILE__);
-            $this->serverError(
-                sprintf(
-                    _('Could not remove user %1$s from group %2$s.'),
-                    $this->user->nickname,
-                    $this->group->nickname
-                )
-            );
+        try {
+            $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;
         }
-
         switch($this->format) {
         case 'xml':
             $this->showSingleXmlGroup($this->group);
@@ -140,6 +132,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
             break;
         default:
             $this->clientError(
+                // TRANS: Client error displayed when coming across a non-supported API method.
                 _('API method not found.'),
                 404,
                 $this->format
@@ -147,5 +140,4 @@ class ApiGroupLeaveAction extends ApiAuthAction
             break;
         }
     }
-
 }