X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupleave.php;h=35a4e04d78889358608f2111f79194729dd9016c;hb=20ca5027ccb30f094bc87189ef19ecdb59156137;hp=7321ff5d26b8ab95ff112eca87053b99492f090d;hpb=b0aea3f9c1cf9a6402bcb2751ac767445103a70b;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 7321ff5d26..35a4e04d78 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -26,6 +26,7 @@
  * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -48,7 +49,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;
@@ -59,9 +59,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -81,13 +79,13 @@ class ApiGroupLeaveAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         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
@@ -96,12 +94,14 @@ 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)) {
-            $this->clientError(_('Group not found!'), 404, $this->format);
+            // TRANS: Client error displayed when trying to leave a group that does not exist.
+            $this->clientError(_('Group not found.'), 404, $this->format);
             return false;
         }
 
@@ -111,39 +111,35 @@ 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->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($this->group);
             break;
         case 'json':
             $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+                _('API method not found.'),
                 404,
                 $this->format
             );
             break;
         }
     }
-
 }