* Extra newline for pretty output

[lhc/web/wiklou.git] / maintenance / commandLine.inc

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index ee1d78e..a6274f0 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,21 +1,31 @@
 <?php
+/**
+ * @todo document
+ * @package MediaWiki
+ * @subpackage Maintenance
+ */
 
+/** */
 # 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
 
 if ( !isset( $optionsWithArgs ) ) {
        $optionsWithArgs = array();
 }
 
 $self = array_shift( $argv );
+$self = __FILE__;
 $IP = realpath( dirname( $self ) . "/.." );
 chdir( $IP );
 
@@ -33,7 +43,14 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
                        }
                        $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} == '-' ) {
                # Short options
@@ -59,26 +76,46 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
 $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 ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
+if (!isset( $wgUseNormalUser ) ) {
+       $wgUseNormalUser = false;
+}
+
+if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $wgWikiFarm = true;
-       if ( isset( $args[0] ) ) {
-               $lang = array_shift( $args );
+       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 ) = $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 {
                $lang = "aa";
-       }
-       if ( isset( $args[0] ) ) {
-               $site = array_shift( $args );
-       } else {
                $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" ) {
-               $wgDBadminuser = "wikiadmin";
-               $wgDBadminpassword = trim(`wikiadmin_pass`);
+       if ( $_ENV['USER'] == "apache" ) {
+               $wgUseNormalUser = true;
        }
 
        putenv( "wikilang=$lang");
@@ -86,7 +123,16 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
        $DP = $IP;
        ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
-       require_once( "/home/wikipedia/common/php-new/CommonSettings.php" );
+       require_once( "$IP/includes/Defines.php" );
+       require_once( "$IP/CommonSettings.php" );
+
+       if ( $wgUseRootUser ) {
+               $wgDBuser = $wgDBadminuser = "root";
+               $wgDBpassword = $wgDBadminpassword = trim(`mysql_root_pass`);
+       } elseif ( !$wgUseNormalUser ) {
+               $wgDBuser = $wgDBadminuser = "wikiadmin";
+               $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+       }
 } else {
        $wgWikiFarm = false;
        $settingsFile = "$IP/LocalSettings.php";
@@ -98,21 +144,62 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
        }
        $wgCommandLineMode = true;
        $DP = $IP;
-       include_once( $settingsFile );
+       require_once( "$IP/includes/Defines.php" );
+       require_once( $settingsFile );
        ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );
-       include_once( "$IP/AdminSettings.php" );
+       
+       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 this one
+# Same with these
 $wgCommandLineMode = true;
 
-$wgUsePHPTal = false;
-define("MEDIAWIKI",true);
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) && $wgDBservers ) {
+       $wgDBuser = $wgDBadminuser;
+       $wgDBpassword = $wgDBadminpassword;
+
+       foreach ( $wgDBservers as $i => $server ) {
+               $wgDBservers[$i]['user'] = $wgDBuser;
+               $wgDBservers[$i]['password'] = $wgDBpassword;
+       }
+}
+
+if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
+       $fn = MW_CMDLINE_CALLBACK;
+       $fn();
+}
+
+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();
+               }
+       }
+}
+
+
+
 ?>