MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / maintenance / eval.php

diff --git a/maintenance/eval.php b/maintenance/eval.php
index 519411df8c032a10619bee1c20339b3668eebb7d..3cc1d16ab7522ac143e424543610f59cf4a44c55 100644 (file)
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -12,15 +12,11 @@
  * To get decent line editing behavior, you should compile PHP with support
  * for GNU readline (pass --with-readline to configure).
  *
- * @addtogroup Maintenance
+ * @file
+ * @ingroup Maintenance
  */
 
-$wgForceLoadBalancing = (getenv('MW_BALANCE') ? true : false);
-$wgUseNormalUser = (getenv('MW_WIKIUSER') ? true : false);
-if (getenv('MW_PROFILING')) {
-       define('MW_CMDLINE_CALLBACK', 'wfSetProfiling');
-}
-function wfSetProfiling() { $GLOBALS['wgProfiling'] = true; }
+$wgUseNormalUser = (bool)getenv( 'MW_WIKIUSER' );
 
 $optionsWithArgs = array( 'd' );
 
@@ -33,8 +29,9 @@ if ( isset( $options['d'] ) ) {
                $wgDebugLogFile = '/dev/stdout';
        }
        if ( $d > 1 ) {
-               foreach ( $wgLoadBalancer->mServers as $i => $server ) {
-                       $wgLoadBalancer->mServers[$i]['flags'] |= DBO_DEBUG;
+               $lb = wfGetLB();
+               foreach ( $lb->mServers as $i => $server ) {
+                       $lb->mServers[$i]['flags'] |= DBO_DEBUG;
                }
        }
        if ( $d > 2 ) {
@@ -42,19 +39,33 @@ if ( isset( $options['d'] ) ) {
        }
 }
 
+if ( function_exists( 'readline_add_history' )
+       && posix_isatty( 0 /*STDIN*/ ) )
+{
+       $useReadline = true;
+} else {
+       $useReadline = false;
+}
+
+if ( $useReadline ) {
+       $historyFile = isset( $_ENV['HOME'] ) ?
+               "{$_ENV['HOME']}/.mweval_history" : "$IP/maintenance/.mweval_history";
+       readline_read_history( $historyFile );
+}
 
-while ( ( $line = readconsole( '> ' ) ) !== false ) {
+while ( ( $line = Maintenance::readconsole() ) !== false ) {
+       if ( $useReadline ) {
+               readline_add_history( $line );
+               readline_write_history( $historyFile );
+       }
        $val = eval( $line . ";" );
-       if( is_null( $val ) ) {
+       if ( is_null( $val ) ) {
                echo "\n";
-       } elseif( is_string( $val ) || is_numeric( $val ) ) {
+       } elseif ( is_string( $val ) || is_numeric( $val ) ) {
                echo "$val\n";
        } else {
                var_dump( $val );
        }
-       if ( function_exists( "readline_add_history" ) ) {
-               readline_add_history( $line );
-       }
 }
 
 print "\n";