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

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

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 319a1e424d3c15285df9921ddcdb74a7f1d71fc4..2f288bf04fe0d3d8fe674fdc2754cc13b2d922a2 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns whether a user is a member of a specified group.
  *
@@ -49,7 +47,6 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiGroupListAction extends ApiBareAuthAction
 {
     var $groups   = null;
@@ -60,18 +57,17 @@ class ApiGroupListAction extends ApiBareAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user   = $this->getTargetUser(null);
+        //TODO: Make sure this doesn't leak unwantedly for federated users
+        $this->target = $this->getTargetProfile(null);
 
-        if (empty($this->user)) {
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return false;
+        if (!($this->target instanceof Profile)) {
+            // TRANS: Client error displayed when user not found for an action.
+            $this->clientError(_('No such user.'), 404);
         }
 
         $this->groups = $this->getGroups();
@@ -84,30 +80,27 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * Show the user's groups
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         $sitename   = common_config('site', 'name');
-        // TRANS: %s is a user name
-        $title      = sprintf(_("%s's groups"), $this->user->nickname);
+        // TRANS: Used as title in check for group membership. %s is a user name.
+        $title      = sprintf(_("%s's groups"), $this->target->nickname);
         $taguribase = TagURI::base();
         $id         = "tag:$taguribase:Groups";
         $link       = common_local_url(
             'usergroups',
-            array('nickname' => $this->user->nickname)
+            array('nickname' => $this->target->nickname)
         );
 
         $subtitle   = sprintf(
-            // TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-            _("%1\$s groups %2\$s is a member of."),
+            // TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+            _('%1$s groups %2$s is a member of.'),
             $sitename,
-            $this->user->nickname
+            $this->target->nickname
         );
 
         switch($this->format) {
@@ -118,8 +111,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             $this->showRssGroups($this->groups, $title, $link, $subtitle);
             break;
         case 'atom':
-            $selfuri = common_root_url() . 'api/statusnet/groups/list/' .
-                $this->user->id . '.atom';
+            $selfuri = common_local_url('ApiGroupList', array('id'=>$this->target->id, 'format'=>'atom'));
             $this->showAtomGroups(
                 $this->groups,
                 $title,
@@ -133,14 +125,9 @@ class ApiGroupListAction extends ApiBareAuthAction
             $this->showJsonGroups($this->groups);
             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);
         }
-
     }
 
     /**
@@ -148,12 +135,11 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * @return array groups
      */
-
     function getGroups()
     {
         $groups = array();
 
-        $group = $this->user->getGroups(
+        $group = $this->target->getGroups(
             ($this->page - 1) * $this->count,
             $this->count,
             $this->since_id,
@@ -174,8 +160,7 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -203,7 +188,6 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->groups) && (count($this->groups) > 0)) {
@@ -215,7 +199,7 @@ class ApiGroupListAction extends ApiBareAuthAction
                 array($this->arg('action'),
                       common_user_cache_hash($this->auth_user),
                       common_language(),
-                      $this->user->id,
+                      $this->target->id,
                       strtotime($this->groups[0]->created),
                       strtotime($this->groups[$last]->created))
             )
@@ -224,5 +208,4 @@ class ApiGroupListAction extends ApiBareAuthAction
 
         return null;
     }
-
 }