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

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

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 2bb35ceddc7eada48df9c5573895a0c135f029b2..b83854d043f74d4cbf1a9571e31eae0aab779f9f 100644 (file)
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -43,55 +43,20 @@ require_once INSTALLDIR.'/lib/publicgroupnav.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 GroupmembersAction extends GroupDesignAction
+class GroupmembersAction extends GroupAction
 {
     var $page = null;
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
-        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        $nickname_arg = $this->arg('nickname');
-        $nickname = common_canonical_nickname($nickname_arg);
-
-        // Permanent redirect on non-canonical nickname
-
-        if ($nickname_arg != $nickname) {
-            $args = array('nickname' => $nickname);
-            if ($this->page != 1) {
-                $args['page'] = $this->page;
-            }
-            common_redirect(common_local_url('groupmembers', $args), 301);
-            return false;
-        }
 
-        if (!$nickname) {
-            // TRANS: Client error displayed when trying to view group members without providing a group nickname.
-            $this->clientError(_('No nickname.'), 404);
-            return false;
-        }
-
-        $local = Local_group::staticGet('nickname', $nickname);
-
-        if (!$local) {
-            // TRANS: Client error displayed when trying to view group members for a non-existing group.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
-        $this->group = User_group::staticGet('id', $local->group_id);
-
-        if (!$this->group) {
-            // TRANS: Client error displayed when trying to view group members for an object that is not a group.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
         return true;
     }
@@ -112,9 +77,9 @@ class GroupmembersAction extends GroupDesignAction
         }
     }
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }
 
@@ -125,12 +90,6 @@ class GroupmembersAction extends GroupDesignAction
                        _('A list of the users in this group.'));
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
@@ -145,8 +104,6 @@ class GroupmembersAction extends GroupDesignAction
             $cnt = $member_list->show();
         }
 
-        $members->free();
-
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                           $this->page, 'groupmembers',
                           array('nickname' => $this->group->nickname));