Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/groupqueue.php b/actions/groupqueue.php
index 1b4a8b7b6e02cd8462c4073d1f018e8f8c89cce0..4bbf5dcb023ea249dfbfbdd3edacaff192bcd241 100644 (file)
--- a/actions/groupqueue.php
+++ b/actions/groupqueue.php
@@ -43,7 +43,7 @@ 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 GroupqueueAction extends GroupDesignAction
+class GroupqueueAction extends GroupAction
 {
     var $page = null;
 
@@ -52,7 +52,7 @@ class GroupqueueAction extends GroupDesignAction
         return true;
     }
 
-    // fixme most of this belongs in a base class, sounds common to most group actions?
+    // @todo FIXME: most of this belongs in a base class, sounds common to most group actions?
     function prepare($args)
     {
         parent::prepare($args);
@@ -96,6 +96,7 @@ class GroupqueueAction extends GroupDesignAction
 
         $cur = common_current_user();
         if (!$cur || !$cur->isAdmin($this->group)) {
+            // TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
             $this->clientError(_('Only the group admin may approve users.'));
             return false;
         }
@@ -105,12 +106,12 @@ class GroupqueueAction extends GroupDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // TRANS: Title of the page showing pending group members still awaiting approval to join the group.
+            // TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
             // TRANS: %s is the name of the group.
             return sprintf(_('%s group members awaiting approval'),
                            $this->group->nickname);
         } else {
-            // TRANS: Title of the page showing pending group members still awaiting approval to join the group.
+            // TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
             // TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
             return sprintf(_('%1$s group members awaiting approval, page %2$d'),
                            $this->group->nickname,
@@ -131,12 +132,6 @@ class GroupqueueAction extends GroupDesignAction
                        _('A list of users awaiting approval to join this group.'));
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
@@ -155,11 +150,12 @@ class GroupqueueAction extends GroupDesignAction
         $members->free();
 
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
-                          $this->page, 'groupmembers',
+                          $this->page, 'groupqueue',
                           array('nickname' => $this->group->nickname));
     }
 }
 
+// @todo FIXME: documentation missing.
 class GroupQueueList extends GroupMemberList
 {
     function newListItem($profile)
@@ -168,6 +164,7 @@ class GroupQueueList extends GroupMemberList
     }
 }
 
+// @todo FIXME: documentation missing.
 class GroupQueueListItem extends GroupMemberListItem
 {
     function showActions()