Function out query building, to allow easier overriding

[lhc/web/wiklou.git] / includes / specials / SpecialListgrouprights.php

diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php
index 568866f..e351729 100644 (file)
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Implements Special:Listgrouprights
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
 
 /**
  * This special page lists all defined user groups and the associated rights.
@@ -24,10 +45,9 @@ class SpecialListGroupRights extends SpecialPage {
         * Show the special page
         */
        public function execute( $par ) {
-               global $wgOut, $wgImplicitGroups, $wgMessageCache;
+               global $wgOut, $wgImplicitGroups;
                global $wgGroupPermissions, $wgRevokePermissions, $wgAddGroups, $wgRemoveGroups;
                global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
-               $wgMessageCache->loadAllMessages();
 
                $this->setHeaders();
                $this->outputHeader();
@@ -40,30 +60,39 @@ class SpecialListGroupRights extends SpecialPage {
                                '</tr>'
                );
 
-               foreach( $wgGroupPermissions as $group => $permissions ) {
-                       $groupname = ( $group == '*' ) ? 'all' : $group; // Replace * with a more descriptive groupname
+               $allGroups = array_unique( array_merge( 
+                       array_keys( $wgGroupPermissions ),
+                       array_keys( $wgRevokePermissions ),
+                       array_keys( $wgAddGroups ),
+                       array_keys( $wgRemoveGroups ),
+                       array_keys( $wgGroupsAddToSelf ),
+                       array_keys( $wgGroupsRemoveFromSelf )
+               ) );
+               asort( $allGroups );
+                               
+               foreach ( $allGroups as $group ) {
+                       $permissions = isset( $wgGroupPermissions[$group] ) 
+                               ? $wgGroupPermissions[$group] 
+                               : array();
+                       $groupname = ( $group == '*' ) // Replace * with a more descriptive groupname
+                               ? 'all' 
+                               : $group; 
 
-                       $msg = wfMsg( 'group-' . $groupname );
-                       if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) {
-                               $groupnameLocalized = $groupname;
-                       } else {
-                               $groupnameLocalized = $msg;
-                       }
+                       $msg = wfMessage( 'group-' . $groupname );
+                       $groupnameLocalized = !$msg->isBlank() ? $msg->text() : $groupname;
 
-                       $msg = wfMsgForContent( 'grouppage-' . $groupname );
-                       if ( wfEmptyMsg( 'grouppage-' . $groupname, $msg ) || $msg == '' ) {
-                               $grouppageLocalized = MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
-                       } else {
-                               $grouppageLocalized = $msg;
-                       }
+                       $msg = wfMessage( 'grouppage-' . $groupname )->inContentLanguage();
+                       $grouppageLocalized = !$msg->isBlank() ?
+                               $msg->text() :
+                               MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
 
                        if( $group == '*' ) {
                                // Do not make a link for the generic * group
-                               $grouppage = htmlspecialchars($groupnameLocalized);
+                               $grouppage = htmlspecialchars( $groupnameLocalized );
                        } else {
                                $grouppage = $this->skin->link(
                                        Title::newFromText( $grouppageLocalized ),
-                                       htmlspecialchars($groupnameLocalized)
+                                       htmlspecialchars( $groupnameLocalized )
                                );
                        }
 
@@ -95,21 +124,20 @@ class SpecialListGroupRights extends SpecialPage {
                        $addgroupsSelf = isset( $wgGroupsAddToSelf[$group] ) ? $wgGroupsAddToSelf[$group] : array();
                        $removegroupsSelf = isset( $wgGroupsRemoveFromSelf[$group] ) ? $wgGroupsRemoveFromSelf[$group] : array();
 
-                       $wgOut->addHTML(
-                               '<tr>
-                                       <td>' .
-                                               $grouppage . $grouplink .
-                                       '</td>
-                                       <td>' .
+                       $id = $group == '*' ? false : Sanitizer::escapeId( $group );
+                       $wgOut->addHTML( Html::rawElement( 'tr', array( 'id' => $id ),
+                               "
+                               <td>$grouppage$grouplink</td>
+                                       <td>" .
                                                self::formatPermissions( $permissions, $revoke, $addgroups, $removegroups, $addgroupsSelf, $removegroupsSelf ) .
                                        '</td>
-                               </tr>'
-                       );
+                               '
+                       ) );
                }
                $wgOut->addHTML(
                        Xml::closeElement( 'table' ) . "\n<br /><hr />\n"
                );
-               $wgOut->wrapWikiMsg( "<div class=\"mw-listgrouprights-key\">\n$1</div>",'listgrouprights-key' );
+               $wgOut->wrapWikiMsg( "<div class=\"mw-listgrouprights-key\">\n$1\n</div>", 'listgrouprights-key' );
        }
 
        /**
@@ -150,25 +178,25 @@ class SpecialListGroupRights extends SpecialPage {
                if( $add === true ){
                        $r[] = wfMsgExt( 'listgrouprights-addgroup-all', array( 'escape' ) );
                } else if( is_array( $add ) && count( $add ) ) {
-                       $add = array_unique( $add );
+                       $add = array_values( array_unique( $add ) );
                        $r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), count( $add ) );
                }
                if( $remove === true ){
                        $r[] = wfMsgExt( 'listgrouprights-removegroup-all', array( 'escape' ) );
                } else if( is_array( $remove ) && count( $remove ) ) {
-                       $remove = array_unique( $remove );
+                       $remove = array_values( array_unique( $remove ) );
                        $r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), count( $remove ) );
                }
                if( $addSelf === true ){
                        $r[] = wfMsgExt( 'listgrouprights-addgroup-self-all', array( 'escape' ) );
                } else if( is_array( $addSelf ) && count( $addSelf ) ) {
-                       $addSelf = array_unique( $addSelf );
+                       $addSelf = array_values( array_unique( $addSelf ) );
                        $r[] = wfMsgExt( 'listgrouprights-addgroup-self', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $addSelf ) ), count( $addSelf ) );
                }
                if( $removeSelf === true ){
                        $r[] = wfMsgExt( 'listgrouprights-removegroup-self-all', array( 'escape' ) );
                } else if( is_array( $removeSelf ) && count( $removeSelf ) ) {
-                       $removeSelf = array_unique( $removeSelf );
+                       $removeSelf = array_values( array_unique( $removeSelf ) );
                        $r[] = wfMsgExt( 'listgrouprights-removegroup-self', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $removeSelf ) ), count( $removeSelf ) );
                }
                if( empty( $r ) ) {