From: Brion Vibber Date: Wed, 19 Aug 2009 23:40:48 +0000 (+0000) Subject: De-clutter base directory; moving install-utils.inc into maintenance. X-Git-Tag: 1.31.0-rc.0~40192 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=17ad472958e9953d62ee43fb698a1a368a3ae25b;p=lhc%2Fweb%2Fwiklou.git De-clutter base directory; moving install-utils.inc into maintenance. --- diff --git a/config/Installer.php b/config/Installer.php index 76e7ae7dbc..4967790f59 100644 --- a/config/Installer.php +++ b/config/Installer.php @@ -32,7 +32,7 @@ $wgRequestTime = microtime( true ); // Run version checks before including other files // so people don't see a scary parse error. -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); install_version_checks(); require_once( "$IP/includes/Defines.php" ); @@ -250,7 +250,6 @@ if( !is_writable( "." ) ) { } -require_once( "$IP/install-utils.inc" ); require_once( "$IP/maintenance/updaters.inc" ); class ConfigData { diff --git a/install-utils.inc b/install-utils.inc deleted file mode 100644 index 234b12c9ec..0000000000 --- a/install-utils.inc +++ /dev/null @@ -1,196 +0,0 @@ -index.php5 \n". - "to continue installation. ABORTING.\n"; - die( -1 ); - } - - // Test for PHP bug which breaks PHP 5.0.x on 64-bit... - // As of 1.8 this breaks lots of common operations instead - // of just some rare ones like export. - $borked = str_replace( 'a', 'b', array( -1 => -1 ) ); - if( !isset( $borked[-1] ) ) { - echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" . - "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n"; - die( -1 ); - } - - $test = new PhpXmlBugTester(); - if( !$test->ok ) { - echo "Your system has a combination of PHP and libxml2 versions which is buggy\n" . - "and can cause hidden data corruption in MediaWiki and other web apps.\n" . - "Upgrade to PHP 5.2.9 or later and libxml2 2.7.2 or later!\n" . - "ABORTING (http://bugs.php.net/bug.php?id=45996 for details).\n"; - die( -1 ); - } - - - global $wgCommandLineMode; - $wgCommandLineMode = true; - umask( 000 ); - @set_time_limit( 0 ); -} - -/** - * Test for PHP+libxml2 bug which breaks XML input subtly with certain versions. - * http://bugs.php.net/bug.php?id=45996 - * Known fixed with PHP 5.2.9 + libxml2-2.7.3 - */ -class PhpXmlBugTester { - private $parsedData = ''; - public $ok = false; - public function __construct() { - $charData = 'c'; - $xml = '' . htmlspecialchars( $charData ) . ''; - - $parser = xml_parser_create(); - xml_set_character_data_handler( $parser, array( $this, 'chardata' ) ); - $parsedOk = xml_parse($parser, $xml, true); - $this->ok = $parsedOk && ($this->parsedData == $charData); - } - public function chardata($parser, $data) { - $this->parsedData .= $data; - } -} - -function readconsole( $prompt = '' ) { - static $isatty = null; - if ( is_null( $isatty ) ) { - if ( !function_exists( 'posix_isatty' ) || posix_isatty( 0 /*STDIN*/ ) ) { - $isatty = true; - } else { - $isatty = false; - } - } - - if ( $isatty && function_exists( 'readline' ) ) { - return readline( $prompt ); - } else { - if ( $isatty ) { - $st = readlineEmulation( $prompt ); - } else { - if ( feof( STDIN ) ) { - $st = false; - } else { - $st = fgets(STDIN, 1024); - } - } - if ($st === false) return false; - $resp = trim( $st ); - return $resp; - } -} - -function findExecutable( $name ) { - $paths = explode( PATH_SEPARATOR, getenv( "PATH" ) ); - foreach( $paths as $path ) { - $full = $path . DIRECTORY_SEPARATOR . $name; - if( file_exists( $full ) ) { - if( wfIsWindows() || is_executable( $full ) ) { - return $full; - } - } - } - return false; -} - -function readlineEmulation( $prompt ) { - $bash = "bash"; - if( !wfIsWindows() && findExecutable( $bash ) ) { - $retval = false; - $encPrompt = wfEscapeShellArg( $prompt ); - $command = "read -er -p $encPrompt && echo \"\$REPLY\""; - $encCommand = wfEscapeShellArg( $command ); - $line = wfShellExec( "$bash -c $encCommand", $retval ); - - if( $retval == 0 ) { - return $line; - } elseif( $retval == 127 ) { - // Couldn't execute bash even though we thought we saw it. - // Shell probably spit out an error message, sorry :( - // Fall through to fgets()... - } else { - // EOF/ctrl+D - return false; - } - } - - // Fallback... we'll have no editing controls, EWWW - if ( feof( STDIN ) ) { - return false; - } - print $prompt; - return fgets(STDIN, 1024); -} - - -# -# Read and execute SQL commands from a file -# -function dbsource( $fname, $db = false ) { - wfDeprecated( __METHOD__ ); - if ( !$db ) { - // Try $wgDatabase, which is used in the install and update scripts - global $wgDatabase; - if ( isset( $wgDatabase ) ) { - $db = $wgDatabase; - } else { - // No? Well, we must be outside of those scripts, so use the standard method - $db = wfGetDB( DB_MASTER ); - } - } - $error = $db->sourceFile( $fname ); - if ( $error !== true ) { - print $error; - exit(1); - } -} - -/** - * Get the value of session.save_path - * - * Per http://www.php.net/manual/en/ref.session.php#ini.session.save-path, - * this might have some additional preceding parts which need to be - * ditched - * - * @return string - */ -function mw_get_session_save_path() { - $path = ini_get( 'session.save_path' ); - $path = substr( $path, strrpos( $path, ';' ) ); - return $path; -} - -/** - * Is dl() available to us? - * - * According to http://www.php.net/manual/en/function.dl.php, dl() - * is *not* available when `enable_dl` is off, or under `safe_mode` - * - * @return bool - */ -function mw_have_dl() { - return function_exists( 'dl' ) - && is_callable( 'dl' ) - && wfIniGetBool( 'enable_dl' ) - && !wfIniGetBool( 'safe_mode' ); -} \ No newline at end of file diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index b4fcbe4b7c..15a37c8857 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -257,7 +257,7 @@ if( version_compare( phpversion(), '5.2.4' ) >= 0 ) { $wgShowSQLErrors = true; require_once( "$IP/includes/Setup.php" ); -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); $wgTitle = null; # Much much faster startup than creating a title object @set_time_limit(0); diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index c5df5b9c32..a4afe07bf9 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -75,7 +75,7 @@ if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) { $maintenance->finalSetup(); // Some last includes require_once( "$IP/includes/Setup.php" ); -require_once( "$IP/install-utils.inc" ); +require_once( "$IP/maintenance/install-utils.inc" ); // Much much faster startup than creating a title object $wgTitle = null; diff --git a/maintenance/install-utils.inc b/maintenance/install-utils.inc new file mode 100644 index 0000000000..234b12c9ec --- /dev/null +++ b/maintenance/install-utils.inc @@ -0,0 +1,196 @@ +index.php5 \n". + "to continue installation. ABORTING.\n"; + die( -1 ); + } + + // Test for PHP bug which breaks PHP 5.0.x on 64-bit... + // As of 1.8 this breaks lots of common operations instead + // of just some rare ones like export. + $borked = str_replace( 'a', 'b', array( -1 => -1 ) ); + if( !isset( $borked[-1] ) ) { + echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" . + "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n"; + die( -1 ); + } + + $test = new PhpXmlBugTester(); + if( !$test->ok ) { + echo "Your system has a combination of PHP and libxml2 versions which is buggy\n" . + "and can cause hidden data corruption in MediaWiki and other web apps.\n" . + "Upgrade to PHP 5.2.9 or later and libxml2 2.7.2 or later!\n" . + "ABORTING (http://bugs.php.net/bug.php?id=45996 for details).\n"; + die( -1 ); + } + + + global $wgCommandLineMode; + $wgCommandLineMode = true; + umask( 000 ); + @set_time_limit( 0 ); +} + +/** + * Test for PHP+libxml2 bug which breaks XML input subtly with certain versions. + * http://bugs.php.net/bug.php?id=45996 + * Known fixed with PHP 5.2.9 + libxml2-2.7.3 + */ +class PhpXmlBugTester { + private $parsedData = ''; + public $ok = false; + public function __construct() { + $charData = 'c'; + $xml = '' . htmlspecialchars( $charData ) . ''; + + $parser = xml_parser_create(); + xml_set_character_data_handler( $parser, array( $this, 'chardata' ) ); + $parsedOk = xml_parse($parser, $xml, true); + $this->ok = $parsedOk && ($this->parsedData == $charData); + } + public function chardata($parser, $data) { + $this->parsedData .= $data; + } +} + +function readconsole( $prompt = '' ) { + static $isatty = null; + if ( is_null( $isatty ) ) { + if ( !function_exists( 'posix_isatty' ) || posix_isatty( 0 /*STDIN*/ ) ) { + $isatty = true; + } else { + $isatty = false; + } + } + + if ( $isatty && function_exists( 'readline' ) ) { + return readline( $prompt ); + } else { + if ( $isatty ) { + $st = readlineEmulation( $prompt ); + } else { + if ( feof( STDIN ) ) { + $st = false; + } else { + $st = fgets(STDIN, 1024); + } + } + if ($st === false) return false; + $resp = trim( $st ); + return $resp; + } +} + +function findExecutable( $name ) { + $paths = explode( PATH_SEPARATOR, getenv( "PATH" ) ); + foreach( $paths as $path ) { + $full = $path . DIRECTORY_SEPARATOR . $name; + if( file_exists( $full ) ) { + if( wfIsWindows() || is_executable( $full ) ) { + return $full; + } + } + } + return false; +} + +function readlineEmulation( $prompt ) { + $bash = "bash"; + if( !wfIsWindows() && findExecutable( $bash ) ) { + $retval = false; + $encPrompt = wfEscapeShellArg( $prompt ); + $command = "read -er -p $encPrompt && echo \"\$REPLY\""; + $encCommand = wfEscapeShellArg( $command ); + $line = wfShellExec( "$bash -c $encCommand", $retval ); + + if( $retval == 0 ) { + return $line; + } elseif( $retval == 127 ) { + // Couldn't execute bash even though we thought we saw it. + // Shell probably spit out an error message, sorry :( + // Fall through to fgets()... + } else { + // EOF/ctrl+D + return false; + } + } + + // Fallback... we'll have no editing controls, EWWW + if ( feof( STDIN ) ) { + return false; + } + print $prompt; + return fgets(STDIN, 1024); +} + + +# +# Read and execute SQL commands from a file +# +function dbsource( $fname, $db = false ) { + wfDeprecated( __METHOD__ ); + if ( !$db ) { + // Try $wgDatabase, which is used in the install and update scripts + global $wgDatabase; + if ( isset( $wgDatabase ) ) { + $db = $wgDatabase; + } else { + // No? Well, we must be outside of those scripts, so use the standard method + $db = wfGetDB( DB_MASTER ); + } + } + $error = $db->sourceFile( $fname ); + if ( $error !== true ) { + print $error; + exit(1); + } +} + +/** + * Get the value of session.save_path + * + * Per http://www.php.net/manual/en/ref.session.php#ini.session.save-path, + * this might have some additional preceding parts which need to be + * ditched + * + * @return string + */ +function mw_get_session_save_path() { + $path = ini_get( 'session.save_path' ); + $path = substr( $path, strrpos( $path, ';' ) ); + return $path; +} + +/** + * Is dl() available to us? + * + * According to http://www.php.net/manual/en/function.dl.php, dl() + * is *not* available when `enable_dl` is off, or under `safe_mode` + * + * @return bool + */ +function mw_have_dl() { + return function_exists( 'dl' ) + && is_callable( 'dl' ) + && wfIniGetBool( 'enable_dl' ) + && !wfIniGetBool( 'safe_mode' ); +} \ No newline at end of file