Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 2998e505e2174325c244e63d730fe02420076bef..9a45d231a99e7fc94020e92499c4cb8cdeb0f68e 100644 (file)
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Outputs detailed information about the group specified by ID
  *
@@ -50,7 +48,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiGroupShowAction extends ApiPrivateAuthAction
 {
     var $group = null;
@@ -61,17 +58,15 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $this->group = $this->getTargetGroup($this->arg('id'));
 
         if (empty($this->group)) {
-            $alias = Group_alias::staticGet(
+            $alias = Group_alias::getKV(
                 'alias',
                 common_canonical_nickname($this->arg('id'))
             );
@@ -79,11 +74,8 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
                 $args = array('id' => $alias->group_id, 'format' => $this->format);
                 common_redirect(common_local_url('ApiGroupShow', $args), 301);
             } else {
-                $this->clientError(
-                    _('Group not found.'),
-                    404,
-                    $this->format
-                );
+                // TRANS: Client error displayed when trying to show a group that could not be found.
+                $this->clientError(_('Group not found.'), 404);
             }
             return;
         }
@@ -96,14 +88,11 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
      *
      * Check the format and show the user info
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         switch($this->format) {
         case 'xml':
@@ -113,8 +102,8 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
-            $this->clientError(_('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);
         }
     }
 
@@ -123,7 +112,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
      *
      * @return string datestamp of the latest notice in the stream
      */
-
     function lastModified()
     {
         if (!empty($this->group)) {
@@ -141,7 +129,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->group)) {
@@ -149,6 +136,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
             return '"' . implode(
                 ':',
                 array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
                       common_language(),
                       $this->group->id,
                       strtotime($this->group->modified))
@@ -168,10 +156,8 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
      *
      * @return boolean is read only action?
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
-
 }