add namespace filtering without UI so i can it on the live situ

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

diff --git a/install-utils.inc b/install-utils.inc
index 55e712c..62d35c6 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,17 +1,21 @@
 <?php
 
 function install_version_checks() {
-       if( !function_exists( "version_compare" ) ) {
+       # We dare not turn output buffer _off_ since this will break completely
+       # if PHP is globally configured to run through a gzip filter.
+       @ob_implicit_flush( true );
+       
+       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" );
        }
-       if( version_compare( phpversion(), "4.3.2" ) < 0 ) {
+       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";
        }
        
        if (!extension_loaded('mysql')) {
                if (!dl('mysql.so')) {
-                       print "Could not load MySQL driver! Please compile ".
+                       print 'Could not load MySQL driver! Please compile '.
                                  "php --with-mysql or install the mysql.so module.\n";
                exit;
                }
@@ -46,30 +50,40 @@ function copydirectory( $source, $dest ) {
        $handle = opendir( $source );
        while ( false !== ( $f = readdir( $handle ) ) ) {
                $fullname = "$source/$f";
-               if ( $f{0} !="." && is_file( $fullname ) ) {
+               if ( $f{0} != '.' && is_file( $fullname ) ) {
                        copyfile( $source, $f, $dest );
                }
        }
 }
 
-function readconsole() {
-       $fp = fopen( "php://stdin", "r" );
-       $resp = trim( fgets( $fp, 1024 ) );
-       fclose( $fp );
-       return $resp;
+function readconsole( $prompt = '' ) {
+       if ( function_exists( 'readline' ) ) {
+               return readline( $prompt );
+       } else {
+               print $prompt;
+               $fp = fopen( 'php://stdin', 'r' );
+               $st = fgets($fp, 1024);
+               if ($st === false) return false;
+               $resp = trim( $st );
+               fclose( $fp );
+               return $resp;
+       }
 }
 
-
 function replacevars( $ins ) {
        $varnames = array(
-               "wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
-               "wgDBpassword", "wgDBsqluser", "wgDBsqlpassword",
-               "wgDBadminuser", "wgDBadminpassword"
+               'wgDBserver', 'wgDBname', 'wgDBintlname', 'wgDBuser',
+               'wgDBpassword', 'wgDBsqluser', 'wgDBsqlpassword',
+               'wgDBadminuser', 'wgDBadminpassword', 'wgDBprefix'
        );
 
        foreach ( $varnames as $var ) {
-               global $$var;
-               $ins = str_replace( '{$' . $var . '}', $$var, $ins );
+               if( isset( $GLOBALS[$var] ) ) {
+                       $val = addslashes( $GLOBALS[$var] );
+                       $ins = str_replace( '{$' . $var . '}', $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/', $val, $ins );
+               }
        }
        return $ins;
 }
@@ -78,7 +92,7 @@ function replacevars( $ins ) {
 # Read and execute SQL commands from a file
 #
 function dbsource( $fname, $database = false ) {
-       $fp = fopen( $fname, "r" );
+       $fp = fopen( $fname, 'r' );
        if ( false === $fp ) {
                print "Could not open \"{$fname}\".\n";
                exit();
@@ -92,14 +106,14 @@ function dbsource( $fname, $database = false ) {
                $sl = strlen( $line ) - 1;
 
                if ( $sl < 0 ) { continue; }
-               if ( "-" == $line{0} && "-" == $line{1} ) { continue; }
+               if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
 
-               if ( ";" == $line{$sl} ) {
+               if ( ';' == $line{$sl} ) {
                        $done = true;
                        $line = substr( $line, 0, $sl );
                }
 
-               if ( "" != $cmd ) { $cmd .= " "; }
+               if ( '' != $cmd ) { $cmd .= ' '; }
                $cmd .= $line;
 
                if ( $done ) {
@@ -110,11 +124,12 @@ function dbsource( $fname, $database = false ) {
                                $res = mysql_query( $cmd );
 
                        if ( false === $res ) {
-                               print "Query \"{$cmd}\" failed.\n";
+                               $err = mysql_error();
+                               print "Query \"{$cmd}\" failed with error code \"$err\".\n";
                                exit();
                        }
 
-                       $cmd = "";
+                       $cmd = '';
                        $done = false;
                }
        }
@@ -123,11 +138,12 @@ function dbsource( $fname, $database = false ) {
 
 # Obsolete, use Database::fieldExists()
 function field_exists( $table, $field ) {
-       $fname = "Update script: field_exists";
-       $res = wfQuery( "DESCRIBE $table", $fname );
+       $fname = 'Update script: field_exists';
+       $db =& wfGetDB( DB_SLAVE );
+       $res = $db->query( "DESCRIBE $table", $fname );
        $found = false;
        
-       while ( $row = wfFetchObject( $res ) ) {
+       while ( $row = $db->fetchObject( $res ) ) {
                if ( $row->Field == $field ) {
                        $found = true;
                        break;