Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / groupnav.php

diff --git a/lib/groupnav.php b/lib/groupnav.php
index a2dd6eac0087e39687049a2a836925b01c9d2311..13795721aed3e376aed601acd14e31b7441b11ec 100644 (file)
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      HTMLOutputter
  */
-
 class GroupNav extends Menu
 {
     var $group = null;
@@ -58,7 +57,6 @@ class GroupNav extends Menu
      *
      * @param Action $action current action, used for output
      */
-
     function __construct($action=null, $group=null)
     {
         parent::__construct($action);
@@ -70,7 +68,6 @@ class GroupNav extends Menu
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
@@ -100,6 +97,19 @@ class GroupNav extends Menu
             $cur = common_current_user();
 
             if ($cur && $cur->isAdmin($this->group)) {
+                $pending = $this->countPendingMembers();
+                if ($pending || $this->group->join_policy == User_group::JOIN_POLICY_MODERATE) {
+                    $this->out->menuItem(common_local_url('groupqueue', array('nickname' =>
+                                                                              $nickname)),
+                                         // TRANS: Menu item in the group navigation page. Only shown for group administrators.
+                                         // TRANS: %d is the number of pending members.
+                                         sprintf(_m('MENU','Pending members (%d)','Pending members (%d)',$pending), $pending),
+                                         // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+                                         // TRANS: %s is the nickname of the group.
+                                         sprintf(_m('TOOLTIP','%s pending members'), $nickname),
+                                         $action_name == 'groupqueue',
+                                         'nav_group_pending');
+                }
                 $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
                                                                                 $nickname)),
                                      // TRANS: Menu item in the group navigation page. Only shown for group administrators.
@@ -141,4 +151,11 @@ class GroupNav extends Menu
         }
         $this->out->elementEnd('ul');
     }
+
+    function countPendingMembers()
+    {
+        $req = new Group_join_queue();
+        $req->group_id = $this->group->id;
+        return $req->count();
+    }
 }