Use wfGetDB(DB_SLAVE) when appropriate. Changed deletion summary autogeneration to...

[lhc/web/wiklou.git] / install-utils.inc

diff --git a/install-utils.inc b/install-utils.inc
index 6de9377..2197fe6 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -7,10 +7,10 @@ function install_version_checks() {
 
        if( !function_exists( 'version_compare' ) ) {
                # version_compare was introduced in 4.1.0
-               die( "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is recommended. ABORTING.\n" );
+               die( "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is required. ABORTING.\n" );
        }
        if( version_compare( phpversion(), '4.3.2' ) < 0 ) {
-               echo "WARNING: PHP 4.3.2 or higher is recommended. Older versions from 4.1.x up may work but are not actively supported.\n\n";
+               die( "PHP 4.3.2 or higher is required. ABORTING.\n" );
        }
 
        if (!extension_loaded('mysql')) {
@@ -57,10 +57,16 @@ function copydirectory( $source, $dest ) {
 }
 
 function readconsole( $prompt = '' ) {
-       if ( function_exists( 'posix_isatty' ) && posix_isatty( STDIN ) ) {
-               $isatty = true;
-       } else {
-               $isatty = false;
+       static $isatty = null, $fp = null;
+       if ( is_null( $fp ) ) {
+               $fp = fopen( 'php://stdin', 'r' );
+       }
+       if ( is_null( $isatty ) ) {
+               if ( !function_exists( 'posix_isatty' ) || posix_isatty( $fp ) ) {
+                       $isatty = true;
+               } else {
+                       $isatty = false;
+               }
        }
 
        if ( $isatty && function_exists( 'readline' ) ) {
@@ -69,11 +75,12 @@ function readconsole( $prompt = '' ) {
                if ( $isatty ) {
                        print $prompt;
                }
-               $fp = fopen( 'php://stdin', 'r' );
+               if ( feof( $fp ) ) {
+                       return false;
+               }
                $st = fgets($fp, 1024);
                if ($st === false) return false;
                $resp = trim( $st );
-               fclose( $fp );
                return $resp;
        }
 }