From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/removeUnusedAccounts.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'maintenance/removeUnusedAccounts.php')

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 7b0535b7..44c27b35 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class RemoveUnusedAccounts extends Maintenance {
 	public function __construct() {
@@ -35,26 +35,26 @@ class RemoveUnusedAccounts extends Maintenance {
 	public function execute() {
 
 		$this->output( "Remove unused accounts\n\n" );
-		
+
 		# Do an initial scan for inactive accounts and report the result
 		$this->output( "Checking for unused user accounts...\n" );
 		$del = array();
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( 'user', array( 'user_id', 'user_name', 'user_touched' ), '', __METHOD__ );
-		if( $this->hasOption('ignore-groups') ) {
-			$excludedGroups = explode( ',', $this->getOption('ignore-groups') );
-		} else { 
+		if ( $this->hasOption( 'ignore-groups' ) ) {
+			$excludedGroups = explode( ',', $this->getOption( 'ignore-groups' ) );
+		} else {
 			$excludedGroups = array();
 		}
 		$touched = $this->getOption( 'ignore-touched', "1" );
-		if( !ctype_digit( $touched ) ) {
+		if ( !ctype_digit( $touched ) ) {
 			$this->error( "Please put a valid positive integer on the --ignore-touched parameter.", true );
 		}
 		$touchedSeconds = 86400 * $touched;
-		foreach( $res as $row ) {
+		foreach ( $res as $row ) {
 			# Check the account, but ignore it if it's within a $excludedGroups group or if it's touched within the $touchedSeconds seconds.
 			$instance = User::newFromId( $row->user_id );
-			if( count( array_intersect( $instance->getEffectiveGroups(), $excludedGroups ) ) == 0
+			if ( count( array_intersect( $instance->getEffectiveGroups(), $excludedGroups ) ) == 0
 				&& $this->isInactiveAccount( $row->user_id, true )
 				&& wfTimestamp( TS_UNIX, $row->user_touched ) < wfTimestamp( TS_UNIX, time() - $touchedSeconds )
 				) {
@@ -65,9 +65,9 @@ class RemoveUnusedAccounts extends Maintenance {
 		}
 		$count = count( $del );
 		$this->output( "...found {$count}.\n" );
-	
+
 		# If required, go back and delete each marked account
-		if( $count > 0 && $this->hasOption('delete') ) {
+		if ( $count > 0 && $this->hasOption( 'delete' ) ) {
 			$this->output( "\nDeleting inactive accounts..." );
 			$dbw = wfGetDB( DB_MASTER );
 			$dbw->delete( 'user', array( 'user_id' => $del ), __METHOD__ );
@@ -75,12 +75,12 @@ class RemoveUnusedAccounts extends Maintenance {
 			# Update the site_stats.ss_users field
 			$users = $dbw->selectField( 'user', 'COUNT(*)', array(), __METHOD__ );
 			$dbw->update( 'site_stats', array( 'ss_users' => $users ), array( 'ss_row_id' => 1 ), __METHOD__ );
-		} elseif( $count > 0 ) {
+		} elseif ( $count > 0 ) {
 			$this->output( "\nRun the script again with --delete to remove them from the database.\n" );
 		}
 		$this->output( "\n" );
 	}
-	
+
 	/**
 	 * Could the specified user account be deemed inactive?
 	 * (No edits, no deleted edits, no log entries, no current/old uploads)
@@ -94,17 +94,17 @@ class RemoveUnusedAccounts extends Maintenance {
 		$checks = array( 'revision' => 'rev', 'archive' => 'ar', 'logging' => 'log',
 						 'image' => 'img', 'oldimage' => 'oi' );
 		$count = 0;
-	
+
 		$dbo->begin();
-		foreach( $checks as $table => $fprefix ) {
+		foreach ( $checks as $table => $fprefix ) {
 			$conds = array( $fprefix . '_user' => $id );
 			$count += (int)$dbo->selectField( $table, 'COUNT(*)', $conds, __METHOD__ );
 		}
 		$dbo->commit();
-	
+
 		return $count == 0;
 	}
 }
 
 $maintClass = "RemoveUnusedAccounts";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
-- 
cgit v1.2.2