update to MediaWiki 1.16.0

1 files changed, 41 insertions, 46 deletions

diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index c237feee..c8f1667b 100644
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -1,37 +1,55 @@
 <?php
 /**
- * @file
+ * Dump a the list of files uploaded, for feeding to tar or similar
+ *
+ * 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
  */
 
-require_once 'commandLine.inc';
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-class UploadDumper {
-	function __construct( $args ) {
+class UploadDumper extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Generates list of uploaded files which can be fed to tar or similar.
+By default, outputs relative paths against the parent directory of \$wgUploadDirectory.";
+		$this->addOption( 'base', 'Set base relative path instead of wiki include root', false, true );
+		$this->addOption( 'local', 'List all local files, used or not. No shared files included' );
+		$this->addOption( 'used', 'Skip local images that are not used' );
+		$this->addOption( 'shared', 'Include images used from shared repository' );
+	}
+
+	public function execute() {
 		global $IP, $wgUseSharedUploads;
 		$this->mAction = 'fetchLocal';
-		$this->mBasePath = $IP;
+		$this->mBasePath = $this->getOption( 'base', $IP );
 		$this->mShared = false;
 		$this->mSharedSupplement = false;
-		
-		if( isset( $args['help'] ) ) {
-			$this->mAction = 'help';
-		}
-		
-		if( isset( $args['base'] ) ) {
-			$this->mBasePath = $args['base'];
-		}
-		
-		if( isset( $args['local'] ) ) {
+
+		if( $this->hasOption('local') ) {
 			$this->mAction = 'fetchLocal';
 		}
 		
-		if( isset( $args['used'] ) ) {
+		if( $this->hasOption('used') ) {
 			$this->mAction = 'fetchUsed';
 		}
 		
-		if( isset( $args['shared'] ) ) {
-			if( isset( $args['used'] ) ) {
+		if( $this->hasOption('shared') ) {
+			if( $this->hasOption('used') ) {
 				// Include shared-repo files in the used check
 				$this->mShared = true;
 			} else {
@@ -39,34 +57,12 @@ class UploadDumper {
 				$this->mSharedSupplement = true;
 			}
 		}
-	}
-	
-	function run() {
 		$this->{$this->mAction}( $this->mShared );
 		if( $this->mSharedSupplement ) {
 			$this->fetchUsed( true );
 		}
 	}
-	
-	function help() {
-		echo <<<END
-Generates list of uploaded files which can be fed to tar or similar.
-By default, outputs relative paths against the parent directory of
-\$wgUploadDirectory.
 
-Usage:
-php dumpUploads.php [options] > list-o-files.txt
-
-Options:
---base=<path>  Set base relative path instead of wiki include root
-
---local        List all local files, used or not. No shared files included.
---used         Skip local images that are not used
---shared       Include images used from shared repository
-
-END;
-	}
-	
 	/**
 	 * Fetch a list of all or used images from a particular image source.
 	 * @param string $table
@@ -89,7 +85,7 @@ END;
 		}
 		$dbr->freeResult( $result );
 	}
-	
+
 	function fetchLocal( $shared ) {
 		$dbr = wfGetDB( DB_SLAVE );
 		$result = $dbr->select( 'image',
@@ -108,17 +104,16 @@ END;
 		if( $file && $this->filterItem( $file, $shared ) ) {
 			$filename = $file->getFullPath();
 			$rel = wfRelativePath( $filename, $this->mBasePath );
-			echo "$rel\n";
+			$this->output( "$rel\n" );
 		} else {
 			wfDebug( __METHOD__ . ": base file? $name\n" );
 		}
 	}
-	
+
 	function filterItem( $file, $shared ) {
 		return $shared || $file->isLocal();
 	}
 }
 
-$dumper = new UploadDumper( $options );
-$dumper->run();
-
+$maintClass = "UploadDumper";
+require_once( DO_MAINTENANCE );