update to MediaWiki 1.16.0

1 files changed, 85 insertions, 72 deletions

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 67d513ed..d1d3193b 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -1,9 +1,22 @@
 <?php
-
 /**
  * Maintenance script to move a batch of pages
  *
- * @file
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  * @author Tim Starling
  *
@@ -20,78 +33,78 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-$oldCwd = getcwd();
-$optionsWithArgs = array( 'u', 'r', 'i' );
-require_once( 'commandLine.inc' );
-
-chdir( $oldCwd );
-
-# Options processing
-
-$filename = 'php://stdin';
-$user = 'Move page script';
-$reason = '';
-$interval = 0;
-
-if ( isset( $args[0] ) ) {
-	$filename = $args[0];
-}
-if ( isset( $options['u'] ) ) {
-	$user = $options['u'];
-}
-if ( isset( $options['r'] ) ) {
-	$reason = $options['r'];
-}
-if ( isset( $options['i'] ) ) {
-	$interval = $options['i'];
-}
-
-$wgUser = User::newFromName( $user );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-
-# Setup complete, now start
-
-$file = fopen( $filename, 'r' );
-if ( !$file ) {
-	print "Unable to read file, exiting\n";
-	exit;
-}
-
-$dbw = wfGetDB( DB_MASTER );
-
-for ( $linenum = 1; !feof( $file ); $linenum++ ) {
-	$line = fgets( $file );
-	if ( $line === false ) {
-		break;
-	}
-	$parts = array_map( 'trim', explode( '|', $line ) );
-	if ( count( $parts ) != 2 ) {
-		print "Error on line $linenum, no pipe character\n";
-		continue;
+class MoveBatch extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Moves a batch of pages";
+		$this->addOption( 'u', "User to perform move", false, true );
+		$this->addOption( 'r', "Reason to move page", false, true );
+		$this->addOption( 'i', "Interval to sleep between moves" );
+		$this->addArg( 'listfile', 'List of pages to move, newline delimited', false );
 	}
-	$source = Title::newFromText( $parts[0] );
-	$dest = Title::newFromText( $parts[1] );
-	if ( is_null( $source ) || is_null( $dest ) ) {
-		print "Invalid title on line $linenum\n";
-		continue;
+	
+	public function execute() {
+		global $wgUser;
+
+		# Change to current working directory
+		$oldCwd = getcwd();
+		chdir( $oldCwd );
+
+		# Options processing
+		$user = $this->getOption( 'u', 'Move page script' );
+		$reason = $this->getOption( 'r', '' );
+		$interval = $this->getOption( 'i', 0 );
+		if( $this->hasArg() ) {
+			$file = fopen( $this->getArg(), 'r' );
+		} else {
+			$file = $this->getStdin();
+		}
+
+		# Setup
+		if( !$file ) {
+			$this->error( "Unable to read file, exiting", true );
+		}
+		$wgUser = User::newFromName( $user );
+		
+		# Setup complete, now start
+		$dbw = wfGetDB( DB_MASTER );
+		for ( $linenum = 1; !feof( $file ); $linenum++ ) {
+			$line = fgets( $file );
+			if ( $line === false ) {
+				break;
+			}
+			$parts = array_map( 'trim', explode( '|', $line ) );
+			if ( count( $parts ) != 2 ) {
+				$this->error( "Error on line $linenum, no pipe character" );
+				continue;
+			}
+			$source = Title::newFromText( $parts[0] );
+			$dest = Title::newFromText( $parts[1] );
+			if ( is_null( $source ) || is_null( $dest ) ) {
+				$this->error( "Invalid title on line $linenum" );
+				continue;
+			}
+	
+	
+			$this->output( $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText() );
+			$dbw->begin();
+			$err = $source->moveTo( $dest, false, $reason );
+			if( $err !== true ) {
+				$msg = array_shift( $err[0] );
+				$this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) );
+			}
+			$dbw->commit();
+			$this->output( "\n" );
+	
+			if ( $interval ) {
+				sleep( $interval );
+			}
+			wfWaitForSlaves( 5 );
+		}
 	}
-
-
-	print $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText();
-	$dbw->begin();
-	$err = $source->moveTo( $dest, false, $reason );
-	if( $err !== true ) {
-		$msg = array_shift( $err[0] );
-		print "\nFAILED: " . wfMsg( $msg, $err[0] );
-	}
-	$dbw->immediateCommit();
-	print "\n";
-
-	if ( $interval ) {
-		sleep( $interval );
-	}
-	wfWaitForSlaves( 5 );
 }
 
-
-
+$maintClass = "MoveBatch";
+require_once( DO_MAINTENANCE );