Revert eval.php changes from r54653, r54312, r54225 (maintenance-work branch merge), these changes totally broke eval.php due to the change in scope, from global to function.

This commit is contained in:
Tim Starling 2009-08-12 03:44:06 +00:00
parent 49f7eb465f
commit b475e93064

View file

@ -12,85 +12,61 @@
* To get decent line editing behavior, you should compile PHP with support
* for GNU readline (pass --with-readline to configure).
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup Maintenance
*/
require_once( dirname(__FILE__) . '/Maintenance.php' );
$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
class EvalPrompt extends Maintenance {
$optionsWithArgs = array( 'd' );
public function __construct() {
global $wgUseNormalUser;
parent::__construct();
$this->mDescription = "This script lets a command-line user start up the wiki engine and then poke\n" .
"about by issuing PHP commands directly.";
$this->addOption( 'd', "Enable MediaWiki debug output", false, true );
$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
/** */
require_once( "commandLine.inc" );
if ( isset( $options['d'] ) ) {
$d = $options['d'];
if ( $d > 0 ) {
$wgDebugLogFile = '/dev/stdout';
}
public function execute() {
global $wgDebugFunctionEntry, $wgDebugLogFile;
if ( $this->hasOption('d') ) {
$d = $this->getOption('d');
if ( $d > 0 ) {
$wgDebugLogFile = '/dev/stdout';
}
if ( $d > 1 ) {
$lb = wfGetLB();
foreach ( $lb->mServers as $i => $server ) {
$lb->mServers[$i]['flags'] |= DBO_DEBUG;
}
}
if ( $d > 2 ) {
$wgDebugFunctionEntry = true;
}
if ( $d > 1 ) {
$lb = wfGetLB();
foreach ( $lb->mServers as $i => $server ) {
$lb->mServers[$i]['flags'] |= DBO_DEBUG;
}
if ( function_exists( 'readline_add_history' )
&& function_exists( 'posix_isatty' ) && posix_isatty( 0 /*STDIN*/ ) )
{
$useReadline = true;
} else {
$useReadline = false;
}
if ( $useReadline ) {
$historyFile = "{$_ENV['HOME']}/.mweval_history";
readline_read_history( $historyFile );
}
while ( ( $line = readconsole( '> ' ) ) !== false ) {
if ( $useReadline ) {
readline_add_history( $line );
readline_write_history( $historyFile );
}
$val = eval( $line . ";" );
if( is_null( $val ) ) {
echo "\n";
} elseif( is_string( $val ) || is_numeric( $val ) ) {
echo "$val\n";
} else {
var_dump( $val );
}
}
print "\n";
}
if ( $d > 2 ) {
$wgDebugFunctionEntry = true;
}
}
$maintClass = "EvalPrompt";
require_once( DO_MAINTENANCE );
if ( function_exists( 'readline_add_history' )
&& function_exists( 'posix_isatty' ) && posix_isatty( 0 /*STDIN*/ ) )
{
$useReadline = true;
} else {
$useReadline = false;
}
if ( $useReadline ) {
$historyFile = "{$_ENV['HOME']}/.mweval_history";
readline_read_history( $historyFile );
}
while ( ( $line = readconsole( '> ' ) ) !== false ) {
if ( $useReadline ) {
readline_add_history( $line );
readline_write_history( $historyFile );
}
$val = eval( $line . ";" );
if( is_null( $val ) ) {
echo "\n";
} elseif( is_string( $val ) || is_numeric( $val ) ) {
echo "$val\n";
} else {
var_dump( $val );
}
}
print "\n";