X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigrouplist.php;h=2f288bf04fe0d3d8fe674fdc2754cc13b2d922a2;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=1f6d44363f6377bc496550fe95bd2469c9257eec;hpb=0b1f48ebd0fcfed50d2110b7731196e9adcc04a6;p=quix0rs-gnu-social.git

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 1f6d44363f..2f288bf04f 100644
--- 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.
  *
@@ -60,15 +58,16 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * @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();
@@ -81,29 +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: Used as title in check for group membership. %s is a user name.
-        $title      = sprintf(_("%s's groups"), $this->user->nickname);
+        $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: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+            // 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) {
@@ -114,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,
@@ -129,13 +125,8 @@ class ApiGroupListAction extends ApiBareAuthAction
             $this->showJsonGroups($this->groups);
             break;
         default:
-            $this->clientError(
-                // TRANS: Client error displayed trying to execute an unknown API method checking group membership.
-                _('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,7 +139,7 @@ class ApiGroupListAction extends ApiBareAuthAction
     {
         $groups = array();
 
-        $group = $this->user->getGroups(
+        $group = $this->target->getGroups(
             ($this->page - 1) * $this->count,
             $this->count,
             $this->since_id,
@@ -169,7 +160,7 @@ class ApiGroupListAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -208,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))
             )