Fix some weird bugs on "you are blocked" form by unstubbing User object.

[lhc/web/wiklou.git] / includes / SpecialSpecialpages.php

diff --git a/includes/SpecialSpecialpages.php b/includes/SpecialSpecialpages.php
index 91b7147..ca91ad5 100644 (file)
--- a/includes/SpecialSpecialpages.php
+++ b/includes/SpecialSpecialpages.php
@@ -1,73 +1,82 @@
 <?php
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
  *
  */
 function wfSpecialSpecialpages() {
-       global $wgLang, $wgOut, $wgUser, $wgAvailableRights;
-       
-       $wgOut->setRobotpolicy( 'index,nofollow' );
-       $sk = $wgUser->getSkin();
-       
-       # Get listable pages, in a 2-d array with the first dimension being user right
-       $pages = SpecialPage::getPages();
+       global $wgOut, $wgUser, $wgMessageCache, $wgSortSpecialPages;
 
-       /** Pages available to all */
-       wfSpecialSpecialpages_gen($pages[''],'spheading',$sk);
+       $wgMessageCache->loadAllMessages();
 
-       /** Restricted special pages */
-       $rpages = array();
-       foreach($wgAvailableRights as $right) {
-               /** only show pages a user can access */
-               if( $wgUser->isAllowed($right) ) {
-                       /** some rights might not have any special page associated */
-                       if(isset($pages[$right])) {
-                               $rpages = array_merge( $rpages, $pages[$right] );
-                       }
-               }
-       }
-       wfSpecialSpecialpages_gen( $rpages, 'restrictedpheading', $sk );
-}
+       $wgOut->setRobotpolicy( 'noindex,nofollow' );  # Is this really needed?
+       $sk = $wgUser->getSkin();
 
-/**
- * sub function generating the list of pages
- * @param $pages the list of pages
- * @param $heading header to be used
- * @param $sk skin object ???
- */
-function wfSpecialSpecialpages_gen($pages,$heading,$sk) {
-       global $wgLang, $wgOut, $wgSortSpecialPages;
+       $pages = SpecialPage::getUsablePages();
 
        if( count( $pages ) == 0 ) {
                # Yeah, that was pointless. Thanks for coming.
                return;
        }
-       
+
        /** Put them into a sortable array */
-       $sortedPages = array();
-       foreach ( $pages as $name => $page ) {
+       $groups = array();
+       foreach ( $pages as $page ) {
                if ( $page->isListed() ) {
-                       $sortedPages[$page->getDescription()] = $page->getTitle();
+                       $group = SpecialPage::getGroup( $page );
+                       if( !isset($groups[$group]) ) {
+                               $groups[$group] = array();
+                       }
+                       $groups[$group][$page->getDescription()] = array( $page->getTitle(), $page->isRestricted() );
                }
        }
-       
+
        /** Sort */
        if ( $wgSortSpecialPages ) {
-               ksort( $sortedPages );
+               foreach( $groups as $group => $sortedPages ) {
+                       ksort( $groups[$group] );
+               }
+       }
+
+       /** Always move "other" to end */
+       if( array_key_exists('other',$groups) ) {
+               $other = $groups['other'];
+               unset( $groups['other'] );
+               $groups['other'] = $other;
        }
 
        /** Now output the HTML */
-       $wgOut->addHTML( '<h2>' . wfMsgHtml( $heading ) . "</h2>\n<ul>" );
-       foreach ( $sortedPages as $desc => $title ) {
-               $link = $sk->makeKnownLinkObj( $title, $desc );
-               $wgOut->addHTML( "<li>{$link}</li>\n" );
+       foreach ( $groups as $group => $sortedPages ) {
+               $middle = ceil( count($sortedPages)/2 );
+               $total = count($sortedPages);
+               $count = 0;
+
+               $wgOut->addHTML( "<h4 class='mw-specialpagesgroup'>".wfMsgHtml("specialpages-group-$group")."</h4>\n" );
+               $wgOut->addHTML( "<table style='width: 100%;' class='mw-specialpages-table'><tr>" );
+               $wgOut->addHTML( "<td width='30%' valign='top'><ul>\n" );
+               foreach( $sortedPages as $desc => $specialpage ) {
+                       list( $title, $restricted ) = $specialpage;
+                       $link = $sk->makeKnownLinkObj( $title , htmlspecialchars( $desc ) );
+                       if( $restricted ) {
+                               $wgOut->addHTML( "<li class='mw-specialpages-page mw-specialpagerestricted'>{$link}</li>\n" );
+                       } else {
+                               $wgOut->addHTML( "<li>{$link}</li>\n" );
+                       }
+
+                       # Split up the larger groups
+                       $count++;
+                       if( $total > 3 && $count == $middle ) {
+                               $wgOut->addHTML( "</ul></td><td width='10%'></td><td width='30%' valign='top'><ul>" );
+                       }
+               }
+               $wgOut->addHTML( "</ul></td><td width='30%' valign='top'></td></tr></table>\n" );
        }
-       $wgOut->addHTML( "</ul>\n" );
+       $wgOut->addHTML(
+               Xml::openElement('div', array( 'class' => 'mw-specialpages-notes' )).
+               wfMsgWikiHtml('specialpages-note').
+               Xml::closeElement('div')
+       );
 }
-
-?>