X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fapigroupjoin.php;h=374cf83df068c77506d025d7c66e3506fff69cf3;hb=2eadeca74515802dccc63d7ec84af1bc7d1338d9;hp=c00d594631ec05ea9a8163a70287de3e31c13aae;hpb=08de0f1ebdabdce561ce863bdec219a913e61d26;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index c00d594631..374cf83df0 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.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 ApiGroupJoinAction extends ApiAuthAction
 {
-    var $format  = null;
-    var $user    = null;
     var $group   = null;
 
     /**
@@ -62,17 +66,9 @@ class ApiGroupJoinAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 
@@ -100,12 +96,12 @@ class ApiGroupJoinAction 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;
         }
 
@@ -139,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction
             common_log_db_error($member, 'INSERT', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not join user %s to group %s.'),
+                    _('Could not join user %1$s to group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )
@@ -149,14 +145,14 @@ class ApiGroupJoinAction extends ApiAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($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
             );