updated to MediaWiki 1.14.0

1 files changed, 227 insertions, 50 deletions

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index 570a21c6..109c5c30 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -13,50 +13,214 @@
  *
  * @param mixed $par (not used)
  */
-function wfSpecialStatistics( $par = '' ) {
-	global $wgOut, $wgLang, $wgRequest;
-	$dbr = wfGetDB( DB_SLAVE );
+class SpecialStatistics extends SpecialPage {
+	
+	private $views, $edits, $good, $images, $total, $users,
+			$activeUsers, $admins, $numJobs = 0;
+	
+	public function __construct() {
+		parent::__construct( 'Statistics' );
+	}
+	
+	public function execute( $par ) {
+		global $wgOut, $wgRequest, $wgMessageCache;
+		global $wgDisableCounters, $wgMiserMode;
+		$wgMessageCache->loadAllMessages();
+		
+		$this->setHeaders();
+	
+		$this->views = SiteStats::views();
+		$this->edits = SiteStats::edits();
+		$this->good = SiteStats::articles();
+		$this->images = SiteStats::images();
+		$this->total = SiteStats::pages();
+		$this->users = SiteStats::users();
+		$this->activeUsers = SiteStats::activeUsers();
+		$this->admins = SiteStats::numberingroup('sysop');
+		$this->numJobs = SiteStats::jobs();
+	
+		# Staticic - views
+		$viewsStats = '';
+		if( !$wgDisableCounters ) {
+			$viewsStats = $this->getViewsStats();
+		}
+		
+		# Set active user count
+		if( !$wgMiserMode ) {
+			$dbw = wfGetDB( DB_MASTER );
+			SiteStatsUpdate::cacheUpdate( $dbw );
+		}
+	
+		# Do raw output
+		if( $wgRequest->getVal( 'action' ) == 'raw' ) {
+			$this->doRawOutput();
+		}
 
-	$views = SiteStats::views();
-	$edits = SiteStats::edits();
-	$good = SiteStats::articles();
-	$images = SiteStats::images();
-	$total = SiteStats::pages();
-	$users = SiteStats::users();
-	$admins = SiteStats::admins();
-	$numJobs = SiteStats::jobs();
+		$text = Xml::openElement( 'table', array( 'class' => 'mw-statistics-table' ) );
 
-	if( $wgRequest->getVal( 'action' ) == 'raw' ) {
-		$wgOut->disable();
-		header( 'Pragma: nocache' );
-		echo "total=$total;good=$good;views=$views;edits=$edits;users=$users;admins=$admins;images=$images;jobs=$numJobs\n";
-		return;
-	} else {
-		$text = "__NOTOC__\n";
-		$text .= '==' . wfMsgNoTrans( 'sitestats' ) . "==\n";
-		$text .= wfMsgExt( 'sitestatstext', array( 'parsemag' ),
-			$wgLang->formatNum( $total ),
-			$wgLang->formatNum( $good ),
-			$wgLang->formatNum( $views ),
-			$wgLang->formatNum( $edits ),
-			$wgLang->formatNum( sprintf( '%.2f', $total ? $edits / $total : 0 ) ),
-			$wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) ),
-			$wgLang->formatNum( $numJobs ),
-			$wgLang->formatNum( $images )
-	   	)."\n";
+		# Statistic - pages
+		$text .= $this->getPageStats();		
+
+		# Statistic - edits
+		$text .= $this->getEditStats();
 
-		$text .= "==" . wfMsgNoTrans( 'userstats' ) . "==\n";
-		$text .= wfMsgExt( 'userstatstext', array ( 'parsemag' ),
-			$wgLang->formatNum( $users ),
-			$wgLang->formatNum( $admins ),
-			'[[' . wfMsgForContent( 'grouppage-sysop' ) . ']]', # TODO somehow remove, kept for backwards compatibility
-			$wgLang->formatNum( @sprintf( '%.2f', $admins / $users * 100 ) ),
-			User::makeGroupLinkWiki( 'sysop' )
-		)."\n";
+		# Statistic - users
+		$text .= $this->getUserStats();
 
-		global $wgDisableCounters, $wgMiserMode, $wgUser, $wgLang, $wgContLang;
+		# Statistic - usergroups
+		$text .= $this->getGroupStats();
+		$text .= $viewsStats;
+
+		# Statistic - popular pages
 		if( !$wgDisableCounters && !$wgMiserMode ) {
-			$res = $dbr->select(
+			$text .= $this->getMostViewedPages();
+		}
+
+		$text .= Xml::closeElement( 'table' );
+
+		# Customizable footer
+		$footer = wfMsgExt( 'statistics-footer', array('parseinline') );
+		if( !wfEmptyMsg( 'statistics-footer', $footer ) && $footer != '' ) {
+			$text .= "\n" . $footer;
+		}
+
+		$wgOut->addHTML( $text );
+	}
+
+	/**
+	 * Format a row
+	 * @param string $text description of the row
+	 * @param float $number a number
+	 * @param array $trExtraParams
+	 * @param string $descMsg
+	 * @param string $descMsgParam
+	 * @return string table row in HTML format
+	 */
+	private function formatRow( $text, $number, $trExtraParams = array(), $descMsg = '', $descMsgParam = '' ) {
+		global $wgStylePath;
+		if( $descMsg ) {
+			$descriptionText = wfMsgExt( $descMsg, array( 'parseinline' ), $descMsgParam );
+			if ( !wfEmptyMsg( $descMsg, $descriptionText ) ) {
+				$descriptionText = " ($descriptionText)";
+				$text .= "<br />" . Xml::element( 'small', array( 'class' => 'mw-statistic-desc'), 
+					$descriptionText );
+			}
+		}
+		return Xml::openElement( 'tr', $trExtraParams ) .
+			Xml::openElement( 'td' ) . $text . Xml::closeElement( 'td' ) .
+			Xml::openElement( 'td', array( 'class' => 'mw-statistics-numbers' ) ) . $number . Xml::closeElement( 'td' ) .
+			Xml::closeElement( 'tr' );
+	}
+	
+	/**
+	 * Each of these methods is pretty self-explanatory, get a particular
+	 * row for the table of statistics
+	 * @return string
+	 */
+	private function getPageStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-pages', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-articles', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->good ),
+						array( 'class' => 'mw-statistics-articles' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-pages', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->total ),
+						array( 'class' => 'mw-statistics-pages' ),
+						'statistics-pages-desc' ) .
+				$this->formatRow( wfMsgExt( 'statistics-files', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->images ),
+						array( 'class' => 'mw-statistics-files' ) );
+	}
+	private function getEditStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-edits', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-edits', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->edits ),
+						array( 'class' => 'mw-statistics-edits' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-edits-average', array( 'parseinline' ) ),
+						$wgLang->formatNum( sprintf( '%.2f', $this->total ? $this->edits / $this->total : 0 ) ),
+						array( 'class' => 'mw-statistics-edits-average' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-jobqueue', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->numJobs ),
+						array( 'class' => 'mw-statistics-jobqueue' ) );
+	}
+	private function getUserStats() {
+		global $wgLang, $wgRCMaxAge;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-users', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-users', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->users ),
+						array( 'class' => 'mw-statistics-users' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-users-active', array( 'parseinline' ) ),
+						$wgLang->formatNum( $this->activeUsers ),
+						array( 'class' => 'mw-statistics-users-active' ),
+						'statistics-users-active-desc',
+						$wgLang->formatNum( ceil( $wgRCMaxAge / ( 3600 * 24 ) ) ) );
+	}
+	private function getGroupStats() {
+		global $wgGroupPermissions, $wgImplicitGroups, $wgLang, $wgUser;
+		$sk = $wgUser->getSkin();
+		$text = '';
+		foreach( $wgGroupPermissions as $group => $permissions ) {
+			# Skip generic * and implicit groups
+			if ( in_array( $group, $wgImplicitGroups ) || $group == '*' ) {
+				continue;
+			}
+			$groupname = htmlspecialchars( $group );
+			$msg = wfMsg( 'group-' . $groupname );
+			if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) {
+				$groupnameLocalized = $groupname;
+			} else {
+				$groupnameLocalized = $msg;
+			}
+			$msg = wfMsgForContent( 'grouppage-' . $groupname );
+			if ( wfEmptyMsg( 'grouppage-' . $groupname, $msg ) || $msg == '' ) {
+				$grouppageLocalized = MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
+			} else {
+				$grouppageLocalized = $msg;
+			}
+			$grouppage = $sk->makeLink( $grouppageLocalized, htmlspecialchars( $groupnameLocalized ) );
+			$grouplink = $sk->link( SpecialPage::getTitleFor( 'Listusers' ),
+				wfMsgHtml( 'listgrouprights-members' ),
+				array(),
+				array( 'group' => $group ),
+				'known' );
+				# Add a class when a usergroup contains no members to allow hiding these rows
+			$classZero = '';
+			$countUsers = SiteStats::numberingroup( $groupname );
+			if( $countUsers == 0 ) {
+				$classZero = ' statistics-group-zero';
+			}
+			$text .= $this->formatRow( $grouppage . ' ' . $grouplink,
+				$wgLang->formatNum( $countUsers ),
+				array( 'class' => 'statistics-group-' . Sanitizer::escapeClass( $group ) . $classZero )  );
+		}
+		return $text;
+	}
+	private function getViewsStats() {
+		global $wgLang;
+		return Xml::openElement( 'tr' ) .
+			Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-header-views', array( 'parseinline' ) ) ) .
+			Xml::closeElement( 'tr' ) .
+				$this->formatRow( wfMsgExt( 'statistics-views-total', array( 'parseinline' ) ),
+					$wgLang->formatNum( $this->views ),
+						array ( 'class' => 'mw-statistics-views-total' ) ) .
+				$this->formatRow( wfMsgExt( 'statistics-views-peredit', array( 'parseinline' ) ),
+					$wgLang->formatNum( sprintf( '%.2f', $this->edits ? 
+						$this->views / $this->edits : 0 ) ),
+						array ( 'class' => 'mw-statistics-views-peredit' ) );
+	}
+	private function getMostViewedPages() {
+		global $wgLang, $wgUser;
+		$text = '';
+		$dbr = wfGetDB( DB_SLAVE );
+		$sk = $wgUser->getSkin();
+		$res = $dbr->select(
 				'page',
 				array(
 					'page_namespace',
@@ -74,20 +238,33 @@ function wfSpecialStatistics( $par = '' ) {
 				)
 			);
 			if( $res->numRows() > 0 ) {
-				$text .= "==" . wfMsgNoTrans( 'statistics-mostpopular' ) . "==\n";
+				$text .= Xml::tags( 'th', array( 'colspan' => '2' ), wfMsgExt( 'statistics-mostpopular', array( 'parseinline' ) ) );
 				while( $row = $res->fetchObject() ) {
 					$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-					if( $title instanceof Title )
-						$text .= '* [[:' . $title->getPrefixedText() . ']] (' . $wgLang->formatNum( $row->page_counter ) . ")\n";
+					if( $title instanceof Title ) {
+						$text .= $this->formatRow( $sk->link( $title ),
+								$wgLang->formatNum( $row->page_counter ) );
+	
+					}
 				}
 				$res->free();
 			}
-		}
-
-		$footer = wfMsgNoTrans( 'statistics-footer' );
-		if( !wfEmptyMsg( 'statistics-footer', $footer ) && $footer != '' )
-			$text .= "\n" . $footer;
-
-		$wgOut->addWikiText( $text );
+		return $text;
+	}
+	
+	/**
+	 * Do the action=raw output for this page. Legacy, but we support
+	 * it for backwards compatibility
+	 * http://lists.wikimedia.org/pipermail/wikitech-l/2008-August/039202.html
+	 */
+	private function doRawOutput() {
+		global $wgOut;
+		$wgOut->disable();
+		header( 'Pragma: nocache' );
+		echo "total=" . $this->total . ";good=" . $this->good . ";views=" . 
+				$this->views . ";edits=" . $this->edits . ";users=" . $this->users . ";";
+		echo "activeusers=" . $this->activeUsers . ";admins=" . $this->admins . 
+				";images=" . $this->images . ";jobs=" . $this->numJobs . "\n";
+		return;
 	}
-}
+}
\ No newline at end of file