X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcommandLine.inc;h=0720e76fd6abdddc24d7ebce54007bb787d3ef2c;hb=ecf56c33fae16e8a7a8f7ab56e7b6aba3720ceeb;hp=6b8638436817dc7d69a44affc50a1054980623ca;hpb=92aecd02c1c88c4f7ec2afeee4a25d8a0479e42a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 6b86384368..0720e76fd6 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,249 +1,46 @@
 <?php
+
 /**
- * @todo document
- * @addtogroup Maintenance
+ * Backwards-compatibility wrapper for old-style maintenance scripts
  */
-
-$wgRequestTime = microtime(true);
-
-/** */
-# 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();
-}
-
-if( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
-	print "Sorry! This version of MediaWiki requires PHP 5; you are running " .
-		PHP_VERSION . ".\n\n" .
-		"If you are sure you already have PHP 5 installed, it may be " .
-		"installed\n" .
-		"in a different path from PHP 4. Check with your system administrator.\n";
-	die( -1 );
-}
-
-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[] = 'conf'; # For specifying the location of LocalSettings.php
-$optionsWithArgs[] = 'aconf'; # As above for AdminSettings.php
-
-$self = array_shift( $argv );
-$IP = ( getenv('MW_INSTALL_PATH') !== false
-	? getenv('MW_INSTALL_PATH')
-	: realpath( dirname( __FILE__ ) . '/..' ) );
-#chdir( $IP );
-require_once( "$IP/StartProfiler.php" );
-
-$options = array();
-$args = array();
-
-
-# Parse arguments
-for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
-	if ( $arg == '--' ) {
-		# End of options, remainder should be considered arguments
-		$arg = next( $argv );
-		while( $arg !== false ) {
-			$args[] = $arg;
-			$arg = next( $argv );
-		}
-		break;
-	} elseif ( substr( $arg, 0, 2 ) == '--' ) {
-		# Long options
-		$option = substr( $arg, 2 );
-		if ( in_array( $option, $optionsWithArgs ) ) {
-			$param = next( $argv );
-			if ( $param === false ) {
-				echo "$arg needs a value after it\n";
-				die( -1 );
-			}
-			$options[$option] = $param;
-		} else {
-			$bits = explode( '=', $option, 2 );
-			if( count( $bits ) > 1 ) {
-				$option = $bits[0];
-				$param = $bits[1];
-			} else {
-				$param = 1;
-			}
-			$options[$option] = $param;
-		}
-	} elseif ( substr( $arg, 0, 1 ) == '-' ) {
-		# Short options
-		for ( $p=1; $p<strlen( $arg ); $p++ ) {
-			$option = $arg{$p};
-			if ( in_array( $option, $optionsWithArgs ) ) {
-				$param = next( $argv );
-				if ( $param === false ) {
-					echo "$arg needs a value after it\n";
-					die( -1 );
-				}
-				$options[$option] = $param;
-			} else {
-				$options[$option] = 1;
-			}
-		}
-	} else {
-		$args[] = $arg;
-	}
-}
-
-
-# General initialisation
-
-$wgCommandLineMode = true;
-# Turn off output buffering if it's on
-@ob_end_flush();
-$sep = PATH_SEPARATOR;
-
-if (!isset( $wgUseNormalUser ) ) {
-	$wgUseNormalUser = false;
+    $optionsWithArgs = array();
 }
 
-if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
-	$wgWikiFarm = true;
-	#$cluster = trim( file_get_contents( '/etc/cluster' ) );
-	$cluster = 'pmtpa';
-	require_once( "$IP/includes/SiteConfiguration.php" );
-
-	# Get $wgConf
-	require( "$IP/wgConf.php" );
-
-	if ( empty( $wgNoDBParam ) ) {
-		# Check if we were passed a db name
-		$db = array_shift( $args );
-		list( $site, $lang ) = $wgConf->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';
-			}
+class CommandLineInc extends Maintenance {
+	public function __construct() {
+		global $optionsWithArgs;
+		parent::__construct();
+		foreach ( $optionsWithArgs as $name ) {
+			$this->addOption( $name, '', false, true );
 		}
-	} else {
-		$lang = 'aa';
-		$site = 'wikipedia';
 	}
 
-	# 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' ) {
-	#if ( posix_geteuid() == 48 ) {
-		$wgUseNormalUser = true;
-	}
-
-	putenv( 'wikilang='.$lang);
-
-	$DP = $IP;
-	ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
+	public function getDbType() {
+		global $wgUseNormalUser;
 
-	if ( $lang == 'test' && $site == 'wikipedia' ) {
-		define( 'TESTWIKI', 1 );
+		return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ?
+			Maintenance::DB_STD : Maintenance::DB_ADMIN;
 	}
-	
-	#require_once( $IP.'/includes/ProfilerStub.php' );
-	require_once( $IP.'/includes/Defines.php' );
-	require_once( $IP.'/CommonSettings.php' );
 
-	$bin = '/home/wikipedia/bin';
-	if ( $wgUseRootUser ) {
-		$wgDBuser = $wgDBadminuser = 'root';
-		$wgDBpassword = $wgDBadminpassword = trim(`$bin/mysql_root_pass`);
-	} elseif ( !$wgUseNormalUser ) {
-		$wgDBuser = $wgDBadminuser = 'wikiadmin';
-		$wgDBpassword = $wgDBadminpassword = trim(`$bin/wikiadmin_pass`);
+	/**
+	 * No help, it would just be misleading since it misses custom options
+	 */
+	protected function maybeHelp( $force = false ) {
+		if ( !$force )
+			return;
+		parent::maybeHelp( true );
 	}
-} else {
-	$wgWikiFarm = false;
-	if ( isset( $options['conf'] ) ) {
-		$settingsFile = $options['conf'];
-	} else {
-		$settingsFile = "$IP/LocalSettings.php";
-	}
-
-	if ( ! is_readable( $settingsFile ) ) {
-		print "A copy of your installation's LocalSettings.php\n" .
-		  "must exist and be readable in the source directory.\n";
-		exit( 1 );
-	}
-	$wgCommandLineMode = true;
-	$DP = $IP;
-	#require_once( $IP.'/includes/ProfilerStub.php' );
-	require_once( $IP.'/includes/Defines.php' );
-	require_once( $settingsFile );
-	/* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */
-
-	$adminSettings = isset( $options['aconf'] )
-		? $options['aconf']
-		: "{$IP}/AdminSettings.php";
-	if( is_readable( $adminSettings ) )
-		require_once( $adminSettings );
-
-}
-
-# Turn off output buffering again, it might have been turned on in the settings files
-if( ob_get_level() ) {
-	ob_end_flush();
-}
-# Same with these
-$wgCommandLineMode = true;
 
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
-	$wgDBuser = $wgDBadminuser;
-	$wgDBpassword = $wgDBadminpassword;
-
-	if( $wgDBservers ) {
-		foreach ( $wgDBservers as $i => $server ) {
-			$wgDBservers[$i]['user'] = $wgDBuser;
-			$wgDBservers[$i]['password'] = $wgDBpassword;
-		}
-	}
-	if( isset( $wgLBFactoryConf['serverTemplate'] ) ) {
-		$wgLBFactoryConf['serverTemplate']['user'] = $wgDBuser;
-		$wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
+	public function execute() {
+		global $args, $options;
+		$args = $this->mArgs;
+		$options = $this->mOptions;
 	}
 }
 
-if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
-	$fn = MW_CMDLINE_CALLBACK;
-	$fn();
-}
-
-ini_set( 'memory_limit', -1 );
-
-if( version_compare( phpversion(), '5.2.4' ) >= 0 ) {
-	// Send PHP warnings and errors to stderr instead of stdout.
-	// This aids in diagnosing problems, while keeping messages
-	// out of redirected output.
-	if( ini_get( 'display_errors' ) ) {
-		ini_set( 'display_errors', 'stderr' );
-	}
-	
-	// Don't touch the setting on earlier versions of PHP,
-	// as setting it would disable output if you'd wanted it.
-	
-	// Note that exceptions are also sent to stderr when
-	// command-line mode is on, regardless of PHP version.
-}
-$wgShowSQLErrors = true;
+$maintClass = 'CommandLineInc';
+require( DO_MAINTENANCE );
 
-require_once( "$IP/includes/Setup.php" );
-require_once( "$IP/install-utils.inc" );
-$wgTitle = null; # Much much faster startup than creating a title object
-@set_time_limit(0);