Recentchanges optimization: avoid a lot of senseless parsing of link text coming...

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

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index ee1d78e..ce22a41 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,11 +1,19 @@
 <?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
@@ -33,7 +41,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
@@ -61,24 +76,36 @@ $wgCommandLineMode = true;
 @ob_end_flush();
 $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
 
-if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
+if ( $sep == ":" && strpos( `hostname`, "wikimedia.org" ) !== false ) {
        $wgWikiFarm = true;
-       if ( isset( $args[0] ) ) {
-               $lang = array_shift( $args );
-       } else {
-               $lang = "aa";
-       }
-       if ( isset( $args[0] ) ) {
-               $site = array_shift( $args );
-       } else {
-               $site = "wikipedia";
+       require_once( "$IP/includes/SiteConfiguration.php" );
+
+       # Get $conf
+       require( "$IP/InitialiseSettings.php" );
+
+       # 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";
+               }
        }
 
        # 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`);
+               $wgDBuser = $wgDBadminuser = "wikiadmin";
+               $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
        }
 
        putenv( "wikilang=$lang");
@@ -86,6 +113,7 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) {
        $DP = $IP;
        ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
+       require_once( "$IP/includes/Defines.php" );
        require_once( "/home/wikipedia/common/php-new/CommonSettings.php" );
 } else {
        $wgWikiFarm = false;
@@ -98,18 +126,20 @@ 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" );
+       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;
+$wgDBuser = $wgDBadminuser;
+$wgDBpassword = $wgDBadminpassword;
+
 
-$wgUsePHPTal = false;
-define("MEDIAWIKI",true);
 require_once( "Setup.php" );
 require_once( "install-utils.inc" );
 $wgTitle = Title::newFromText( "Command line script" );