Making INNER JOIN implicit

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

diff --git a/includes/SpecialSpecialpages.php b/includes/SpecialSpecialpages.php
index bc59328..b3a5520 100644 (file)
--- a/includes/SpecialSpecialpages.php
+++ b/includes/SpecialSpecialpages.php
@@ -1,54 +1,25 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  *
  */
 function wfSpecialSpecialpages() {
-       global $wgLang, $wgOut, $wgUser, $wgAvailableRights;
-       
-       $wgOut->setRobotpolicy( 'index,nofollow' );
-       $sk = $wgUser->getSkin();       
-       
-       # Get listable pages
-       $pages = SpecialPage::getPages();
+       global $wgOut, $wgUser, $wgMessageCache;
 
-       /** pages available to all */
-       wfSpecialSpecialpages_gen($pages[''],'spheading',$sk);
+       $wgMessageCache->loadAllMessages();
 
-       /** show pages splitted by user rights */
-       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])) {
-                       wfSpecialSpecialpages_gen($pages[$right], $right.'pheading', $sk);
-                       }
-               }
-       
-       }
-
-/** FIXME : spheading, sysopspheading, developerspheading need to be removed
-from language files [av] */
-/**
-       # all users special pages
-       wfSpecialSpecialpages_gen($pages[''],'spheading',$sk);
-
-       # sysops only special pages
-       if ( $wgUser->isSysop() ) {
-               wfSpecialSpecialpages_gen($pages['sysop'],'sysopspheading',$sk);
-       }
+       $wgOut->setRobotpolicy( 'noindex,nofollow' );  # Is this really needed?
+       $sk = $wgUser->getSkin();
 
-       # developers only special pages
-       if ( $wgUser->isDeveloper() ) {
-               wfSpecialSpecialpages_gen($pages['developer'],'developerspheading',$sk);
+       /** Pages available to all */
+       wfSpecialSpecialpages_gen( SpecialPage::getRegularPages(), 'spheading', $sk );
 
-       }
-*/
+       /** Restricted special pages */
+       wfSpecialSpecialpages_gen( SpecialPage::getRestrictedPages(), 'restrictedpheading', $sk );
 }
 
 /**
@@ -58,17 +29,59 @@ from language files [av] */
  * @param $sk skin object ???
  */
 function wfSpecialSpecialpages_gen($pages,$heading,$sk) {
-       global $wgLang, $wgOut, $wgAllowSysopQueries;
+       global $wgOut, $wgSortSpecialPages;
+
+       if( count( $pages ) == 0 ) {
+               # Yeah, that was pointless. Thanks for coming.
+               return;
+       }
 
-       $wgOut->addHTML( '<h2>' . wfMsg( $heading ) . "</h2>\n<ul>" );
-       foreach ( $pages as $name => $page ) {
-               if( !$page->isListed() ) {
-                       continue;
+       /** Put them into a sortable array */
+       $groups = array();
+       foreach ( $pages as $page ) {
+               if ( $page->isListed() ) {
+                       $group = SpecialPage::getGroup( $page );
+                       if( !isset($groups[$group]) ) {
+                               $groups[$group] = array();
+                       }
+                       $groups[$group][$page->getDescription()] = $page->getTitle();
                }
-               $link = $sk->makeKnownLinkObj( $page->getTitle(), $page->getDescription() );
-               $wgOut->addHTML( "<li>{$link}</li>\n" );
        }
-       $wgOut->addHTML( "</ul>\n" );
-}
 
-?>
+       /** Sort */
+       if ( $wgSortSpecialPages ) {
+               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" );
+       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 => $title ) {
+                       $link = $sk->makeKnownLinkObj( $title , htmlspecialchars( $desc ) );
+                       $wgOut->addHTML( "<li>{$link}</li>\n" );
+
+                       # Slit 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" );
+       }
+}