X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FinitSiteStats.php;h=b2530ce653a0e78bb660373dbae79f82a3b7e52d;hb=720c86a77be582876cd934223ce8f9c55fc3bd68;hp=19906592d77d2ccb358294653b9ddda32063cbef;hpb=e0f1be027b69e666ea315cd98795146a55fcabe9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/initSiteStats.php b/maintenance/initSiteStats.php
index 19906592d7..b2530ce653 100644
--- a/maintenance/initSiteStats.php
+++ b/maintenance/initSiteStats.php
@@ -23,7 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to re-initialise or update the site statistics table
@@ -33,9 +33,8 @@ require_once( __DIR__ . '/Maintenance.php' );
 class InitSiteStats extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Re-initialise the site statistics tables";
-		$this->addOption( 'update', 'Update the existing statistics (preserves the ss_total_views field)' );
-		$this->addOption( 'noviews', "Don't update the page view counter" );
+		$this->addDescription( 'Re-initialise the site statistics tables' );
+		$this->addOption( 'update', 'Update the existing statistics' );
 		$this->addOption( 'active', 'Also update active users count' );
 		$this->addOption( 'use-master', 'Count using the master database' );
 	}
@@ -48,7 +47,7 @@ class InitSiteStats extends Maintenance {
 		$edits = $counter->edits();
 		$this->output( "{$edits}\nCounting number of articles..." );
 
-		$good  = $counter->articles();
+		$good = $counter->articles();
 		$this->output( "{$good}\nCounting total pages..." );
 
 		$pages = $counter->pages();
@@ -60,29 +59,24 @@ class InitSiteStats extends Maintenance {
 		$image = $counter->files();
 		$this->output( "{$image}\n" );
 
-		if ( !$this->hasOption( 'noviews' ) ) {
-			$this->output( "Counting total page views..." );
-			$views = $counter->views();
-			$this->output( "{$views}\n" );
+		if ( $this->hasOption( 'update' ) ) {
+			$this->output( "\nUpdating site statistics..." );
+			$counter->refresh();
+			$this->output( "done.\n" );
+		} else {
+			$this->output( "\nTo update the site statistics table, run the script "
+				. "with the --update option.\n" );
 		}
 
 		if ( $this->hasOption( 'active' ) ) {
-			$this->output( "Counting active users..." );
-			$active = SiteStatsUpdate::cacheUpdate( wfGetDB( DB_MASTER ) );
+			$this->output( "\nCounting and updating active users..." );
+			$active = SiteStatsUpdate::cacheUpdate( $this->getDB( DB_MASTER ) );
 			$this->output( "{$active}\n" );
 		}
 
-		$this->output( "\nUpdating site statistics..." );
-
-		if ( $this->hasOption( 'update' ) ) {
-			$counter->update();
-		} else {
-			$counter->refresh();
-		}
-
-		$this->output( "done.\n" );
+		$this->output( "\nDone.\n" );
 	}
 }
 
 $maintClass = "InitSiteStats";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;