From 304fa750a81bf6c12d190978c174c7f2d568142c Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 25 Jan 2006 12:01:26 +0000
Subject: [PATCH] Added $wgInvisibleGroups, to hide groups from
 Special:Listusers

---
 RELEASE-NOTES                 |  1 +
 includes/DefaultSettings.php  |  4 ++++
 includes/SpecialListusers.php |  9 +++++----
 includes/User.php             | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 49fbf04395..a64597faa1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -331,6 +331,7 @@ Special Pages:
 * (bug 3192): properly check 'limit' parameter on Special:Contributions
 * (bug 3187) watchlist text refer to unexistent "Stop watching" action
 * Add block link and a link to the block log to Special:Contributions
+* Added $wgInvisibleGroups, to hide groups from Special:Listusers
 
 Misc.:
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b971c6b269..165e25a764 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -846,6 +846,10 @@ $wgGroupPermissions['bureaucrat']['userrights'] = true;
  */
 # $wgGroupPermissions['developer']['siteadmin'] = true;
 
+/**
+ * List of groups which won't appear in Special:Listusers
+ */
+$wgInvisibleGroups = array();
 
 /**
  * Set of available actions that can be restricted via Special:Protect
diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php
index 9183ea527a..1105ddf5e6 100644
--- a/includes/SpecialListusers.php
+++ b/includes/SpecialListusers.php
@@ -88,8 +88,8 @@ class ListUsersPage extends QueryPage {
 				'<input type="hidden" name="title" value="'.$special.'" />' .
 				wfMsgHtml( 'groups-editgroup-name' ) . '<select name="group">';
 
-		// get all group names and IDs
-		$groups = User::getAllGroups();
+		// get group names
+		$groups = User::getVisibleGroups();
 
 		// we want a default empty group
 		$out.= '<option value=""></option>';
@@ -174,7 +174,6 @@ class ListUsersPage extends QueryPage {
 	}
 
 	function formatResult( $skin, $result ) {
-
 		$userPage = Title::makeTitle( $result->namespace, $result->title );
 		$name = $skin->makeLinkObj( $userPage, htmlspecialchars( $userPage->getText() ) );
 
@@ -186,7 +185,9 @@ class ListUsersPage extends QueryPage {
 				'ListUsersPage::formatResult' );
 			$groups = array();
 			while( $row = $dbr->fetchObject( $result ) ) {
-				$groups[] = User::getGroupName( $row->ug_group );
+				if ( User::isVisibleGroup( $row->ug_group ) ) {
+					$groups[] = User::getGroupName( $row->ug_group );
+				}
 			}
 			$dbr->freeResult( $result );
 
diff --git a/includes/User.php b/includes/User.php
index 260f8e87fd..02f7ec3d15 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1853,6 +1853,25 @@ class User {
 			array( '*', 'user', 'autoconfirmed' ) );
 	}
 
+	/**
+	 * Return the set of groups which are not marked "invisible"
+	 * @return array
+	 * @static
+	 */
+	function getVisibleGroups() {
+		global $wgGroupPermissions, $wgInvisibleGroups;
+		return array_diff( User::getAllGroups(), $wgInvisibleGroups );
+	}
+
+	/**
+	 * Determine if a given group name is a valid, visible group
+	 * @param string name
+	 * @return bool
+	 */
+	function isVisibleGroup( $group ) {
+		global $wgGroupPermissions, $wgInvisibleGroups;
+		return isset( $wgGroupPermissions[$group] ) && !in_array( $group, $wgInvisibleGroups );
+	}
 }
 
 ?>
-- 
2.20.1