update to MediaWiki 1.16.0

1 files changed, 153 insertions, 15 deletions

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 9427536f..16e3c5f2 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -49,12 +49,7 @@ class SiteStats {
 			// clean schema with mwdumper.
 			wfDebug( __METHOD__ . ": initializing damaged or missing site_stats\n" );
 
-			global $IP;
-			require_once "$IP/maintenance/initStats.inc";
-
-			ob_start();
-			wfInitStats();
-			ob_end_clean();
+			SiteStatsInit::doAllAndCommit( false );
 
 			$row = self::doLoad( wfGetDB( DB_MASTER ) );
 		}
@@ -93,7 +88,7 @@ class SiteStats {
 		self::load();
 		return self::$row->ss_users;
 	}
-	
+
 	static function activeUsers() {
 		self::load();
 		return self::$row->ss_active_users;
@@ -111,7 +106,7 @@ class SiteStats {
 		wfDeprecated(__METHOD__);
 		return self::numberingroup('sysop');
 	}
-	
+
 	/**
 	 * Find the number of users in a given user group.
 	 * @param string $group Name of group
@@ -124,13 +119,13 @@ class SiteStats {
 			$hit = $wgMemc->get( $key );
 			if ( !$hit ) {
 				$dbr = wfGetDB( DB_SLAVE );
-				$hit = $dbr->selectField( 'user_groups', 'COUNT(*)', 
-													array( 'ug_group' => $group ), __METHOD__ );
+				$hit = $dbr->selectField( 'user_groups', 'COUNT(*)',
+					array( 'ug_group' => $group ), __METHOD__ );
 				$wgMemc->set( $key, $hit, 3600 );
 			}
 			self::$groupMemberCounts[$group] = $hit;
 		}
-		return self::$groupMemberCounts[$group];		
+		return self::$groupMemberCounts[$group];
 	}
 
 	static function jobs() {
@@ -209,7 +204,6 @@ class SiteStatsUpdate {
 	}
 
 	function doUpdate() {
-		$fname = 'SiteStatsUpdate::doUpdate';
 		$dbw = wfGetDB( DB_MASTER );
 
 		$updates = '';
@@ -226,11 +220,11 @@ class SiteStatsUpdate {
 
 			# Need a separate transaction because this a global lock
 			$dbw->begin();
-			$dbw->query( $sql, $fname );
+			$dbw->query( $sql, __METHOD__ );
 			$dbw->commit();
 		}
 	}
-	
+
 	public static function cacheUpdate( $dbw ) {
 		$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow') );
 		# Get non-bot users than did some recent action other than making accounts.
@@ -238,9 +232,153 @@ class SiteStatsUpdate {
 		$activeUsers = $dbr->selectField( 'recentchanges', 'COUNT( DISTINCT rc_user_text )',
 			array( 'rc_user != 0', 'rc_bot' => 0, "rc_log_type != 'newusers' OR rc_log_type IS NULL" ),
 			__METHOD__ );
-		$dbw->update( 'site_stats', 
+		$dbw->update( 'site_stats',
 			array( 'ss_active_users' => intval($activeUsers) ),
 			array( 'ss_row_id' => 1 ), __METHOD__
 		);
+		return $activeUsers;
+	}
+}
+
+/**
+ * Class designed for counting of stats.
+ */
+class SiteStatsInit {
+
+	// Db connection
+	private $db;
+
+	// Various stats
+	private $mEdits, $mArticles, $mPages, $mUsers, $mViews, $mFiles = 0;
+
+	/**
+	 * Constructor
+	 * @param $useMaster bool Whether to use the master db
+	 */
+	public function __construct( $useMaster = false ) {
+		$this->db = wfGetDB( $useMaster ? DB_MASTER : DB_SLAVE );
+	}
+
+	/**
+	 * Count the total number of edits
+	 * @return int
+	 */
+	public function edits() {
+		$this->mEdits = $this->db->selectField( 'revision', 'COUNT(*)', '', __METHOD__ );
+		$this->mEdits += $this->db->selectField( 'archive', 'COUNT(*)', '', __METHOD__ );
+		return $this->mEdits;
+	}
+
+	/**
+	 * Count pages in article space
+	 * @return int
+	 */
+	public function articles() {
+		global $wgContentNamespaces;
+		$this->mArticles = $this->db->selectField( 'page', 'COUNT(*)', array( 'page_namespace' => $wgContentNamespaces, 'page_is_redirect' => 0, 'page_len > 0' ), __METHOD__ );
+		return $this->mArticles;
+	}
+
+	/**
+	 * Count total pages
+	 * @return int
+	 */
+	public function pages() {
+		$this->mPages = $this->db->selectField( 'page', 'COUNT(*)', '', __METHOD__ );
+		return $this->mPages;
+	}
+	
+	/**
+	 * Count total users
+	 * @return int
+	 */
+	public function users() {
+		$this->mUsers = $this->db->selectField( 'user', 'COUNT(*)', '', __METHOD__ );
+		return $this->mUsers;
+	}
+	
+	/**
+	 * Count views
+	 * @return int
+	 */
+	public function views() {
+		$this->mViews = $this->db->selectField( 'page', 'SUM(page_counter)', '', __METHOD__ );
+		return $this->mViews;
+	}
+
+	/**
+	 * Count total files
+	 * @return int
+	 */
+	public function files() {
+		$this->mFiles = $this->db->selectField( 'image', 'COUNT(*)', '', __METHOD__ );
+		return $this->mFiles;
+	}
+
+	/**
+	 * Do all updates and commit them. More or less a replacement
+	 * for the original initStats, but without the calls to wfOut()
+	 * @param $update bool Whether to update the current stats or write fresh
+	 * @param $noViews bool When true, do not update the number of page views
+	 * @param $activeUsers Whether to update the number of active users
+	 */
+	public static function doAllAndCommit( $update, $noViews = false, $activeUsers = false ) {
+		// Grab the object and count everything
+		$counter = new SiteStatsInit( false );
+		$counter->edits();
+		$counter->articles();
+		$counter->pages();
+		$counter->users();
+		$counter->files();
+
+		// Only do views if we don't want to not count them
+		if( !$noViews )
+			$counter->views();
+
+		// Update/refresh
+		if( $update )
+			$counter->update();
+		else
+			$counter->refresh();
+
+		// Count active users if need be
+		if( $activeUsers )
+			SiteStatsUpdate::cacheUpdate( wfGetDB( DB_MASTER ) );
+	}
+
+	/**
+	 * Update the current row with the selected values
+	 */
+	public function update() {
+		list( $values, $conds ) = $this->getDbParams();
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->update( 'site_stats', $values, $conds, __METHOD__ );
+	}
+
+	/**
+	 * Refresh site_stats. Erase the current record and save all
+	 * the new values.
+	 */
+	public function refresh() {
+		list( $values, $conds, $views ) = $this->getDbParams();
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->delete( 'site_stats', $conds, __METHOD__ );
+		$dbw->insert( 'site_stats', array_merge( $values, $conds, $views ), __METHOD__ );
+	}
+
+	/**
+	 * Return three arrays of params for the db queries
+	 * @return array
+	 */
+	private function getDbParams() {
+		$values = array( 'ss_total_edits' => $this->mEdits,
+						'ss_good_articles' => $this->mArticles,
+						'ss_total_pages' => $this->mPages,
+						'ss_users' => $this->mUsers,
+						'ss_admins' => SiteStats::numberingroup( 'sysop' ), // @todo make this go away
+						'ss_images' => $this->mFiles );
+		$conds = array( 'ss_row_id' => 1 );
+		$views = array( 'ss_total_views' => $this->mViews );
+		return array( $values, $conds, $views );
 	}
 }