fname in debug statement (forgot that one yesterday)

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

diff --git a/install-utils.inc b/install-utils.inc
index 2197fe6..235baaa 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -7,18 +7,26 @@ 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 required. ABORTING.\n" );
+               echo "Your PHP version is much too old; 4.0.x will _not_ work. 5.0.0 or higher is required. ABORTING.\n";
+               die( -1 );
        }
-       if( version_compare( phpversion(), '4.3.2' ) < 0 ) {
-               die( "PHP 4.3.2 or higher is required. ABORTING.\n" );
+       if( version_compare( phpversion(), '5.0.0' ) < 0 ) {
+               echo "PHP 5.0.0 or higher is required. ABORTING.\n";
+               die( -1 );
        }
 
-       if (!extension_loaded('mysql')) {
-               if (!dl('mysql.so')) {
-                       print 'Could not load MySQL driver! Please compile '.
-                                 "php --with-mysql or install the mysql.so module.\n";
+       $gotdatabase = 0;
+       ## XXX We should quiet the warnings thrown here
+       if (extension_loaded('mysql') or dl('mysql.so')) {
+               $gotdatabase = 'mysql';
+       }
+       else if (extension_loaded('pgsql') or dl('pgsql.so')) {
+               $gotdatabase = 'pg';
+       }
+       if (!$gotdatabase) {
+               print "Could not load the MySQL or the PostgreSQL driver! Please compile ".
+                         "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.\n";
                exit;
-               }
        }
 
        global $wgCommandLineMode;
@@ -85,71 +93,25 @@ function readconsole( $prompt = '' ) {
        }
 }
 
-function replacevars( $ins ) {
-       $varnames = array(
-               'wgDBserver', 'wgDBname', 'wgDBintlname', 'wgDBuser',
-               'wgDBpassword', 'wgDBsqluser', 'wgDBsqlpassword',
-               'wgDBadminuser', 'wgDBadminpassword', 'wgDBprefix'
-       );
-
-       foreach ( $varnames as $var ) {
-               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;
-}
-
 #
 # Read and execute SQL commands from a file
 #
-function dbsource( $fname, $database = false ) {
-       $fp = fopen( $fname, 'r' );
-       if ( false === $fp ) {
-               print "Could not open \"{$fname}\".\n";
-               exit();
-       }
-
-       $cmd = "";
-       $done = false;
-
-       while ( ! feof( $fp ) ) {
-               $line = trim( fgets( $fp, 1024 ) );
-               $sl = strlen( $line ) - 1;
-
-               if ( $sl < 0 ) { continue; }
-               if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
-
-               if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
-                       $done = true;
-                       $line = substr( $line, 0, $sl );
-               }
-
-               if ( '' != $cmd ) { $cmd .= ' '; }
-               $cmd .= "$line\n";
-
-               if ( $done ) {
-                       $cmd = str_replace(';;', ";", $cmd);
-                       $cmd = replacevars( $cmd );
-                       if( $database )
-                               $res = $database->query( $cmd, 'dbsource', true );
-                       else
-                               $res = mysql_query( $cmd );
-
-                       if ( false === $res ) {
-                               $err = mysql_error();
-                               print "Query \"{$cmd}\" failed with error code \"$err\".\n";
-                               exit();
-                       }
-
-                       $cmd = '';
-                       $done = false;
+function dbsource( $fname, $db = false ) {
+       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 );
                }
        }
-       fclose( $fp );
+       $error = $db->sourceFile( $fname );
+       if ( $error !== true ) {
+               print $error;
+               exit(1);
+       }
 }
 
 # Obsolete, use Database::fieldExists()