X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcommandLine.inc;h=bc75f9ac91d75ba09b211ff4f8edc2512566e5af;hb=a448e8f9f1cb288db7b61a0770ebd9ecbd4b363a;hp=10cf5625d66316ad68556d23708256c7922a9323;hpb=b5c80fc4710af2975ee52d9106dd2969ff91e00e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 10cf5625d6..bc75f9ac91 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,50 +1,94 @@
 <?php
+/**
+ * @file
+ * @todo document
+ * @ingroup Maintenance
+ * @defgroup Maintenance Maintenance
+ */
 
+$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();
 }
 
-define("MEDIAWIKI",true);
+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
 
 if ( !isset( $optionsWithArgs ) ) {
 	$optionsWithArgs = array();
 }
+$optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php
+$optionsWithArgs[] = 'aconf'; # As above for AdminSettings.php
+$optionsWithArgs[] = 'wiki'; # For specifying the wiki ID
 
 $self = array_shift( $argv );
-$IP = realpath( dirname( $self ) . "/.." );
-chdir( $IP );
+$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 ( substr( $arg, 0, 2 ) == '--' ) {
+	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 ) {
-				die( "$arg needs an value after it\n" );
+				echo "$arg needs a value after it\n";
+				die( -1 );
 			}
 			$options[$option] = $param;
 		} else {
-			$options[$option] = 1;
+			$bits = explode( '=', $option, 2 );
+			if( count( $bits ) > 1 ) {
+				$option = $bits[0];
+				$param = $bits[1];
+			} else {
+				$param = 1;
+			}
+			$options[$option] = $param;
 		}
-	} elseif ( $arg{0} == '-' ) {
+	} 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 ) {
-					die( "$arg needs an value after it\n" );
+					echo "$arg needs a value after it\n";
+					die( -1 );
 				}
 				$options[$option] = $param;
 			} else {
@@ -56,69 +100,165 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
 	}
 }
 
+
 # General initialisation
 
 $wgCommandLineMode = true;
 # Turn off output buffering if it's on
 @ob_end_flush();
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
+$sep = PATH_SEPARATOR;
+
+if (!isset( $wgUseNormalUser ) ) {
+	$wgUseNormalUser = false;
+}
 
-if ( $sep == ":" && strpos( `hostname`, "wikimedia.org" ) !== false ) {
+if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 	$wgWikiFarm = true;
-	if ( isset( $args[0] ) ) {
-		$lang = array_shift( $args );
-	} else {
-		$lang = "aa";
-	}
-	if ( isset( $args[0] ) ) {
-		$site = array_shift( $args );
+	#$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
+		if ( isset( $options['wiki'] ) ) {
+			$db = $options['wiki'];
+		} else {
+			$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';
+			}
+		}
 	} else {
-		$site = "wikipedia";
+		$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" ) {
-		$wgDBuser = $wgDBadminuser = "wikiadmin";
-		$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+	if ( $_ENV['USER'] == 'apache' ) {
+	#if ( posix_geteuid() == 48 ) {
+		$wgUseNormalUser = true;
 	}
 
-	putenv( "wikilang=$lang");
+	putenv( 'wikilang='.$lang);
 
 	$DP = $IP;
-	ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
+	ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
+
+	if ( $lang == 'test' && $site == 'wikipedia' ) {
+		define( 'TESTWIKI', 1 );
+	}
+	
+	#require_once( $IP.'/includes/ProfilerStub.php' );
+	require_once( $IP.'/includes/Defines.php' );
+	require_once( $IP.'/CommonSettings.php' );
 
-	require_once( "$IP/includes/Defines.php" );
-	require_once( "/home/wikipedia/common/php-new/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`);
+	}
 } else {
 	$wgWikiFarm = false;
-	$settingsFile = "$IP/LocalSettings.php";
+	if ( isset( $options['conf'] ) ) {
+		$settingsFile = $options['conf'];
+	} else {
+		$settingsFile = "$IP/LocalSettings.php";
+	}
+	if ( isset( $options['wiki'] ) ) {
+		$bits = explode( '-', $options['wiki'] );
+		if ( count( $bits ) == 1 ) {
+			$bits[] = '';
+		}
+		define( 'MW_DB', $bits[0] );
+		define( 'MW_PREFIX', $bits[1] );
+	}
 
 	if ( ! is_readable( $settingsFile ) ) {
 		print "A copy of your installation's LocalSettings.php\n" .
-		  "must exist in the source directory.\n";
-		exit();
+		  "must exist and be readable in the source directory.\n";
+		exit( 1 );
 	}
 	$wgCommandLineMode = true;
 	$DP = $IP;
-	require_once( "$IP/includes/Defines.php" );
+	#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" );
-	require_once( "$IP/AdminSettings.php" );
+	/* 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
-@ob_end_flush();
+if( ob_get_level() ) {
+	ob_end_flush();
+}
 # Same with these
 $wgCommandLineMode = true;
-$wgDBuser = $wgDBadminuser;
-$wgDBpassword = $wgDBadminpassword;
 
+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;
+	}
+}
 
-$wgUsePHPTal = false;
-require_once( "Setup.php" );
-require_once( "install-utils.inc" );
-$wgTitle = Title::newFromText( "Command line script" );
-set_time_limit(0);
+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;
 
-?>
+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);