Lots of tiny message changes.

[quix0rs-gnu-social.git] / actions / apigroupleave.php

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 86b56f5af069251ac4015fd422562004902ae53c..6f8d40527b7ecdae845c504f3fddf6871f5f1c68 100644 (file)
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,8 +51,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupLeaveAction extends ApiAuthAction
 {
-    var $format  = null;
-    var $user    = null;
     var $group   = null;
 
     /**
@@ -65,8 +69,6 @@ class ApiGroupLeaveAction extends ApiAuthAction
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 
@@ -94,19 +96,19 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
         $member = new Group_member();
 
         $member->group_id   = $this->group->id;
-        $member->profile_id = $this->auth->id;
+        $member->profile_id = $this->auth_user->id;
 
         if (!$member->find(true)) {
             $this->serverError(_('You are not a member of this group.'));
@@ -116,27 +118,27 @@ class ApiGroupLeaveAction extends ApiAuthAction
         $result = $member->delete();
 
         if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
+            common_log_db_error($member, 'DELETE', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not remove user %s to group %s.'),
-                    $this->user->nickname, 
-                    $this->$group->nickname
+                    _('Could not remove user %1$s from group %2$s.'),
+                    $this->user->nickname,
+                    $this->group->nickname
                 )
             );
             return;
         }
-       
+
         switch($this->format) {
         case 'xml':
             $this->show_single_xml_group($this->group);
             break;
         case 'json':
-            $this->show_single_json_group($this->group);
+            $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );