* (bug 3984) Searching in logs by title%

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

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index f5b28d6..3bf7f1b 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,10 +1,11 @@
 <?php
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
  */
 
+$wgRequestTime = microtime(true);
+
 /** */
 # Abort if called from a web server
 if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
@@ -12,6 +13,15 @@ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
        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
@@ -26,18 +36,25 @@ if ( !isset( $optionsWithArgs ) ) {
 $optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php
 
 $self = array_shift( $argv );
-$self = __FILE__;
-$IP = realpath( dirname( $self ) . '/..' );
+$IP = 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 ) ) {
@@ -123,6 +140,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        # 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;
        }
 
@@ -131,7 +149,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $DP = $IP;
        ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
-       require_once( $IP.'/includes/ProfilerStub.php' );
+       #require_once( $IP.'/includes/ProfilerStub.php' );
        require_once( $IP.'/includes/Defines.php' );
        require_once( $IP.'/CommonSettings.php' );
 
@@ -153,12 +171,12 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 
        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/ProfilerStub.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" );
@@ -169,17 +187,21 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 }
 
 # 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;
 
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) && $wgDBservers ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
        $wgDBuser = $wgDBadminuser;
        $wgDBpassword = $wgDBadminpassword;
 
-       foreach ( $wgDBservers as $i => $server ) {
-               $wgDBservers[$i]['user'] = $wgDBuser;
-               $wgDBservers[$i]['password'] = $wgDBpassword;
+       if( $wgDBservers ) {
+               foreach ( $wgDBservers as $i => $server ) {
+                       $wgDBservers[$i]['user'] = $wgDBuser;
+                       $wgDBservers[$i]['password'] = $wgDBpassword;
+               }
        }
 }
 
@@ -190,9 +212,11 @@ if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
 
 ini_set( 'memory_limit', -1 );
 
+$wgShowSQLErrors = true;
+
 require_once( 'Setup.php' );
 require_once( 'install-utils.inc' );
-$wgTitle = Title::newFromText( 'Command line script' );
+$wgTitle = null; # Much much faster startup than creating a title object
 set_time_limit(0);
 
 // --------------------------------------------------------------------