X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcommandLine.inc;h=ab7c0a844b9f13cdc96e7876808d4b873fdf659b;hb=0120a03e9a7fe20fc416e2d611fc33ba509dbfe3;hp=69f5aa6dbbb42433323e7c1c7923ee345fbfe669;hpb=bf44faaba6076935940e1c7de308e68fe94bbb5b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 69f5aa6dbb..ab7c0a844b 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,197 +1,46 @@
 <?php
+
 /**
- * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * Backwards-compatibility wrapper for old-style maintenance scripts
  */
-
-/** */
-# Abort if called from a web server
-if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
-	print "This script must be run from the command line\n";
-	exit();
-}
-
-define("MEDIAWIKI",true);
-
-# Process command line arguments
-# $options becomes an array with keys set to the option names
-# $optionsWithArgs is an array of GNU-style options that take an argument. The arguments are returned
-# in the values of $options.
-# $args becomes a zero-based array containing the non-option arguments
+require( dirname(__FILE__) . '/Maintenance.php' );
 
 if ( !isset( $optionsWithArgs ) ) {
-	$optionsWithArgs = array();
+    $optionsWithArgs = array();
 }
 
-$self = array_shift( $argv );
-$self = __FILE__;
-$IP = realpath( dirname( $self ) . "/.." );
-chdir( $IP );
-
-$options = array();
-$args = array();
-
-for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
-	if ( substr( $arg, 0, 2 ) == '--' ) {
-		# Long options
-		$option = substr( $arg, 2 );
-		if ( in_array( $option, $optionsWithArgs ) ) {
-			$param = next( $argv );
-			if ( $param === false ) {
-				die( "$arg needs an value after it\n" );
-			}
-			$options[$option] = $param;
-		} else {
-			$bits = explode( '=', $option, 2 );
-			if( count( $bits ) > 1 ) {
-				$option = $bits[0];
-				$param = $bits[1];
-			} else {
-				$param = 1;
-			}
-			$options[$option] = $param;
+class CommandLineInc extends Maintenance {
+	public function __construct() {
+		global $optionsWithArgs;
+		parent::__construct();
+		foreach ( $optionsWithArgs as $name ) {
+			$this->addOption( $name, '', false, true );
 		}
-	} elseif ( $arg{0} == '-' ) {
-		# Short options
-		for ( $p=1; $p<strlen( $arg ); $p++ ) {
-			$option = $arg{$p};
-			if ( in_array( $option, $optionsWithArgs ) ) {
-				$param = next( $argv );
-				if ( $param === false ) {
-					die( "$arg needs an value after it\n" );
-				}
-				$options[$option] = $param;
-			} else {
-				$options[$option] = 1;
-			}
-		}
-	} else {
-		$args[] = $arg;
 	}
-}
 
-# General initialisation
+	protected function getDbType() {
+		global $wgUseNormalUser;
 
-$wgCommandLineMode = true;
-# Turn off output buffering if it's on
-@ob_end_flush();
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-
-if (!isset( $wgUseNormalUser ) ) {
-	$wgUseNormalUser = false;
-}
-
-if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
-	$wgWikiFarm = true;
-	require_once( "$IP/includes/SiteConfiguration.php" );
-
-	# Get $conf
-	require( "$IP/InitialiseSettings.php" );
-
-	if ( empty( $wgNoDBParam ) ) {
-		# Check if we were passed a db name
-		$db = array_shift( $args );
-		list( $site, $lang ) = $conf->siteFromDB( $db );
-
-		# If not, work out the language and site the old way
-		if ( is_null( $site ) || is_null( $lang ) ) {
-			if ( !$db ) {	
-				$lang = "aa";
-			} else {
-				$lang = $db;
-			}
-			if ( isset( $args[0] ) ) {
-				$site = array_shift( $args );
-			} else {
-				$site = "wikipedia";
-			}
-		}
-	} else {
-		$lang = "aa";
-		$site = "wikipedia";
+		return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ?
+			Maintenance::DB_STD : Maintenance::DB_ADMIN;
 	}
 
-	# This is for the IRC scripts, which now run as the apache user
-	# The apache user doesn't have access to the wikiadmin_pass command
-	if ( $_ENV['USER'] == "apache" ) {
-		$wgUseNormalUser = true;
+	/**
+	 * No help, it would just be misleading since it misses custom options
+	 */
+	protected function maybeHelp( $force = false ) {
+		if ( !$force )
+			return;
+		parent::maybeHelp( true );
 	}
 
-	putenv( "wikilang=$lang");
-
-	$DP = $IP;
-	ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
-
-	require_once( "$IP/includes/Defines.php" );
-	require_once( "$IP/CommonSettings.php" );
-
-	if ( !$wgUseNormalUser ) {
-		$wgDBuser = $wgDBadminuser = "wikiadmin";
-		$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
-	}
-} else {
-	$wgWikiFarm = false;
-	$settingsFile = "$IP/LocalSettings.php";
-
-	if ( ! is_readable( $settingsFile ) ) {
-		print "A copy of your installation's LocalSettings.php\n" .
-		  "must exist in the source directory.\n";
-		exit();
-	}
-	$wgCommandLineMode = true;
-	$DP = $IP;
-	require_once( "$IP/includes/Defines.php" );
-	require_once( $settingsFile );
-	ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );
-	
-	if ( is_readable( "$IP/AdminSettings.php" ) ) {
-		require_once( "$IP/AdminSettings.php" );
-	}
-}
-
-# Turn off output buffering again, it might have been turned on in the settings files
-@ob_end_flush();
-# Same with these
-$wgCommandLineMode = true;
-
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
-	$wgDBuser = $wgDBadminuser;
-	$wgDBpassword = $wgDBadminpassword;
-
-	foreach ( $wgDBservers as $i => $server ) {
-		$wgDBservers[$i]['user'] = $wgDBuser;
-		$wgDBservers[$i]['password'] = $wgDBpassword;
+	public function execute() {
+		global $args, $options;
+		$args = $this->mArgs;
+		$options = $this->mOptions;
 	}
 }
 
-ini_set( 'memory_limit', -1 );
-
-require_once( "Setup.php" );
-require_once( "install-utils.inc" );
-$wgTitle = Title::newFromText( "Command line script" );
-set_time_limit(0);
-
-// --------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------
-
-function wfWaitForSlaves( $maxLag ) {
-	global $wgLoadBalancer;
-	if ( $maxLag ) {
-		list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-		while ( $lag > $maxLag ) {
-			$name = @gethostbyaddr( $host );
-			if ( $name !== false ) {
-				$host = $name;
-			}
-			print "Waiting for $host (lagged $lag seconds)...\n";
-			sleep($maxLag);
-			list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-		}
-	}
-}
-
-
+$maintClass = 'CommandLineInc';
+require( DO_MAINTENANCE );
 
-?>