And we now have CSSMin
[lhc/web/wiklou.git] / maintenance / Maintenance.php
index b1f0a8d..bf0639b 100644 (file)
@@ -1,14 +1,25 @@
 <?php
+/**
+ * @file
+ * @ingroup Maintenance
+ * @defgroup Maintenance Maintenance
+ */
+
 // Define this so scripts can easily find doMaintenance.php
-define( 'DO_MAINTENANCE', dirname(__FILE__) . '/doMaintenance.php' );
+define( 'DO_MAINTENANCE', dirname( __FILE__ ) . '/doMaintenance.php' );
+$maintClass = false;
+
+function wfRunMaintenance( $class ) {
+       $maintClass = $class;
+       require_once( DO_MAINTENANCE );
+}
 
 // Make sure we're on PHP5 or better
-if( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
-       echo( "Sorry! This version of MediaWiki requires PHP 5; you are running " .
+if ( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
+       die ( "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();
 }
 
 /**
@@ -45,39 +56,39 @@ abstract class Maintenance {
        const DB_NONE  = 0;
        const DB_STD   = 1;
        const DB_ADMIN = 2;
-       
+
        // Const for getStdin()
        const STDIN_ALL = 'all';
 
        // This is the desired params
-       private $mParams = array();
-       
+       protected $mParams = array();
+
        // Array of desired args
-       private $mArgList = array();
+       protected $mArgList = array();
 
        // This is the list of options that were actually passed
-       private $mOptions = array();
+       protected $mOptions = array();
 
        // This is the list of arguments that were actually passed
        protected $mArgs = array();
-       
+
        // Name of the script currently running
        protected $mSelf;
 
        // Special vars for params that are always used
-       private $mQuiet = false;
-       private $mDbUser, $mDbPass;
+       protected $mQuiet = false;
+       protected $mDbUser, $mDbPass;
 
        // A description of the script, children should change this
        protected $mDescription = '';
-       
+
        // Have we already loaded our user input?
-       private $mInputLoaded = false;
-       
+       protected $mInputLoaded = false;
+
        // Batch size. If a script supports this, they should set
        // a default with setBatchSize()
        protected $mBatchSize = null;
-       
+
        /**
         * List of all the core maintenance scripts. This is added
         * to scripts added by extensions in $wgMaintenanceScripts
@@ -91,6 +102,7 @@ abstract class Maintenance {
         */
        public function __construct() {
                $this->addDefaultParams();
+               register_shutdown_function( array( $this, 'outputChanneled' ), false );
        }
 
        /**
@@ -102,32 +114,32 @@ abstract class Maintenance {
         * Add a parameter to the script. Will be displayed on --help
         * with the associated description
         *
-        * @param $name String The name of the param (help, version, etc)
-        * @param $description String The description of the param to show on --help
-        * @param $required boolean Is the param required?
-        * @param $withArg Boolean Is an argument required with this option?
+        * @param $name String: the name of the param (help, version, etc)
+        * @param $description String: the description of the param to show on --help
+        * @param $required Boolean: is the param required?
+        * @param $withArg Boolean: is an argument required with this option?
         */
        protected function addOption( $name, $description, $required = false, $withArg = false ) {
-               $this->mParams[ $name ] = array( 'desc' => $description, 'require' => $required, 'withArg' => $withArg );
+               $this->mParams[$name] = array( 'desc' => $description, 'require' => $required, 'withArg' => $withArg );
        }
-       
+
        /**
         * Checks to see if a particular param exists.
-        * @param $name String The name of the param
-        * @return boolean
+        * @param $name String: the name of the param
+        * @return Boolean
         */
        protected function hasOption( $name ) {
-               return isset( $this->mOptions[ $name ] );
+               return isset( $this->mOptions[$name] );
        }
-       
+
        /**
         * Get an option, or return the default
-        * @param $name String The name of the param
-        * @param $default mixed Anything you want, default null
-        * @return mixed
+        * @param $name String: the name of the param
+        * @param $default Mixed: anything you want, default null
+        * @return Mixed
         */
        protected function getOption( $name, $default = null ) {
-               if( $this->hasOption($name) ) {
+               if ( $this->hasOption( $name ) ) {
                        return $this->mOptions[$name];
                } else {
                        // Set it so we don't have to provide the default again
@@ -135,36 +147,59 @@ abstract class Maintenance {
                        return $this->mOptions[$name];
                }
        }
-       
+
+       /**
+        * Add some args that are needed
+        * @param $arg String: name of the arg, like 'start'
+        * @param $description String: short description of the arg
+        * @param $required Boolean: is this required?
+        */
+       protected function addArg( $arg, $description, $required = true ) {
+               $this->mArgList[] = array(
+                       'name' => $arg,
+                       'desc' => $description,
+                       'require' => $required
+               );
+       }
+
+       /**
+        * Remove an option.  Useful for removing options that won't be used in your script.
+        * @param $name String: the option to remove.
+        */
+       protected function deleteOption( $name ) {
+               unset( $this->mParams[$name] );
+       }
+
        /**
-        * Add some args that are needed. Used in formatting help
+        * Set the description text.
+        * @param $text String: the text of the description
         */
-       protected function addArgs( $args ) {
-               $this->mArgList = array_merge( $this->mArgList, $args );
+       protected function addDescription( $text ) {
+               $this->mDescription = $text;
        }
-       
+
        /**
         * Does a given argument exist?
-        * @param $argId int The integer value (from zero) for the arg
-        * @return boolean
+        * @param $argId Integer: the integer value (from zero) for the arg
+        * @return Boolean
         */
        protected function hasArg( $argId = 0 ) {
-               return isset( $this->mArgs[ $argId ] ) ;
+               return isset( $this->mArgs[$argId] );
        }
 
        /**
         * Get an argument.
-        * @param $argId int The integer value (from zero) for the arg
-        * @param $default mixed The default if it doesn't exist
+        * @param $argId Integer: the integer value (from zero) for the arg
+        * @param $default Mixed: the default if it doesn't exist
         * @return mixed
         */
        protected function getArg( $argId = 0, $default = null ) {
-               return $this->hasArg($argId) ? $this->mArgs[$argId] : $default;
+               return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
        }
 
        /**
         * Set the batch size.
-        * @param $s int The number of operations to do in a batch
+        * @param $s Integer: the number of operations to do in a batch
         */
        protected function setBatchSize( $s = 0 ) {
                $this->mBatchSize = $s;
@@ -180,134 +215,210 @@ abstract class Maintenance {
 
        /**
         * Return input from stdin.
-        * @param $length int The number of bytes to read. If null,
+        * @param $len Integer: the number of bytes to read. If null,
         *        just return the handle. Maintenance::STDIN_ALL returns
         *        the full length
-        * @return mixed
+        * @return Mixed
         */
        protected function getStdin( $len = null ) {
-               if ( $len == Maintenance::STDIN_ALL )
+               if ( $len == Maintenance::STDIN_ALL ) {
                        return file_get_contents( 'php://stdin' );
+               }
                $f = fopen( 'php://stdin', 'rt' );
-               if( !$len )
+               if ( !$len ) {
                        return $f;
+               }
                $input = fgets( $f, $len );
-               fclose ( $f );
+               fclose( $f );
                return rtrim( $input );
        }
 
        /**
         * Throw some output to the user. Scripts can call this with no fears,
         * as we handle all --quiet stuff here
-        * @param $out String The text to show to the user
+        * @param $out String: the text to show to the user
+        * @param $channel Mixed: unique identifier for the channel. See
+        *     function outputChanneled.
         */
-       protected function output( $out ) {
-               if( $this->mQuiet ) {
+       protected function output( $out, $channel = null ) {
+               if ( $this->mQuiet ) {
                        return;
                }
-               $f = fopen( 'php://stdout', 'w' );
-               fwrite( $f, $out );
-               fclose( $f );
+               if ( $channel === null ) {
+                       $this->cleanupChanneled();
+
+                       $f = fopen( 'php://stdout', 'w' );
+                       fwrite( $f, $out );
+                       fclose( $f );
+               }
+               else {
+                       $out = preg_replace( '/\n\z/', '', $out );
+                       $this->outputChanneled( $out, $channel );
+               }
        }
 
        /**
         * Throw an error to the user. Doesn't respect --quiet, so don't use
         * this for non-error output
-        * @param $err String The error to display
-        * @param $die boolean If true, go ahead and die out.
+        * @param $err String: the error to display
+        * @param $die Boolean: If true, go ahead and die out.
         */
        protected function error( $err, $die = false ) {
-               $f = fopen( 'php://stderr', 'w' ); 
-               fwrite( $f, $err );
-               fclose( $f );
-               if( $die ) die();
+               $this->outputChanneled( false );
+               if ( php_sapi_name() == 'cli' ) {
+                       fwrite( STDERR, $err . "\n" );
+               } else {
+                       $f = fopen( 'php://stderr', 'w' );
+                       fwrite( $f, $err . "\n" );
+                       fclose( $f );
+               }
+               if ( $die ) {
+                       die();
+               }
        }
 
+       private $atLineStart = true;
+       private $lastChannel = null;
+
        /**
-        * Does the script need normal DB access? By default, we give Maintenance
-        * scripts admin rights to the DB (when available). Sometimes, a script needs
-        * normal access for a reason and sometimes they want no access. Subclasses 
-        * should override and return one of the following values, as needed:
+        * Clean up channeled output.  Output a newline if necessary.
+        */
+       public function cleanupChanneled() {
+               if ( !$this->atLineStart ) {
+                       $handle = fopen( 'php://stdout', 'w' );
+                       fwrite( $handle, "\n" );
+                       fclose( $handle );
+                       $this->atLineStart = true;
+               }
+       }
+
+       /**
+        * Message outputter with channeled message support. Messages on the
+        * same channel are concatenated, but any intervening messages in another
+        * channel start a new line.
+        * @param $msg String: the message without trailing newline
+        * @param $channel Channel identifier or null for no
+        *     channel. Channel comparison uses ===.
+        */
+       public function outputChanneled( $msg, $channel = null ) {
+               if ( $msg === false ) {
+                       $this->cleanupChanneled();
+                       return;
+               }
+
+               $handle = fopen( 'php://stdout', 'w' );
+
+               // End the current line if necessary
+               if ( !$this->atLineStart && $channel !== $this->lastChannel ) {
+                       fwrite( $handle, "\n" );
+               }
+
+               fwrite( $handle, $msg );
+
+               $this->atLineStart = false;
+               if ( $channel === null ) {
+                       // For unchanneled messages, output trailing newline immediately
+                       fwrite( $handle, "\n" );
+                       $this->atLineStart = true;
+               }
+               $this->lastChannel = $channel;
+
+               // Cleanup handle
+               fclose( $handle );
+       }
+
+       /**
+        * Does the script need different DB access? By default, we give Maintenance
+        * scripts normal rights to the DB. Sometimes, a script needs admin rights
+        * access for a reason and sometimes they want no access. Subclasses should
+        * override and return one of the following values, as needed:
         *    Maintenance::DB_NONE  -  For no DB access at all
-        *    Maintenance::DB_STD   -  For normal DB access
-        *    Maintenance::DB_ADMIN -  For admin DB access, default
-        * @return int
+        *    Maintenance::DB_STD   -  For normal DB access, default
+        *    Maintenance::DB_ADMIN -  For admin DB access
+        * @return Integer
         */
-       protected function getDbType() {
-               return Maintenance :: DB_ADMIN;
+       public function getDbType() {
+               return Maintenance::DB_STD;
        }
 
        /**
         * Add the default parameters to the scripts
         */
-       private function addDefaultParams() {
-               $this->addOption( 'help', "Display this help message" );
-               $this->addOption( 'quiet', "Whether to supress non-error output" );
-               $this->addOption( 'conf', "Location of LocalSettings.php, if not default", false, true );
-               $this->addOption( 'wiki', "For specifying the wiki ID", false, true );
-               $this->addOption( 'globals', "Output globals at the end of processing for debugging" );
+       protected function addDefaultParams() {
+               $this->addOption( 'help', 'Display this help message' );
+               $this->addOption( 'quiet', 'Whether to supress non-error output' );
+               $this->addOption( 'conf', 'Location of LocalSettings.php, if not default', false, true );
+               $this->addOption( 'wiki', 'For specifying the wiki ID', false, true );
+               $this->addOption( 'globals', 'Output globals at the end of processing for debugging' );
                // If we support a DB, show the options
-               if( $this->getDbType() > 0 ) {
-                       $this->addOption( 'dbuser', "The DB user to use for this script", false, true );
-                       $this->addOption( 'dbpass', "The password to use for this script", false, true );
+               if ( $this->getDbType() > 0 ) {
+                       $this->addOption( 'dbuser', 'The DB user to use for this script', false, true );
+                       $this->addOption( 'dbpass', 'The password to use for this script', false, true );
                }
                // If we support $mBatchSize, show the option
-               if( $this->mBatchSize ) {
+               if ( $this->mBatchSize ) {
                        $this->addOption( 'batch-size', 'Run this many operations ' .
-                               'per batch, default: ' . $this->mBatchSize , false, true );
+                               'per batch, default: ' . $this->mBatchSize, false, true );
                }
        }
 
        /**
-        * Spawn a child maintenance script. Pass all of the current arguments
+        * Run a child maintenance script. Pass all of the current arguments
         * to it.
-        * @param $maintClass String A name of a child maintenance class
-        * @param $classFile String Full path of where the child is
+        * @param $maintClass String: a name of a child maintenance class
+        * @param $classFile String: full path of where the child is
         * @return Maintenance child
         */
-       protected function spawnChild( $maintClass, $classFile = null ) {
+       protected function runChild( $maintClass, $classFile = null ) {
                // If we haven't already specified, kill setup procedures
                // for child scripts, we've already got a sane environment
-               if( !defined( 'MW_NO_SETUP' ) ) {
-                       define( 'MW_NO_SETUP', true );
-               }
-               
+               self::disableSetup();
+
                // Make sure the class is loaded first
-               if( !class_exists( $maintClass ) ) {
-                       if( $classFile ) {
+               if ( !class_exists( $maintClass ) ) {
+                       if ( $classFile ) {
                                require_once( $classFile );
                        }
-                       if( !class_exists( $maintClass ) ) {
-                               $this->error( "Cannot spawn child: $maintClass\n" );
+                       if ( !class_exists( $maintClass ) ) {
+                               $this->error( "Cannot spawn child: $maintClass" );
                        }
                }
-               
+
                $child = new $maintClass();
                $child->loadParamsAndArgs( $this->mSelf, $this->mOptions, $this->mArgs );
                return $child;
        }
 
+       /**
+        * Disable Setup.php mostly
+        */
+       protected static function disableSetup() {
+               if ( !defined( 'MW_NO_SETUP' ) ) {
+                       define( 'MW_NO_SETUP', true );
+               }
+       }
+
        /**
         * Do some sanity checking and basic setup
         */
        public function setup() {
-               global $IP, $wgCommandLineMode, $wgUseNormalUser, $wgRequestTime;
+               global $IP, $wgCommandLineMode, $wgRequestTime;
 
                # Abort if called from a web server
-               if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
-                       $this->error( "This script must be run from the command line\n", true );
+               if ( isset( $_SERVER ) && isset( $_SERVER['REQUEST_METHOD'] ) ) {
+                       $this->error( 'This script must be run from the command line', true );
                }
 
                # Make sure we can handle script parameters
-               if( !ini_get( 'register_argc_argv' ) ) {
-                       $this->error( "Cannot get command line arguments, register_argc_argv is set to false\n", true );
+               if ( !ini_get( 'register_argc_argv' ) ) {
+                       $this->error( 'Cannot get command line arguments, register_argc_argv is set to false', true );
                }
 
-               if( version_compare( phpversion(), '5.2.4' ) >= 0 ) {
+               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' ) ) {
+                       if ( ini_get( 'display_errors' ) ) {
                                ini_set( 'display_errors', 'stderr' );
                        }
 
@@ -319,31 +430,42 @@ abstract class Maintenance {
                }
 
                # Set the memory limit
-               ini_set( 'memory_limit', -1 );
+               # Note we need to set it again later in cache LocalSettings changed it
+               ini_set( 'memory_limit', $this->memoryLimit() );
 
-               $wgRequestTime = microtime(true);
+               # Set max execution time to 0 (no limit). PHP.net says that
+               # "When running PHP from the command line the default setting is 0."
+               # But sometimes this doesn't seem to be the case.
+               ini_set( 'max_execution_time', 0 );
 
-               # Define us as being in Mediawiki
+               $wgRequestTime = microtime( true );
+
+               # Define us as being in MediaWiki
                define( 'MEDIAWIKI', true );
 
                # Setup $IP, using MW_INSTALL_PATH if it exists
-               $IP = strval( getenv('MW_INSTALL_PATH') ) !== ''
-                       ? getenv('MW_INSTALL_PATH')
+               $IP = strval( getenv( 'MW_INSTALL_PATH' ) ) !== ''
+                       ? getenv( 'MW_INSTALL_PATH' )
                        : realpath( dirname( __FILE__ ) . '/..' );
-               
+
                $wgCommandLineMode = true;
                # Turn off output buffering if it's on
                @ob_end_flush();
 
-               if (!isset( $wgUseNormalUser ) ) {
-                       $wgUseNormalUser = false;
-               }
-
                $this->loadParamsAndArgs();
                $this->maybeHelp();
                $this->validateParamsAndArgs();
        }
 
+       /**
+        * Normally we disable the memory_limit when running admin scripts.
+        * Some scripts may wish to actually set a limit, however, to avoid
+        * blowing up unexpectedly.
+        */
+       public function memoryLimit() {
+               return -1;
+       }
+
        /**
         * Clear all params and arguments.
         */
@@ -364,15 +486,15 @@ abstract class Maintenance {
         */
        public function loadParamsAndArgs( $self = null, $opts = null, $args = null ) {
                # If we were given opts or args, set those and return early
-               if( $self ) {
+               if ( $self ) {
                        $this->mSelf = $self;
                        $this->mInputLoaded = true;
                }
-               if( $opts ) {
+               if ( $opts ) {
                        $this->mOptions = $opts;
                        $this->mInputLoaded = true;
                }
-               if( $args ) {
+               if ( $args ) {
                        $this->mArgs = $args;
                        $this->mInputLoaded = true;
                }
@@ -380,7 +502,7 @@ abstract class Maintenance {
                # If we've already loaded input (either by user values or from $argv)
                # skip on loading it again. The array_shift() will corrupt values if
                # it's run again and again
-               if( $this->mInputLoaded ) {
+               if ( $this->mInputLoaded ) {
                        $this->loadSpecialVars();
                        return;
                }
@@ -392,11 +514,11 @@ abstract class Maintenance {
                $args = array();
 
                # Parse arguments
-               for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
+               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 ) {
+                               while ( $arg !== false ) {
                                        $args[] = $arg;
                                        $arg = next( $argv );
                                }
@@ -407,12 +529,13 @@ abstract class Maintenance {
                                if ( isset( $this->mParams[$option] ) && $this->mParams[$option]['withArg'] ) {
                                        $param = next( $argv );
                                        if ( $param === false ) {
-                                               $this->error( "$arg needs a value after it\n", true );
+                                               $this->error( "\nERROR: $option needs a value after it\n" );
+                                               $this->maybeHelp( true );
                                        }
                                        $options[$option] = $param;
                                } else {
                                        $bits = explode( '=', $option, 2 );
-                                       if( count( $bits ) > 1 ) {
+                                       if ( count( $bits ) > 1 ) {
                                                $option = $bits[0];
                                                $param = $bits[1];
                                        } else {
@@ -422,12 +545,13 @@ abstract class Maintenance {
                                }
                        } elseif ( substr( $arg, 0, 1 ) == '-' ) {
                                # Short options
-                               for ( $p=1; $p<strlen( $arg ); $p++ ) {
-                                       $option = $arg{$p};
-                                       if ( $this->mParams[$option]['withArg'] ) {
+                               for ( $p = 1; $p < strlen( $arg ); $p++ ) {
+                                       $option = $arg { $p } ;
+                                       if ( isset( $this->mParams[$option]['withArg'] ) && $this->mParams[$option]['withArg'] ) {
                                                $param = next( $argv );
                                                if ( $param === false ) {
-                                                       $this->error( "$arg needs a value after it\n", true );
+                                                       $this->error( "\nERROR: $option needs a value after it\n" );
+                                                       $this->maybeHelp( true );
                                                }
                                                $options[$option] = $param;
                                        } else {
@@ -448,113 +572,155 @@ abstract class Maintenance {
        /**
         * Run some validation checks on the params, etc
         */
-       private function validateParamsAndArgs() {
-               # Check to make sure we've got all the required ones
-               foreach( $this->mParams as $opt => $info ) {
-                       if( $info['require'] && !$this->hasOption($opt) ) {
-                               $this->error( "Param $opt required.\n", true );
+       protected function validateParamsAndArgs() {
+               $die = false;
+               # Check to make sure we've got all the required options
+               foreach ( $this->mParams as $opt => $info ) {
+                       if ( $info['require'] && !$this->hasOption( $opt ) ) {
+                               $this->error( "Param $opt required!" );
+                               $die = true;
+                       }
+               }
+               # Check arg list too
+               foreach ( $this->mArgList as $k => $info ) {
+                       if ( $info['require'] && !$this->hasArg( $k ) ) {
+                               $this->error( 'Argument <' . $info['name'] . '> required!' );
+                               $die = true;
                        }
                }
 
-               # Also make sure we've got enough arguments
-               if ( count( $this->mArgs ) < count( $this->mArgList ) ) {
-                       $this->error( "Not enough arguments passed\n", true );
+               if ( $die ) {
+                       $this->maybeHelp( true );
                }
        }
-       
+
        /**
         * Handle the special variables that are global to all scripts
         */
-       private function loadSpecialVars() {
-               if( $this->hasOption( 'dbuser' ) )
+       protected function loadSpecialVars() {
+               if ( $this->hasOption( 'dbuser' ) ) {
                        $this->mDbUser = $this->getOption( 'dbuser' );
-               if( $this->hasOption( 'dbpass' ) )
+               }
+               if ( $this->hasOption( 'dbpass' ) ) {
                        $this->mDbPass = $this->getOption( 'dbpass' );
-               if( $this->hasOption( 'quiet' ) )
+               }
+               if ( $this->hasOption( 'quiet' ) ) {
                        $this->mQuiet = true;
-               if( $this->hasOption( 'batch-size' ) )
+               }
+               if ( $this->hasOption( 'batch-size' ) ) {
                        $this->mBatchSize = $this->getOption( 'batch-size' );
+               }
        }
 
        /**
         * Maybe show the help.
         * @param $force boolean Whether to force the help to show, default false
         */
-       private function maybeHelp( $force = false ) {
-               if( $this->hasOption('help') || in_array( 'help', $this->mArgs ) || $force ) {
+       protected function maybeHelp( $force = false ) {
+               $screenWidth = 80; // TODO: Caculate this!
+               $tab = "    ";
+               $descWidth = $screenWidth - ( 2 * strlen( $tab ) );
+
+               ksort( $this->mParams );
+               if ( $this->hasOption( 'help' ) || $force ) {
                        $this->mQuiet = false;
-                       if( $this->mDescription ) {
+
+                       if ( $this->mDescription ) {
                                $this->output( "\n" . $this->mDescription . "\n" );
                        }
-                       $this->output( "\nUsage: php " . $this->mSelf );
-                       if( $this->mParams ) {
-                               $this->output( " [--" . implode( array_keys( $this->mParams ), "|--" ) . "]" );
+                       $output = "\nUsage: php " . basename( $this->mSelf );
+                       if ( $this->mParams ) {
+                               $output .= " [--" . implode( array_keys( $this->mParams ), "|--" ) . "]";
                        }
-                       if( $this->mArgList ) {
-                               $this->output( " <" . implode( $this->mArgList, "> <" ) . ">" );
+                       if ( $this->mArgList ) {
+                               $output .= " <";
+                               foreach ( $this->mArgList as $k => $arg ) {
+                                       $output .= $arg['name'] . ">";
+                                       if ( $k < count( $this->mArgList ) - 1 )
+                                               $output .= " <";
+                               }
                        }
-                       $this->output( "\n" );
-                       foreach( $this->mParams as $par => $info ) {
-                               $this->output( "\t$par : " . $info['desc'] . "\n" );
+                       $this->output( "$output\n" );
+                       foreach ( $this->mParams as $par => $info ) {
+                               $this->output(
+                                       wordwrap( "$tab$par : " . $info['desc'], $descWidth,
+                                                       "\n$tab$tab" ) . "\n"
+                               );
+                       }
+                       foreach ( $this->mArgList as $info ) {
+                               $this->output(
+                                       wordwrap( "$tab<" . $info['name'] . "> : " .
+                                               $info['desc'], $descWidth, "\n$tab$tab" ) . "\n"
+                               );
                        }
                        die( 1 );
                }
        }
-       
+
        /**
         * Handle some last-minute setup here.
         */
-       private function finalSetup() {
-               global $wgCommandLineMode, $wgUseNormalUser, $wgShowSQLErrors;
-               global $wgTitle, $wgProfiling, $IP, $wgDBadminuser, $wgDBadminpassword;
+       public function finalSetup() {
+               global $wgCommandLineMode, $wgShowSQLErrors;
+               global $wgProfiling, $wgDBadminuser, $wgDBadminpassword;
                global $wgDBuser, $wgDBpassword, $wgDBservers, $wgLBFactoryConf;
-               
+
                # Turn off output buffering again, it might have been turned on in the settings files
-               if( ob_get_level() ) {
+               if ( ob_get_level() ) {
                        ob_end_flush();
                }
                # Same with these
                $wgCommandLineMode = true;
 
                # If these were passed, use them
-               if( $this->mDbUser )
+               if ( $this->mDbUser ) {
                        $wgDBadminuser = $this->mDbUser;
-               if( $this->mDbPass )
-                       $wgDBadminpass = $this->mDbPass;
+               }
+               if ( $this->mDbPass ) {
+                       $wgDBadminpassword = $this->mDbPass;
+               }
 
-               if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+               if ( $this->getDbType() == self::DB_ADMIN && isset( $wgDBadminuser ) ) {
                        $wgDBuser = $wgDBadminuser;
                        $wgDBpassword = $wgDBadminpassword;
-       
-                       if( $wgDBservers ) {
+
+                       if ( $wgDBservers ) {
                                foreach ( $wgDBservers as $i => $server ) {
                                        $wgDBservers[$i]['user'] = $wgDBuser;
                                        $wgDBservers[$i]['password'] = $wgDBpassword;
                                }
                        }
-                       if( isset( $wgLBFactoryConf['serverTemplate'] ) ) {
+                       if ( isset( $wgLBFactoryConf['serverTemplate'] ) ) {
                                $wgLBFactoryConf['serverTemplate']['user'] = $wgDBuser;
                                $wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
                        }
+                       LBFactory::destroyInstance();
                }
-       
-               if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
-                       $fn = MW_CMDLINE_CALLBACK;
-                       $fn();
-               }
-       
+
+               $this->afterFinalSetup();
+
                $wgShowSQLErrors = true;
                @set_time_limit( 0 );
-       
+               ini_set( 'memory_limit', $this->memoryLimit() );
+
                $wgProfiling = false; // only for Profiler.php mode; avoids OOM errors
        }
 
+       /**
+        * Execute a callback function at the end of initialisation
+        */
+       protected function afterFinalSetup() {
+               if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
+                       call_user_func( MW_CMDLINE_CALLBACK );
+               }
+       }
+
        /**
         * Potentially debug globals. Originally a feature only
         * for refreshLinks
         */
        public function globals() {
-               if( $this->hasOption( 'globals' ) ) {
+               if ( $this->hasOption( 'globals' ) ) {
                        print_r( $GLOBALS );
                }
        }
@@ -563,7 +729,7 @@ abstract class Maintenance {
         * Do setup specific to WMF
         */
        public function loadWikimediaSettings() {
-               global $IP, $wgNoDBParam, $wgUseNormalUser, $wgConf;
+               global $IP, $wgNoDBParam, $wgUseNormalUser, $wgConf, $site, $lang;
 
                if ( empty( $wgNoDBParam ) ) {
                        # Check if we were passed a db name
@@ -573,7 +739,7 @@ abstract class Maintenance {
                                $db = array_shift( $this->mArgs );
                        }
                        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 ) {
@@ -591,19 +757,18 @@ abstract class Maintenance {
                        $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 ) {
+               # if ( posix_geteuid() == 48 ) {
                        $wgUseNormalUser = true;
                }
-       
+
                putenv( 'wikilang=' . $lang );
-       
-               $DP = $IP;
+
                ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
-       
+
                if ( $lang == 'test' && $site == 'wikipedia' ) {
                        define( 'TESTWIKI', 1 );
                }
@@ -614,7 +779,7 @@ abstract class Maintenance {
         * @return String
         */
        public function loadSettings() {
-               global $wgWikiFarm, $wgCommandLineMode, $IP, $DP;
+               global $wgWikiFarm, $wgCommandLineMode, $IP;
 
                $wgWikiFarm = false;
                if ( isset( $this->mOptions['conf'] ) ) {
@@ -630,23 +795,21 @@ abstract class Maintenance {
                        define( 'MW_DB', $bits[0] );
                        define( 'MW_PREFIX', $bits[1] );
                }
-       
-               if ( ! is_readable( $settingsFile ) ) {
+
+               if ( !is_readable( $settingsFile ) ) {
                        $this->error( "A copy of your installation's LocalSettings.php\n" .
-                                               "must exist and be readable in the source directory.\n", true );
+                                               "must exist and be readable in the source directory.", true );
                }
                $wgCommandLineMode = true;
-               $DP = $IP;
-               $this->finalSetup();
                return $settingsFile;
        }
-       
+
        /**
         * Support function for cleaning up redundant text records
-        * @param $delete boolean Whether or not to actually delete the records
+        * @param $delete Boolean: whether or not to actually delete the records
         * @author Rob Church <robchur@gmail.com>
         */
-       protected function purgeRedundantText( $delete = true ) {
+       public function purgeRedundantText( $delete = true ) {
                # Data should come off the master, wrapped in a transaction
                $dbw = wfGetDB( DB_MASTER );
                $dbw->begin();
@@ -656,27 +819,27 @@ abstract class Maintenance {
                $tbl_txt = $dbw->tableName( 'text' );
 
                # Get "active" text records from the revisions table
-               $this->output( "Searching for active text records in revisions table..." );
+               $this->output( 'Searching for active text records in revisions table...' );
                $res = $dbw->query( "SELECT DISTINCT rev_text_id FROM $tbl_rev" );
-               while( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $cur[] = $row->rev_text_id;
                }
                $this->output( "done.\n" );
 
                # Get "active" text records from the archive table
-               $this->output( "Searching for active text records in archive table..." );
+               $this->output( 'Searching for active text records in archive table...' );
                $res = $dbw->query( "SELECT DISTINCT ar_text_id FROM $tbl_arc" );
-               while( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $cur[] = $row->ar_text_id;
                }
                $this->output( "done.\n" );
 
                # Get the IDs of all text records not in these sets
-               $this->output( "Searching for inactive text records..." );
+               $this->output( 'Searching for inactive text records...' );
                $set = implode( ', ', $cur );
                $res = $dbw->query( "SELECT old_id FROM $tbl_txt WHERE old_id NOT IN ( $set )" );
                $old = array();
-               while( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $old[] = $row->old_id;
                }
                $this->output( "done.\n" );
@@ -686,8 +849,8 @@ abstract class Maintenance {
                $this->output( "$count inactive items found.\n" );
 
                # Delete as appropriate
-               if( $delete && $count ) {
-                       $this->output( "Deleting..." );
+               if ( $delete && $count ) {
+                       $this->output( 'Deleting...' );
                        $set = implode( ', ', $old );
                        $dbw->query( "DELETE FROM $tbl_txt WHERE old_id IN ( $set )" );
                        $this->output( "done.\n" );
@@ -696,7 +859,7 @@ abstract class Maintenance {
                # Done
                $dbw->commit();
        }
-       
+
        /**
         * Get the maintenance directory.
         */
@@ -708,102 +871,136 @@ abstract class Maintenance {
         * Get the list of available maintenance scripts. Note
         * that if you call this _before_ calling doMaintenance
         * you won't have any extensions in it yet
-        * @return array
+        * @return Array
         */
        public static function getMaintenanceScripts() {
                global $wgMaintenanceScripts;
                return $wgMaintenanceScripts + self::getCoreScripts();
        }
-       
+
        /**
         * Return all of the core maintenance scripts
-        * @todo Don't make this list, maybe just scan all the files in /maintenance?
         * @return array
         */
-       private static function getCoreScripts() {
-               if( !self::$mCoreScripts ) {
-                       $d = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
-                       self::$mCoreScripts = array(
-                               # Main script list
-                               'AddWiki'                  => $d . 'addwiki.php',
-                               'AttachLatest'             => $d . 'attachLatest.php',
-                               'BenchmarkPurge'           => $d . 'benchmarkPurge.php',
-                               'ChangePassword'           => $d . 'changePassword.php',
-                               'CheckAutoLoader'          => $d . 'checkAutoLoader.php',
-                               'CheckBadRedirects'        => $d . 'checkBadRedirects.php',
-                               'CheckImages'              => $d . 'checkImages.php',
-                               'CheckSyntax'              => $d . 'checkSyntax.php',
-                               'CheckUsernames'           => $d . 'checkUsernames.php',
-                               'CleanupSpam'              => $d . 'cleanupSpam.php',
-                               'ClearInterwikiCache'      => $d . 'clear_interwiki_cache.php',
-                               'clear_stats'              => $d . 'clear_stats.php',
-                               'ConvertLinks'             => $d . 'convertLinks.php',
-                               'ConvertUserOptions'       => $d . 'convertUserOptions.php',
-                               'CreateAndPromote'         => $d . 'createAndPromote.php',
-                               'DeleteArchivedFiles'      => $d . 'deleteArchivedFiles.php',
-                               'DeleteArchivedRevisions'  => $d . 'deleteArchivedRevisions.php',
-                               'DeleteBatch'              => $d . 'deleteBatch.php',
-                               'DeleteDefaultMessages'    => $d . 'deleteDefaultMessages.php',
-                               'DeleteImageCache'         => $d . 'deleteImageMemcached.php',
-                               'DeleteOldRevisions'       => $d . 'deleteOldRevisions.php',
-                               'DeleteOrphanedRevisions'  => $d . 'deleteOrphanedRevisions.php',
-                               'DeleteRevision'           => $d . 'deleteRevision.php',
-                               'DumpLinks'                => $d . 'dumpLinks.php',
-                               'DumpSisterSites'          => $d . 'dumpSisterSites.php',
-                               'UploadDumper'             => $d . 'dumpUploads.php',
-                               'EditCLI'                  => $d . 'edit.php',
-                               'EvalPrompt'               => $d . 'eval.php',
-                               'FetchText'                => $d . 'fetchText.php',
-                               'FindHooks'                => $d . 'findhooks.php',
-                               'FixSlaveDesync'           => $d . 'fixSlaveDesync.php',
-                               'FixTimestamps'            => $d . 'fixTimestamps.php',
-                               'FixUserRegistration'      => $d . 'fixUserRegistration.php',
-                               'GenerateSitemap'          => $d . 'generateSitemap.php',
-                               'GetLagTimes'              => $d . 'getLagTimes.php',
-                               'GetSlaveServer'           => $d . 'getSlaveServer.php',
-                               'InitEditCount'            => $d . 'initEditCount.php',
-                               'InitStats'                => $d . 'initStats.php',
-                               'mcTest'                   => $d . 'mctest.php',
-                               'MoveBatch'                => $d . 'moveBatch.php',
-                               'nextJobDb'                => $d . 'nextJobDB.php',
-                               'NukeNS'                   => $d . 'nukeNS.php',
-                               'NukePage'                 => $d . 'nukePage.php',
-                               'Orphans'                  => $d . 'orphans.php',
-                               'PopulateCategory'         => $d . 'populateCategory.php',
-                               'PopulateLogSearch'        => $d . 'populateLogSearch.php',
-                               'PopulateParentId'         => $d . 'populateParentId.php',
-                               'Protect'                  => $d . 'protect.php',
-                               'PurgeList'                => $d . 'purgeList.php',
-                               'PurgeOldText'             => $d . 'purgeOldText.php',
-                               'ReassignEdits'            => $d . 'reassignEdits.php',
-                               'RebuildAll'               => $d . 'rebuildall.php',
-                               'RebuildFileCache'         => $d . 'rebuildFileCache.php',
-                               'RebuildLocalisationCache' => $d . 'rebuildLocalisationCache.php',
-                               'RebuildMessages'          => $d . 'rebuildmessages.php',
-                               'RebuildRecentchanges'     => $d . 'rebuildrecentchanges.php',
-                               'RebuildTextIndex'         => $d . 'rebuildtextindex.php',
-                               'RefreshImageCount'        => $d . 'refreshImageCount.php',
-                               'RefreshLinks'             => $d . 'refreshLinks.php',
-                               'RemoveUnusedAccounts'     => $d . 'removeUnusedAccounts.php',
-                               'RenameDbPrefix'           => $d . 'renameDbPrefix.php',
-                               'RenameWiki'               => $d . 'renamewiki.php',
-                               'DumpRenderer'             => $d . 'renderDump.php',
-                               'RunJobs'                  => $d . 'runJobs.php',
-                               'ShowJobs'                 => $d . 'showJobs.php',
-                               'ShowStats'                => $d . 'showStats.php',
-                               'MwSql'                    => $d . 'sql.php',
-                               'CacheStats'               => $d . 'stats.php',
-                               'Undelete'                 => $d . 'undelete.php',
-                               'UpdateArticleCount'       => $d . 'updateArticleCount.php',
-                               'UpdateRestrictions'       => $d . 'updateRestrictions.php',
-                               'UpdateSearchIndex'        => $d . 'updateSearchIndex.php',
-                               'UpdateSpecialPages'       => $d . 'updateSpecialPages.php',
-                               'WaitForSlave'             => $d . 'waitForSlave.php',
-
-                               # Language scripts
-                               'AllTrans' => $d . 'language/alltrans.php',
+       protected static function getCoreScripts() {
+               if ( !self::$mCoreScripts ) {
+                       self::disableSetup();
+                       $paths = array(
+                               dirname( __FILE__ ),
+                               dirname( __FILE__ ) . '/gearman',
+                               dirname( __FILE__ ) . '/language',
+                               dirname( __FILE__ ) . '/storage',
                        );
+                       self::$mCoreScripts = array();
+                       foreach ( $paths as $p ) {
+                               $handle = opendir( $p );
+                               while ( ( $file = readdir( $handle ) ) !== false ) {
+                                       if ( $file == 'Maintenance.php' ) {
+                                               continue;
+                                       }
+                                       $file = $p . '/' . $file;
+                                       if ( is_dir( $file ) || !strpos( $file, '.php' ) ||
+                                               ( strpos( file_get_contents( $file ), '$maintClass' ) === false ) ) {
+                                               continue;
+                                       }
+                                       require( $file );
+                                       $vars = get_defined_vars();
+                                       if ( array_key_exists( 'maintClass', $vars ) ) {
+                                               self::$mCoreScripts[$vars['maintClass']] = $file;
+                                       }
+                               }
+                               closedir( $handle );
+                       }
                }
                return self::$mCoreScripts;
        }
+
+       /**
+        * Lock the search index
+        * @param &$db Database object
+        */
+       private function lockSearchindex( &$db ) {
+               $write = array( 'searchindex' );
+               $read = array( 'page', 'revision', 'text', 'interwiki', 'l10n_cache' );
+               $db->lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
+       }
+
+       /**
+        * Unlock the tables
+        * @param &$db Database object
+        */
+       private function unlockSearchindex( &$db ) {
+               $db->unlockTables(  __CLASS__ . '::' . __METHOD__ );
+       }
+
+       /**
+        * Unlock and lock again
+        * Since the lock is low-priority, queued reads will be able to complete
+        * @param &$db Database object
+        */
+       private function relockSearchindex( &$db ) {
+               $this->unlockSearchindex( $db );
+               $this->lockSearchindex( $db );
+       }
+
+       /**
+        * Perform a search index update with locking
+        * @param $maxLockTime Integer: the maximum time to keep the search index locked.
+        * @param $callback callback String: the function that will update the function.
+        * @param $dbw Database object
+        * @param $results
+        */
+       public function updateSearchIndex( $maxLockTime, $callback, $dbw, $results ) {
+               $lockTime = time();
+
+               # Lock searchindex
+               if ( $maxLockTime ) {
+                       $this->output( "   --- Waiting for lock ---" );
+                       $this->lockSearchindex( $dbw );
+                       $lockTime = time();
+                       $this->output( "\n" );
+               }
+
+               # Loop through the results and do a search update
+               foreach ( $results as $row ) {
+                       # Allow reads to be processed
+                       if ( $maxLockTime && time() > $lockTime + $maxLockTime ) {
+                               $this->output( "    --- Relocking ---" );
+                               $this->relockSearchindex( $dbw );
+                               $lockTime = time();
+                               $this->output( "\n" );
+                       }
+                       call_user_func( $callback, $dbw, $row );
+               }
+
+               # Unlock searchindex
+               if ( $maxLockTime ) {
+                       $this->output( "    --- Unlocking --" );
+                       $this->unlockSearchindex( $dbw );
+                       $this->output( "\n" );
+               }
+
+       }
+
+       /**
+        * Update the searchindex table for a given pageid
+        * @param $dbw Database: a database write handle
+        * @param $pageId Integer: the page ID to update.
+        */
+       public function updateSearchIndexForPage( $dbw, $pageId ) {
+               // Get current revision
+               $rev = Revision::loadFromPageId( $dbw, $pageId );
+               $title = null;
+               if ( $rev ) {
+                       $titleObj = $rev->getTitle();
+                       $title = $titleObj->getPrefixedDBkey();
+                       $this->output( "$title..." );
+                       # Update searchindex
+                       $u = new SearchUpdate( $pageId, $titleObj->getText(), $rev->getText() );
+                       $u->doUpdate();
+                       $this->output( "\n" );
+               }
+               return $title;
+       }
+
 }