X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=install-utils.inc;h=040c34dc81914ebc3a38ae96793293f6e1cc63e6;hb=28bb28f0cc4d67e9497040bad2c757fd107638a8;hp=f9842476a12fd3e068f5678f6cddc5965b879483;hpb=8d5959de56eecba0be23d69e40ba7af79ead4459;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install-utils.inc b/install-utils.inc
index f9842476a1..040c34dc81 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,6 +1,9 @@
-<?
+<?php
 
 function install_version_checks() {
+	# Turn off output buffering if it's on
+	@ob_end_flush();
+	
 	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" );
@@ -8,9 +11,6 @@ function install_version_checks() {
 	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( !ini_get( "register_globals" ) ) {
-		echo "WARNING: register_globals is not on; MediaWiki currently relies on this option.\n\n";
-	}
 	
 	if (!extension_loaded('mysql')) {
 		if (!dl('mysql.so')) {
@@ -27,16 +27,20 @@ function install_version_checks() {
 }
 
 function copyfile( $sdir, $name, $ddir, $perms = 0664 ) {
+	copyfileto( $sdir, $name, $ddir, $name, $perms );
+}
+
+function copyfileto( $sdir, $sname, $ddir, $dname, $perms = 0664 ) {
 	global $wgInstallOwner, $wgInstallGroup;
 
-	$d = "{$ddir}/{$name}";
-	if ( copy( "{$sdir}/{$name}", $d ) ) {
+	$d = "{$ddir}/{$dname}";
+	if ( copy( "{$sdir}/{$sname}", $d ) ) {
 		if ( isset( $wgInstallOwner ) ) { chown( $d, $wgInstallOwner ); }
 		if ( isset( $wgInstallGroup ) ) { chgrp( $d, $wgInstallGroup ); }
 		chmod( $d, $perms );
-		# print "Copied \"{$name}\" to \"{$ddir}\".\n";
+		# print "Copied \"{$sname}\" to \"{$d}\".\n";
 	} else {
-		print "Failed to copy file \"{$name}\" to \"{$ddir}\".\n";
+		print "Failed to copy file \"{$sname}\" to \"{$ddir}/{$dname}\".\n";
 		exit();
 	}
 }
@@ -51,14 +55,18 @@ function copydirectory( $source, $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" );
+		$resp = trim( fgets( $fp, 1024 ) );
+		fclose( $fp );
+		return $resp;
+	}
 }
 
-
 function replacevars( $ins ) {
 	$varnames = array(
 		"wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
@@ -76,7 +84,7 @@ function replacevars( $ins ) {
 #
 # Read and execute SQL commands from a file
 #
-function dbsource( $fname, $conn = false ) {
+function dbsource( $fname, $database = false ) {
 	$fp = fopen( $fname, "r" );
 	if ( false === $fp ) {
 		print "Could not open \"{$fname}\".\n";
@@ -103,13 +111,14 @@ function dbsource( $fname, $conn = false ) {
 
 		if ( $done ) {
 			$cmd = replacevars( $cmd );
-			if( $conn )
-				$res = mysql_query( $cmd, $conn );
+			if( $database )
+				$res = $database->query( $cmd );
 			else
 				$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();
 			}
 
@@ -120,7 +129,7 @@ function dbsource( $fname, $conn = false ) {
 	fclose( $fp );
 }
 
-
+# Obsolete, use Database::fieldExists()
 function field_exists( $table, $field ) {
 	$fname = "Update script: field_exists";
 	$res = wfQuery( "DESCRIBE $table", $fname );
@@ -135,7 +144,7 @@ function field_exists( $table, $field ) {
 	return $found;
 }
 
-
+# Obsolete Database::tableExists()
 function table_exists( $db ) {
 	global $wgDBname;
 	$res = mysql_list_tables( $wgDBname );
@@ -149,6 +158,7 @@ function table_exists( $db ) {
 	return false;
 }
 
+# Obsolete, use Database:fieldInfo()
 function field_info( $table, $field ) {
 	$res = mysql_query( "SELECT * FROM $table LIMIT 1" );
 	$n = mysql_num_fields( $res );