Followup to r54416
[lhc/web/wiklou.git] / config / index.php
index 43e0363..0722588 100644 (file)
@@ -29,10 +29,6 @@ $wgRequestTime = microtime( true );
 # Attempt to set up the include path, to fix problems with relative includes
 $IP = dirname( dirname( __FILE__ ) );
 define( 'MW_INSTALL_PATH', $IP );
-$sep = PATH_SEPARATOR;
-if( !ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" ) ) {
-       set_include_path( ".$sep$IP$sep$IP/includes$sep$IP/languages" );
-}
 
 # Define an entry point and include some files
 define( "MEDIAWIKI", true );
@@ -40,15 +36,24 @@ define( "MEDIAWIKI_INSTALL", true );
 
 // Run version checks before including other files
 // so people don't see a scary parse error.
-require_once( "install-utils.inc" );
+require_once( "$IP/install-utils.inc" );
 install_version_checks();
 
-require_once( "includes/Defines.php" );
-require_once( "includes/DefaultSettings.php" );
-require_once( "includes/MagicWord.php" );
-require_once( "includes/Namespace.php" );
-require_once( "includes/ProfilerStub.php" );
-
+require_once( "$IP/includes/Defines.php" );
+require_once( "$IP/includes/DefaultSettings.php" );
+require_once( "$IP/includes/AutoLoader.php" );
+require_once( "$IP/includes/MagicWord.php" );
+require_once( "$IP/includes/Namespace.php" );
+require_once( "$IP/includes/ProfilerStub.php" );
+require_once( "$IP/includes/GlobalFunctions.php" );
+require_once( "$IP/includes/Hooks.php" );
+require_once( "$IP/includes/Exception.php" );
+
+# If we get an exception, the user needs to know
+# all the details
+$wgShowExceptionDetails = true;
+$wgShowSQLErrors = true;
+wfInstallExceptionHandler();
 ## Databases we support:
 
 $ourdb = array();
@@ -64,12 +69,37 @@ $ourdb['postgres']['compile']    = 'pgsql';
 $ourdb['postgres']['bgcolor']    = '#aaccff';
 $ourdb['postgres']['rootuser']   = 'postgres';
 
+$ourdb['sqlite']['fullname']      = 'SQLite';
+$ourdb['sqlite']['havedriver']    = 0;
+$ourdb['sqlite']['compile']       = 'pdo_sqlite';
+$ourdb['sqlite']['bgcolor']       = '#b1ebb1';
+$ourdb['sqlite']['rootuser']      = '';
+
+$ourdb['mssql']['fullname']      = 'MSSQL';
+$ourdb['mssql']['havedriver']    = 0;
+$ourdb['mssql']['compile']       = 'mssql not ready'; # Change to 'mssql' after includes/DatabaseMssql.php added;
+$ourdb['mssql']['bgcolor']       = '#ffc0cb';
+$ourdb['mssql']['rootuser']      = 'administrator';
+
+$ourdb['ibm_db2']['fullname']   = 'DB2';
+$ourdb['ibm_db2']['havedriver'] = 0;
+$ourdb['ibm_db2']['compile']    = 'ibm_db2';
+$ourdb['ibm_db2']['bgcolor']    = '#ffeba1';
+$ourdb['ibm_db2']['rootuser']   = 'db2admin';
+
+$ourdb['oracle']['fullname']   = 'Oracle';
+$ourdb['oracle']['havedriver'] = 0;
+$ourdb['oracle']['compile']    = 'oci8';
+$ourdb['oracle']['bgcolor']    = '#ffeba1';
+$ourdb['oracle']['rootuser']   = '';
+
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
 <head>
-       <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-       <title>MediaWiki <?php echo( $wgVersion ); ?> Installation</title>
+       <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+       <meta name="robots" content="noindex,nofollow"/>
+       <title>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?> Installation</title>
        <style type="text/css">
 
                @import "../skins/monobook/main.css";
@@ -146,21 +176,30 @@ $ourdb['postgres']['rootuser']   = 'postgres';
                        font-size: 85%;
                        padding-top: 3em;
                }
+               
+               span.success-message {
+                       font-weight: bold;
+                       font-size: 110%;
+                       color: green;
+               }
+               .success-box {
+                       font-size: 130%;
+               }
 
        </style>
        <script type="text/javascript">
        <!--
        function hideall() {
                <?php foreach (array_keys($ourdb) as $db) {
-               echo "\n                document.getElementById('$db').style.display='none';";
+               echo "\n                var i = document.getElementById('$db'); if (i) i.style.display='none';";
                }
                ?>
 
        }
        function toggleDBarea(id,defaultroot) {
                hideall();
-               var dbarea = document.getElementById(id).style;
-               dbarea.display = (dbarea.display == 'none') ? 'block' : 'none';
+               var dbarea = document.getElementById(id);
+               if (dbarea) dbarea.style.display = (dbarea.style.display == 'none') ? 'block' : 'none';
                var db = document.getElementById('RootUser');
                if (defaultroot) {
 <?php foreach (array_keys($ourdb) as $db) {
@@ -178,21 +217,21 @@ $ourdb['postgres']['rootuser']   = 'postgres';
 <div id="content">
 <div id="bodyContent">
 
-<h1>MediaWiki <?php print $wgVersion ?> Installation</h1>
+<h1>MediaWiki <?php print htmlspecialchars( $wgVersion ) ?> Installation</h1>
 
 <?php
+$mainListOpened = false; # Is the main list (environement checking) opend ? Used by dieout
 
 /* Check for existing configurations and bug out! */
 
 if( file_exists( "../LocalSettings.php" ) ) {
-       dieout( "<p><strong>Setup has completed, <a href='../index.php'>your wiki</a> is configured.</strong></p>
-
-       <p>Please delete the /config directory for extra security.</p></div></div></div></div>" );
+       $script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
+       dieout( "<p><strong>Setup has completed, <a href='../$script'>your wiki</a> is configured.</strong></p>
+       <p>Please delete the /config directory for extra security.</p>" );
 }
 
 if( file_exists( "./LocalSettings.php" ) ) {
        writeSuccessMessage();
-
        dieout( '' );
 }
 
@@ -207,7 +246,7 @@ if( !is_writable( "." ) ) {
        <p>To make the directory writable on a Unix/Linux system:</p>
 
        <pre>
-       cd <i>/path/to/wiki</i>
+       cd <i>" . htmlspecialchars( dirname( dirname( __FILE__ ) ) ) . "</i>
        chmod a+w config
        </pre>
        
@@ -215,8 +254,8 @@ if( !is_writable( "." ) ) {
 }
 
 
-require_once( "install-utils.inc" );
-require_once( "maintenance/updaters.inc" );
+require_once( "$IP/install-utils.inc" );
+require_once( "$IP/maintenance/updaters.inc" );
 
 class ConfigData {
        function getEncoded( $data ) {
@@ -226,6 +265,31 @@ class ConfigData {
        function getSitename() { return $this->getEncoded( $this->Sitename ); }
        function getSysopName() { return $this->getEncoded( $this->SysopName ); }
        function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
+
+       function setSchema( $schema, $engine ) {
+               $this->DBschema = $schema;
+               if ( !preg_match( '/^\w*$/', $engine ) ){
+                       $engine = 'InnoDB';
+               }
+               switch ( $this->DBschema ) {
+                       case 'mysql5':
+                               $this->DBTableOptions = "ENGINE=$engine, DEFAULT CHARSET=utf8";
+                               $this->DBmysql5 = 'true';
+                               break;
+                       case 'mysql5-binary':
+                               $this->DBTableOptions = "ENGINE=$engine, DEFAULT CHARSET=binary";
+                               $this->DBmysql5 = 'true';
+                               break;
+                       default:
+                               $this->DBTableOptions = "TYPE=$engine";
+                               $this->DBmysql5 = 'false';
+               }
+               $this->DBengine = $engine;
+
+               # Set the global for use during install
+               global $wgDBTableOptions;
+               $wgDBTableOptions = $this->DBTableOptions;
+       }
 }
 
 ?>
@@ -233,7 +297,7 @@ class ConfigData {
 <ul>
        <li>
                <b>Don't forget security updates!</b> Keep an eye on the
-               <a href="http://mail.wikimedia.org/mailman/listinfo/mediawiki-announce">low-traffic
+               <a href="http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce">low-traffic
                release announcements mailing list</a>.
        </li>
 </ul>
@@ -243,28 +307,28 @@ class ConfigData {
 <p><em>Please include all of the lines below when reporting installation problems.</em></p>
 <ul class="env-check">
 <?php
+$mainListOpened = true;
+
 $endl = "
 ";
-$wgNoOutputBuffer = true;
+define( 'MW_NO_OUTPUT_BUFFER', 1 );
 $conf = new ConfigData;
 
 install_version_checks();
+$self = 'Installer'; # Maintenance script name, to please Setup.php
 
-print "<li>PHP " . phpversion() . " installed</li>\n";
-
-## Temporarily turn off all errors as we try to discover installed databases
-$olderrnum = error_reporting(0);
+print "<li>PHP " . htmlspecialchars( phpversion() ) . " installed</li>\n";
 
+error_reporting( 0 );
 $phpdatabases = array();
 foreach (array_keys($ourdb) as $db) {
        $compname = $ourdb[$db]['compile'];
-       if (extension_loaded($compname) or dl($compname . '.' . PHP_SHLIB_SUFFIX)) {
+       if( extension_loaded( $compname ) || ( mw_have_dl() && dl( "{$compname}." . PHP_SHLIB_SUFFIX ) ) ) {
                array_push($phpdatabases, $db);
                $ourdb[$db]['havedriver'] = 1;
        }
 }
-
-error_reporting($olderrornum);
+error_reporting( E_ALL );
 
 if (!$phpdatabases) {
        print "Could not find a suitable database driver!<ul>";
@@ -274,21 +338,23 @@ if (!$phpdatabases) {
                print "<li>For <b>$full</b>, compile PHP using <b>--with-$comp</b>, "
                        ."or install the $comp.so module</li>\n";
        }
-       dieout( "</ul></ul>" );
+       echo '</ul>';
+       dieout( '' );
 }
 
 print "<li>Found database drivers for:";
+$DefaultDBtype = '';
 foreach (array_keys($ourdb) AS $db) {
        if ($ourdb[$db]['havedriver']) {
-               $DefaultDBtype = $db;
+               if ( $DefaultDBtype == '' ) {
+                       $DefaultDBtype = $db;
+               }
                print "  ".$ourdb[$db]['fullname'];
        }
 }
 print "</li>\n";
-if (count($phpdatabases) != 1)
-       $DefaultDBtype = '';
 
-if( ini_get( "register_globals" ) ) {
+if( wfIniGetBool( "register_globals" ) ) {
        ?>
        <li>
                <div style="font-size:110%">
@@ -302,35 +368,44 @@ if( ini_get( "register_globals" ) ) {
 
 $fatal = false;
 
-if( ini_get( "magic_quotes_runtime" ) ) {
+if( wfIniGetBool( "magic_quotes_runtime" ) ) {
        $fatal = true;
        ?><li class='error'><strong>Fatal: <a href='http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime'>magic_quotes_runtime</a> is active!</strong>
        This option corrupts data input unpredictably; you cannot install or use
-       MediaWiki unless this option is disabled.
+       MediaWiki unless this option is disabled.</li>
        <?php
 }
 
-if( ini_get( "magic_quotes_sybase" ) ) {
+if( wfIniGetBool( "magic_quotes_sybase" ) ) {
        $fatal = true;
        ?><li class='error'><strong>Fatal: <a href='http://www.php.net/manual/en/ref.sybase.php#ini.magic-quotes-sybase'>magic_quotes_sybase</a> is active!</strong>
        This option corrupts data input unpredictably; you cannot install or use
-       MediaWiki unless this option is disabled.
+       MediaWiki unless this option is disabled.</li>
        <?php
 }
 
-if( ini_get( "mbstring.func_overload" ) ) {
+if( wfIniGetBool( "mbstring.func_overload" ) ) {
        $fatal = true;
        ?><li class='error'><strong>Fatal: <a href='http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload'>mbstring.func_overload</a> is active!</strong>
        This option causes errors and may corrupt data unpredictably;
-       you cannot install or use MediaWiki unless this option is disabled.
+       you cannot install or use MediaWiki unless this option is disabled.</li>
+       <?php
+}
+
+if( wfIniGetBool( "zend.ze1_compatibility_mode" ) ) {
+       $fatal = true;
+       ?><li class="error"><strong>Fatal: <a href="http://www.php.net/manual/en/ini.core.php">zend.ze1_compatibility_mode</a> is active!</strong>
+       This option causes horrible bugs with MediaWiki; you cannot install or use
+       MediaWiki unless this option is disabled.</li>
        <?php
 }
 
+
 if( $fatal ) {
-       dieout( "</ul><p>Cannot install MediaWiki.</p>" );
+       dieout( "Cannot install MediaWiki." );
 }
 
-if( ini_get( "safe_mode" ) ) {
+if( wfIniGetBool( "safe_mode" ) ) {
        $conf->safeMode = true;
        ?>
        <li><b class='error'>Warning:</b> <strong>PHP's
@@ -342,12 +417,13 @@ if( ini_get( "safe_mode" ) ) {
        $conf->safeMode = false;
 }
 
-$sapi = php_sapi_name();
+$sapi = htmlspecialchars( php_sapi_name() );
 print "<li>PHP server API is $sapi; ";
+$script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
 if( $wgUsePathInfo ) {
      print "ok, using pretty URLs (<tt>index.php/Page_Title</tt>)";
print "ok, using pretty URLs (<tt>$script/Page_Title</tt>)";
 } else {
-       print "using ugly URLs (<tt>index.php?title=Page_Title</tt>)";
+       print "using ugly URLs (<tt>$script?title=Page_Title</tt>)";
 }
 print "</li>\n";
 
@@ -360,51 +436,62 @@ if( $conf->xml ) {
                If you're running Mandrake, install the php-xml package." );
 }
 
-# Crude check for session support
+# Check for session support
 if( !function_exists( 'session_name' ) )
        dieout( "PHP's session module is missing. MediaWiki requires session support in order to function." );
 
-# Likewise for PCRE
+# session.save_path doesn't *have* to be set, but if it is, and it's
+# not valid/writable/etc. then it can cause problems
+$sessionSavePath = mw_get_session_save_path();
+$ssp = htmlspecialchars( $sessionSavePath );
+# Warn the user if it's not set, but let them proceed
+if( !$sessionSavePath ) {
+       print "<li><strong>Warning:</strong> A value for <tt>session.save_path</tt>
+       has not been set in PHP.ini. If the default value causes problems with
+       saving session data, set it to a valid path which is read/write/execute
+       for the user your web server is running under.</li>";
+} elseif ( is_dir( $sessionSavePath ) && is_writable( $sessionSavePath ) ) {
+       # All good? Let the user know
+       print "<li>Session save path (<tt>{$ssp}</tt>) appears to be valid.</li>";
+} else {
+       # Something not right? Warn the user, but let them proceed
+       print "<li><strong>Warning:</strong> Your <tt>session.save_path</tt> value (<tt>{$ssp}</tt>)
+               appears to be invalid or is not writable. PHP needs to be able to save data to
+               this location for correct session operation.</li>";
+}
+
+# Check for PCRE support
 if( !function_exists( 'preg_match' ) )
-       dieout( "The PCRE regular expression functions are missing. MediaWiki requires these in order to function." );
+       dieout( "The PCRE support module appears to be missing. MediaWiki requires the
+       Perl-compatible regular expression functions." );
 
 $memlimit = ini_get( "memory_limit" );
-$conf->raiseMemory = false;
-if( empty( $memlimit ) || $memlimit == -1 ) {
+if( $memlimit == -1 ) {
        print "<li>PHP is configured with no <tt>memory_limit</tt>.</li>\n";
 } else {
-       print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ) . ". ";
-       $n = intval( $memlimit );
-       if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
-               $n = intval( $m[1] * (1024*1024) );
-       }
-       if( $n < 20*1024*1024 ) {
-               print "Attempting to raise limit to 20M... ";
-               if( false === ini_set( "memory_limit", "20M" ) ) {
-                       print "failed.<br /><b>" . htmlspecialchars( $memlimit ) . " seems too low, installation may fail!</b>";
-               } else {
-                       $conf->raiseMemory = true;
-                       print "ok.";
-               }
+       print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ). " bytes. ";
+       $newlimit = wfMemoryLimit();
+       $memlimit = wfShorthandToInteger( $memlimit );
+       if( $newlimit < $memlimit ) {
+               print "<b>Failed raising limit, installation may fail.</b>";
+       } elseif ( $newlimit > $memlimit )  {
+               print "Raised <tt>memory_limit</tt> to " . htmlspecialchars( $newlimit ) . " bytes. ";
        }
        print "</li>\n";
 }
 
-$conf->zlib = function_exists( "gzencode" );
-if( $conf->zlib ) {
-       print "<li>Have zlib support; enabling output compression.</li>\n";
-} else {
-       print "<li>No zlib support.</li>\n";
-}
-
 $conf->turck = function_exists( 'mmcache_get' );
 if ( $conf->turck ) {
        print "<li><a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> installed</li>\n";
 }
 
+$conf->xcache = function_exists( 'xcache_get' );
+if( $conf->xcache )
+       print "<li><a href=\"http://trac.lighttpd.net/xcache/\">XCache</a> installed</li>\n";
+
 $conf->apc = function_exists('apc_fetch');
 if ($conf->apc ) {
-       print "<li><a href=\"http://www.php.net/apc\">APC</a> installed</li>";
+       print "<li><a href=\"http://www.php.net/apc\">APC</a> installed</li>\n";
 }
 
 $conf->eaccel = function_exists( 'eaccelerator_get' );
@@ -413,10 +500,31 @@ if ( $conf->eaccel ) {
        print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
 }
 
-if( !$conf->turck && !$conf->eaccel && !$conf->apc ) {
+$conf->dba = function_exists( 'dba_open' );
+
+if( !( $conf->turck || $conf->eaccel || $conf->apc || $conf->xcache ) ) {
        echo( '<li>Couldn\'t find <a href="http://turck-mmcache.sourceforge.net">Turck MMCache</a>,
-               <a href="http://eaccelerator.sourceforge.net">eAccelerator</a>, or
-               <a href="http://www.php.net/apc">APC</a>. Object caching functions cannot be used.</li>' );
+               <a href="http://eaccelerator.sourceforge.net">eAccelerator</a>,
+               <a href="http://www.php.net/apc">APC</a> or <a href="http://trac.lighttpd.net/xcache/">XCache</a>;
+               cannot use these for object caching.</li>' );
+}
+
+$conf->phpCliPath = false;
+$phpClilocations = array_merge(
+       array(
+               "/usr/bin",
+               "/usr/local/bin",
+               "/opt/csw/bin",
+               "/usr/gnu/bin",
+               "/usr/sfw/bin" ),
+       explode( PATH_SEPARATOR, getenv( "PATH" ) ) );
+$phpClinames = array( "php", "php.exe" );
+foreach ($phpClilocations as $loc) {
+       $exe = locate_executable($loc, $phpClinames);
+       if ($exe !== false) {
+               $conf->phpCliPath= $exe;
+               break;
+       }
 }
 
 $conf->diff3 = false;
@@ -427,7 +535,7 @@ $diff3locations = array_merge(
                "/opt/csw/bin",
                "/usr/gnu/bin",
                "/usr/sfw/bin" ),
-       explode( $sep, getenv( "PATH" ) ) );
+       explode( PATH_SEPARATOR, getenv( "PATH" ) ) );
 $diff3names = array( "gdiff3", "diff3", "diff3.exe" );
 
 $diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' );
@@ -448,7 +556,7 @@ $conf->ImageMagick = false;
 $imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
 foreach( $imcheck as $dir ) {
        $im = "$dir/convert";
-       if( file_exists( $im ) ) {
+       if( @file_exists( $im ) ) {
                print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n";
                $conf->ImageMagick = $im;
                break;
@@ -468,8 +576,6 @@ if( $conf->HaveGD ) {
        }
 }
 
-$conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
-
 $conf->IP = dirname( dirname( __FILE__ ) );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
@@ -480,9 +586,22 @@ print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt
 $path = ($_SERVER["PHP_SELF"] === '')
        ? $_SERVER["SCRIPT_NAME"]
        : $_SERVER["PHP_SELF"];
+
 $conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $path );
 print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</tt></li>\n";
 
+
+
+// We may be installing from *.php5 extension file, if so, print message
+$conf->ScriptExtension = '.php';
+if (defined('MW_INSTALL_PHP5_EXT')) {
+    $conf->ScriptExtension = '.php5';
+    print "<li>Installing MediaWiki with <tt>php5</tt> file extensions</li>\n";
+} else {
+    print "<li>Installing MediaWiki with <tt>php</tt> file extensions</li>\n";
+}
+
+
 print "<li style='font-weight:bold;color:green;font-size:110%'>Environment checked. You can install MediaWiki.</li>\n";
        $conf->posted = ($_SERVER["REQUEST_METHOD"] == "POST");
 
@@ -492,9 +611,10 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
                : $_SERVER["SERVER_ADMIN"];
        $conf->EmergencyContact = importPost( "EmergencyContact", $defaultEmail );
        $conf->DBtype = importPost( "DBtype", $DefaultDBtype );
-?>
+       if ( !isset( $ourdb[$conf->DBtype] ) ) {
+               $conf->DBtype = $DefaultDBtype;
+       }
 
-<?php
        $conf->DBserver = importPost( "DBserver", "localhost" );
        $conf->DBname = importPost( "DBname", "wikidb" );
        $conf->DBuser = importPost( "DBuser", "wikiuser" );
@@ -506,30 +626,52 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
        $conf->RootUser = importPost( "RootUser", "root" );
        $conf->RootPW = importPost( "RootPW", "" );
        $useRoot = importCheck( 'useroot', false );
-
+       $conf->populateadmin = importCheck( 'populateadmin', false );
+       $conf->LanguageCode = importPost( "LanguageCode", "en" );
        ## MySQL specific:
        $conf->DBprefix     = importPost( "DBprefix" );
-       $conf->DBschema     = importPost( "DBschema", "mysql4" );
-       $conf->DBmysql5     = ($conf->DBschema == "mysql5" ||
-                              $conf->DBschema == "mysql5-binary")
-                              ? "true" : "false";
-       $conf->LanguageCode = importPost( "LanguageCode", "en" );
+       $conf->setSchema( 
+               importPost( "DBschema", "mysql5-binary" ), 
+               importPost( "DBengine", "InnoDB" ) );
 
        ## Postgres specific:
        $conf->DBport      = importPost( "DBport",      "5432" );
        $conf->DBmwschema  = importPost( "DBmwschema",  "mediawiki" );
        $conf->DBts2schema = importPost( "DBts2schema", "public" );
+       
+       ## SQLite specific
+       $conf->SQLiteDataDir = importPost( "SQLiteDataDir", "" );
+       
+       ## MSSQL specific
+       // We need a second field so it doesn't overwrite the MySQL one
+       $conf->DBprefix2 = importPost( "DBprefix2" );
+       
+       ## DB2 specific:
+       // New variable in order to have a different default port number
+       $conf->DBport_db2   = importPost( "DBport_db2",      "50000" );
+       $conf->DBmwschema   = importPost( "DBmwschema",  "mediawiki" );
+       $conf->DBcataloged  = importPost( "DBcataloged",  "cataloged" );
+
+       // Oracle specific
+       $conf->DBprefix_ora     = importPost( "DBprefix_ora" );
+       $conf->DBdefTS_ora     = importPost( "DBdefTS_ora", "USERS" );
+       $conf->DBtempTS_ora     = importPost( "DBtempTS_ora", "TEMP" );
+
+       $conf->ShellLocale = getShellLocale( $conf->LanguageCode );
 
 /* Check for validity */
 $errs = array();
 
-if( $conf->Sitename == "" || $conf->Sitename == "MediaWiki" || $conf->Sitename == "Mediawiki" ) {
-       $errs["Sitename"] = "Must not be blank or \"MediaWiki\"";
+if( preg_match( '/^$|^mediawiki$|#/i', $conf->Sitename ) ) {
+       $errs["Sitename"] = "Must not be blank or \"MediaWiki\" and may not contain \"#\"";
 }
 if( $conf->DBuser == "" ) {
        $errs["DBuser"] = "Must not be blank";
 }
-if( $conf->DBpassword == "" ) {
+if( ($conf->DBtype == 'mysql') && (strlen($conf->DBuser) > 16) ) {
+       $errs["DBuser"] = "Username too long";
+}
+if( $conf->DBpassword == "" && $conf->DBtype != "postgres" ) {
        $errs["DBpassword"] = "Must not be blank";
 }
 if( $conf->DBpassword != $conf->DBpassword2 ) {
@@ -537,23 +679,74 @@ if( $conf->DBpassword != $conf->DBpassword2 ) {
 }
 if( !preg_match( '/^[A-Za-z_0-9]*$/', $conf->DBprefix ) ) {
        $errs["DBprefix"] = "Invalid table prefix";
+} else {
+       untaint( $conf->DBprefix, TC_MYSQL );
 }
-
-if( $conf->SysopPass == "" ) {
-       $errs["SysopPass"] = "Must not be blank";
+if( !preg_match( '/^[A-Za-z_0-9]*$/', $conf->DBprefix_ora ) ) {
+       $errs["DBprefix_ora"] = "Invalid table prefix";
 }
-if( $conf->SysopPass != $conf->SysopPass2 ) {
-       $errs["SysopPass2"] = "Passwords don't match!";
+
+error_reporting( E_ALL );
+
+/**
+ * Initialise $wgLang and $wgContLang to something so we can
+ * call case-folding methods. Per Brion, this is English for
+ * now, although we could be clever and initialise to the
+ * user-selected language.
+ */
+$wgContLang = Language::factory( 'en' );
+$wgLang = $wgContLang;
+
+/**
+ * We're messing about with users, so we need a stub
+ * authentication plugin...
+ */
+$wgAuth = new AuthPlugin();
+
+/**
+ * Validate the initial administrator account; username,
+ * password checks, etc.
+ */
+if( $conf->SysopName ) {
+       # Check that the user can be created
+       $u = User::newFromName( $conf->SysopName );
+       if( is_a($u, 'User') ) { // please do not use instanceof, it breaks PHP4
+               # Various password checks
+               if( $conf->SysopPass != '' ) {
+                       if( $conf->SysopPass == $conf->SysopPass2 ) {
+                               if( $u->isValidPassword( $conf->SysopPass ) !== true ) {
+                                       $errs['SysopPass'] = "Bad password";
+                               }
+                       } else {
+                               $errs['SysopPass2'] = "Passwords don't match";
+                       }
+               } else {
+                       $errs['SysopPass'] = "Cannot be blank";
+               }
+               unset( $u );
+       } else {
+               $errs['SysopName'] = "Bad username";
+       }
 }
 
 $conf->License = importRequest( "License", "none" );
-if( $conf->License == "gfdl" ) {
-       $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+if( $conf->License == "gfdl1_2" ) {
+       $conf->RightsUrl = "http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt";
        $conf->RightsText = "GNU Free Documentation License 1.2";
-       $conf->RightsCode = "gfdl";
+       $conf->RightsCode = "gfdl1_2";
+       $conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
+} elseif( $conf->License == "gfdl1_3" ) {
+       $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+       $conf->RightsText = "GNU Free Documentation License 1.3";
+       $conf->RightsCode = "gfdl1_3";
        $conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
 } elseif( $conf->License == "none" ) {
        $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
+} elseif( $conf->License == "pd" ) {
+       $conf->RightsUrl = "http://creativecommons.org/licenses/publicdomain/";
+       $conf->RightsText = "Public Domain";
+       $conf->RightsCode = "pd";
+       $conf->RightsIcon = '${wgScriptPath}/skins/common/images/public-domain.png';
 } else {
        $conf->RightsUrl = importRequest( "RightsUrl", "" );
        $conf->RightsText = importRequest( "RightsText", "" );
@@ -567,7 +760,7 @@ $conf->MCServers = importRequest( "MCServers" );
 /* Test memcached servers */
 
 if ( $conf->Shm == 'memcached' && $conf->MCServers ) {
-       $conf->MCServerArray = array_map( 'trim', explode( ',', $conf->MCServers ) );
+       $conf->MCServerArray = wfArrayMap( 'trim', explode( ',', $conf->MCServers ) );
        foreach ( $conf->MCServerArray as $server ) {
                $error = testMemcachedServer( $server );
                if ( $error ) {
@@ -599,13 +792,12 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                chdir( ".." );
                $ok = eval( $local );
                if( $ok === false ) {
-                       dieout( "Errors in generated configuration; " .
+                       dieout( "<p>Errors in generated configuration; " .
                                "most likely due to a bug in the installer... " .
-                               "Config file was: " .
+                               "Config file was: </p>" .
                                "<pre>" .
                                htmlspecialchars( $local ) .
-                               "</pre>" .
-                               "</ul>" );
+                               "</pre>" );
                }
                $conf->DBtypename = '';
                foreach (array_keys($ourdb) as $db) {
@@ -621,7 +813,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $errs["DBtype"] = "Unknown database type '$conf->DBtype'";
                        continue;
                }
-               print "<li>Database type: {$conf->DBtypename}</li>\n";
+               print "<li>Database type: " . htmlspecialchars( $conf->DBtypename ) . "</li>\n";
                $dbclass = 'Database'.ucfirst($conf->DBtype);
                $wgDBtype = $conf->DBtype;
                $wgDBadminuser = "root";
@@ -635,15 +827,32 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                $wgDBmwschema  = $conf->DBmwschema;
                $wgDBts2schema = $conf->DBts2schema;
 
+               if( $conf->DBprefix2 != '' ) {
+                       // For MSSQL
+                       $wgDBprefix = $conf->DBprefix2;
+               } elseif( $conf->DBprefix_ora != '' ) {
+                       // For Oracle
+                       $wgDBprefix = $conf->DBprefix_ora;
+               }
+
+               ## DB2 specific:
+               $wgDBcataloged = $conf->DBcataloged;
+               
                $wgCommandLineMode = true;
+               if (! defined ( 'STDERR' ) )
+                       define( 'STDERR', fopen("php://stderr", "wb"));
                $wgUseDatabaseMessages = false; /* FIXME: For database failure */
-               require_once( "includes/Setup.php" );
+               require_once( "$IP/includes/Setup.php" );
+               Language::getLocalisationCache()->disableBackend();
+               
                chdir( "config" );
 
                $wgTitle = Title::newFromText( "Installation script" );
                error_reporting( E_ALL );
-               print "<li>Loading class: $dbclass";
-               $dbc = new $dbclass;
+               print "<li>Loading class: " . htmlspecialchars( $dbclass ) . "</li>\n";
+               if ( $conf->DBtype != 'sqlite' ) {
+                       $dbc = new $dbclass;
+               }
 
                if( $conf->DBtype == 'mysql' ) {
                        $mysqlOldClient = version_compare( mysql_get_client_info(), "4.1.0", "lt" );
@@ -666,7 +875,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        }
 
                        # Attempt to connect
-                       echo( "<li>Attempting to connect to database server as $db_user..." );
+                       echo( "<li>Attempting to connect to database server as " . htmlspecialchars( $db_user ) . "..." );
                        $wgDatabase = Database::newFromParams( $wgDBserver, $db_user, $db_pass, '', 1 );
 
                        # Check the connection and respond to errors
@@ -701,48 +910,156 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                        case 2003:
                                        default:
                                                # General connection problem
-                                               echo( "failed with error [$errno] $errtx.</li>\n" );
+                                               echo( htmlspecialchars( "failed with error [$errno] $errtx." ) . "</li>\n" );
                                                $errs["DBserver"] = "Connection failed";
                                                break;
                                } # switch
                        } #conn. att.
 
                        if( !$ok ) { continue; }
+               }
+               else if( $conf->DBtype == 'ibm_db2' ) {
+                       if( $useRoot ) {
+                               $db_user = $conf->RootUser;
+                               $db_pass = $conf->RootPW;
+                       } else {
+                               $db_user = $wgDBuser;
+                               $db_pass = $wgDBpassword;
+                       }
+                       
+                       echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . 
+                               "\" as \"" . htmlspecialchars( $db_user ) . "\"..." );
+                       $wgDatabase = $dbc->newFromParams($wgDBserver, $db_user, $db_pass, $wgDBname, 1);
+                       if (!$wgDatabase->isOpen()) {
+                               print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
+                       } else {
+                               $myver = $wgDatabase->getServerVersion();
+                       }
+                       if (is_callable(array($wgDatabase, 'initial_setup'))) $wgDatabase->initial_setup('', $wgDBname);
 
-               } else /* not mysql */ {
+               } elseif ( $conf->DBtype == 'sqlite' ) {
+                       if ("$wgSQLiteDataDir" == '') {
+                               $wgSQLiteDataDir = dirname($_SERVER['DOCUMENT_ROOT']).'/data';
+                       }
+                       echo "<li>Attempting to connect to SQLite database at \"" . 
+                               htmlspecialchars( $wgSQLiteDataDir ) .  "\"";
+                       if ( !is_dir( $wgSQLiteDataDir ) ) {
+                               if ( is_writable( dirname( $wgSQLiteDataDir ) ) ) {
+                                       $ok = wfMkdirParents( $wgSQLiteDataDir, $wgSQLiteDataDirMode );
+                               } else {
+                                       $ok = false;
+                               }
+                               if ( !$ok ) {
+                                       echo ": cannot create data directory</li>";
+                                       $errs['SQLiteDataDir'] = 'Enter a valid data directory';
+                                       continue;
+                               }
+                       }
+                       if ( !is_writable( $wgSQLiteDataDir ) ) {
+                               echo ": data directory not writable</li>";
+                               $errs['SQLiteDataDir'] = 'Enter a writable data directory';
+                               continue;
+                       }
+                       $dataFile = "$wgSQLiteDataDir/$wgDBname.sqlite";
+                       if ( file_exists( $dataFile ) && !is_writable( $dataFile ) ) {
+                               echo ": data file not writable</li>";
+                               $errs['SQLiteDataDir'] = "$wgDBname.sqlite is not writable";
+                               continue;
+                       }
+                       $wgDatabase = new DatabaseSqlite( false, false, false, $wgDBname, 1 );
+                       if (!$wgDatabase->isOpen()) {
+                               print ": error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
+                               $errs['SQLiteDataDir'] = 'Could not connect to database';
+                               continue;
+                       } else {
+                               $myver = $wgDatabase->getServerVersion();
+                       }
+                       if (is_callable(array($wgDatabase, 'initial_setup'))) $wgDatabase->initial_setup('', $wgDBname);
+                       echo "ok</li>\n";
+               } elseif ( $conf->DBtype == 'oracle' ) {
+                       echo "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) ."\"</li>";
+                       $wgDatabase = $dbc->newFromParams('DUMMY', $wgDBuser, $wgDBpassword, $wgDBname, 1);
+                       if (!$wgDatabase->isOpen()) {
+                               $ok = true;
+                               echo "<li>Connect failed.</li>";
+                               if ($useRoot) {
+                                       if (ini_get('oci8.privileged_connect') === false) {
+                                               echo "<li>Privileged connect disabled, please set oci8.privileged_connect or run maintenance/ora/user.sql script manually prior to continuing.</li>";
+                                               $ok = false;
+                                       } else {
+                                               $wgDBadminuser = $conf->RootUser;
+                                               $wgDBadminpassword = $conf->RootPW;
+                                               echo "<li>Attempting to create DB user.</li>";
+                                               $wgDatabase = $dbc->newFromParams('DUMMY', $wgDBadminuser, $wgDBadminpassword, $wgDBname, 1, 64);
+                                               if ($wgDatabase->isOpen()) {
+                                                       $wgDBOracleDefTS = $conf->DBdefTS_ora;
+                                                       $wgDBOracleTempTS = $conf->DBtempTS_ora;
+                                                       $wgDatabase->sourceFile( "../maintenance/ora/user.sql"  );
+                                               } else {
+                                                       echo "<li>Invalid database superuser, please supply a valid superuser account.</li>";
+                                                       echo "<li>ERR: ".print_r(oci_error(), true)."</li>";
+                                                       $ok = false;
+                                               }
+                                       }
+                               } else {
+                                       echo "<li>Database superuser missing, please supply a valid superuser account.</li>";
+                                       $ok = false;
+                               }
+                               if (!$ok) {
+                                       $errs["RootUser"] = "Check username";
+                                       $errs["RootPW"] = "and password";
+                               } else {
+                                       echo "<li>Attempting to connect to database with new user \"" . htmlspecialchars( $wgDBname ) ."\"</li>";
+                                       $wgDatabase = $dbc->newFromParams('DUMMY', $wgDBuser, $wgDBpassword, $wgDBname, 1);
+                               }
+                       }
+                       if ($ok) {
+                               $myver = $wgDatabase->getServerVersion();
+                       }
+               } else { # not mysql
                        error_reporting( E_ALL );
                        $wgSuperUser = '';
                        ## Possible connect as a superuser
-                       if( $conf->Root ) {
+                       // Changed !mysql to postgres check since it seems to only apply to postgres
+                       if( $useRoot && $conf->DBtype == 'postgres' ) {
                                $wgDBsuperuser = $conf->RootUser;
-                               echo( "<li>Attempting to connect to database \"postgres\" as superuser \"$wgDBsuperuser\"..." );
+                               echo( "<li>Attempting to connect to database \"postgres\" as superuser \"" . 
+                                       htmlspecialchars( $wgDBsuperuser ) . "\"..." );
                                $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBsuperuser, $conf->RootPW, "postgres", 1);
                                if (!$wgDatabase->isOpen()) {
-                                       print " error: " . $wgDatabase->lastError() . "</li>\n";
+                                       print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
                                        $errs["DBserver"] = "Could not connect to database as superuser";
                                        $errs["RootUser"] = "Check username";
                                        $errs["RootPW"] = "and password";
                                        continue;
                                }
+                               $wgDatabase->initial_setup($conf->RootPW, 'postgres');
                        }
-                       echo( "<li>Attempting to connect to database \"$wgDBname\" as \"$wgDBuser\"..." );
+                       echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . 
+                               "\" as \"" . htmlspecialchars( $wgDBuser ) . "\"..." );
                        $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1);
                        if (!$wgDatabase->isOpen()) {
-                               print " error: " . $wgDatabase->lastError() . "</li>\n";
+                               print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
+                               $errs["DBserver"] = "Could not connect to database as user";
+                               $errs["DBuser"] = "Check username";
+                               $errs["DBpassword"] = "and password";
+                               continue;
                        } else {
                                $myver = $wgDatabase->getServerVersion();
                        }
-               }
+                       if (is_callable(array($wgDatabase, 'initial_setup'))) $wgDatabase->initial_setup('', $wgDBname);
+               } 
 
                if ( !$wgDatabase->isOpen() ) {
                        $errs["DBserver"] = "Couldn't connect to database";
                        continue;
                }
 
-               print "<li>Connected to $myver";
+               print "<li>Connected to " . htmlspecialchars( "{$conf->DBtype} $myver" );
                if ($conf->DBtype == 'mysql') {
                        if( version_compare( $myver, "4.0.14" ) < 0 ) {
-                               dieout( " -- mysql 4.0.14 or later required. Aborting." );
+                               print "</li>\n";
+                               dieout( "-- mysql 4.0.14 or later required. Aborting." );
                        }
                        $mysqlNewAuth = version_compare( $myver, "4.1.0", "ge" );
                        if( $mysqlNewAuth && $mysqlOldClient ) {
@@ -781,7 +1098,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                        print "<li>Couldn't create database <tt>" .
                                                htmlspecialchars( $wgDBname ) .
                                                "</tt>; try with root access or check your username/pass.</li>\n";
-                                       $errs["RootPW"] = "&lt;- Enter";
+                                       $errs["RootPW"] = "<- Enter";
                                        continue;
                                }
                                print "<li>Created database <tt>" . htmlspecialchars( $wgDBname ) . "</tt></li>\n";
@@ -789,58 +1106,108 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $wgDatabase->selectDB( $wgDBname );
                }
                else if ($conf->DBtype == 'postgres') {
-                       if( version_compare( $myver, "PostgreSQL 8.0" ) < 0 ) {
-                               dieout( " <b>Postgres 8.0 or later is required</b>. Aborting.</li></ul>" );
+                       if( version_compare( $myver, "8.0" ) < 0 ) {
+                               dieout( "<b>Postgres 8.0 or later is required</b>. Aborting." );
                        }
                }
 
                if( $wgDatabase->tableExists( "cur" ) || $wgDatabase->tableExists( "revision" ) ) {
                        print "<li>There are already MediaWiki tables in this database. Checking if updates are needed...</li>\n";
 
-                       # Create user if required (todo: other databases)
-                       if ( $conf->Root && $conf->DBtype == 'mysql') {
-                               $conn = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
-                               if ( $conn->isOpen() ) {
-                                       print "<li>DB user account ok</li>\n";
-                                       $conn->close();
-                               } else {
-                                       print "<li>Granting user permissions...";
-                                       if( $mysqlOldClient && $mysqlNewAuth ) {
-                                               print " <b class='error'>If the next step fails, see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
+                       if ( $conf->DBtype == 'mysql') {
+                               # Determine existing default character set
+                               if ( $wgDatabase->tableExists( "revision" ) ) {
+                                       $revision = $wgDatabase->escapeLike( $conf->DBprefix . 'revision' );
+                                       $res = $wgDatabase->query( "SHOW TABLE STATUS LIKE '$revision'" );
+                                       $row = $wgDatabase->fetchObject( $res );
+                                       if ( !$row ) {
+                                               echo "<li>SHOW TABLE STATUS query failed!</li>\n";
+                                               $existingSchema = false;
+                                               $existingEngine = false;
+                                       } else {
+                                               if ( preg_match( '/^latin1/', $row->Collation ) ) {
+                                                       $existingSchema = 'mysql4';
+                                               } elseif ( preg_match( '/^utf8/', $row->Collation ) ) {
+                                                       $existingSchema = 'mysql5';
+                                               } elseif ( preg_match( '/^binary/', $row->Collation ) ) {
+                                                       $existingSchema = 'mysql5-binary';
+                                               } else {
+                                                       $existingSchema = false;
+                                                       echo "<li><strong>Warning:</strong> Unrecognised existing collation</li>\n";
+                                               }
+                                               if ( isset( $row->Engine ) ) {
+                                                       $existingEngine = $row->Engine;
+                                               } else {
+                                                       $existingEngine = $row->Type;
+                                               }
+                                       }
+                                       if ( $existingSchema && $existingSchema != $conf->DBschema ) {
+                                               $encExisting = htmlspecialchars( $existingSchema );
+                                               $encRequested = htmlspecialchars( $conf->DBschema );
+                                               print "<li><strong>Warning:</strong> you requested the $encRequested schema, " .
+                                                       "but the existing database has the $encExisting schema. This upgrade script ". 
+                                                       "can't convert it, so it will remain $encExisting.</li>\n";
+                                               $conf->setSchema( $existingSchema, $conf->DBengine );
+                                       }
+                                       if ( $existingEngine && $existingEngine != $conf->DBengine ) {
+                                               $encExisting = htmlspecialchars( $existingEngine );
+                                               $encRequested = htmlspecialchars( $conf->DBengine );
+                                               print "<li><strong>Warning:</strong> you requested the $encRequested storage " .
+                                                       "engine, but the existing database uses the $encExisting engine. This upgrade " .
+                                                       "script can't convert it, so it will remain $encExisting.</li>\n";
+                                               $conf->setSchema( $conf->DBschema, $existingEngine );
+                                       }
+                               }
+
+                               # Create user if required
+                               if ( $conf->Root ) {
+                                       $conn = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
+                                       if ( $conn->isOpen() ) {
+                                               print "<li>DB user account ok</li>\n";
+                                               $conn->close();
+                                       } else {
+                                               print "<li>Granting user permissions...";
+                                               if( $mysqlOldClient && $mysqlNewAuth ) {
+                                                       print " <b class='error'>If the next step fails, see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
+                                               }
+                                               print "</li>\n";
+                                               $wgDatabase->sourceFile( "../maintenance/users.sql" );
                                        }
-                                       print "</li>\n";
-                                       dbsource( "../maintenance/users.sql", $wgDatabase );
                                }
                        }
-                       print "<pre>\n";
+                       print "</ul><pre>\n";
                        chdir( ".." );
                        flush();
                        do_all_updates();
                        chdir( "config" );
                        print "</pre>\n";
-                       print "<li>Finished update checks.</li>\n";
+                       print "<ul><li>Finished update checks.</li>\n";
                } else {
+                       # Determine available storage engines if possible
+                       if ( $conf->DBtype == 'mysql' && version_compare( $myver, "4.1.2", "ge" ) ) {
+                               $res = $wgDatabase->query( 'SHOW ENGINES' );
+                               $found = false;
+                               while ( $row = $wgDatabase->fetchObject( $res ) ) {
+                                       if ( $row->Engine == $conf->DBengine && ( $row->Support == 'YES' || $row->Support == 'DEFAULT' ) ) {
+                                               $found = true;
+                                               break;
+                                       }
+                               }
+                               $wgDatabase->freeResult( $res );
+                               if ( !$found && $conf->DBengine != 'MyISAM' ) {
+                                       echo "<li><strong>Warning:</strong> " . htmlspecialchars( $conf->DBengine ) . 
+                                               " storage engine not available, " .
+                                               "using MyISAM instead</li>\n";
+                                       $conf->setSchema( $conf->DBschema, 'MyISAM' );
+                               }
+                       }
+
                        # FIXME: Check for errors
                        print "<li>Creating tables...";
                        if ($conf->DBtype == 'mysql') {
-                               switch( $conf->DBschema ) {
-                               case "mysql4":
-                                       print " using MySQL 4 table defs...";
-                                       dbsource( "../maintenance/tables.sql", $wgDatabase );
-                                       break;
-                               case "mysql5":
-                                       print " using MySQL 5 UTF-8 table defs...";
-                                       dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
-                                       break;
-                               case "mysql5-binary":
-                                       print " using MySQL 5 binary table defs...";
-                                       dbsource( "../maintenance/mysql5/tables-binary.sql", $wgDatabase );
-                                       break;
-                               default:
-                                       dieout( " <b>invalid schema selection!</b></li>" );
-                               }
-                               dbsource( "../maintenance/interwiki.sql", $wgDatabase );
-                       } else if ($conf->DBtype == 'postgres') {
+                               $wgDatabase->sourceFile( "../maintenance/tables.sql" );
+                               $wgDatabase->sourceFile( "../maintenance/interwiki.sql" );
+                       } elseif (is_callable(array($wgDatabase, 'setup_database'))) {
                                $wgDatabase->setup_database();
                        }
                        else {
@@ -850,12 +1217,16 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 
                        print " done.</li>\n";
 
-                       print "<li>Initializing data...</li>\n";
+                       print "<li>Initializing statistics...</li>\n";
                        $wgDatabase->insert( 'site_stats',
                                array ( 'ss_row_id'        => 1,
                                                'ss_total_views'   => 0,
-                                               'ss_total_edits'   => 0,
-                                               'ss_good_articles' => 0 ) );
+                                               'ss_total_edits'   => 1, # Main page first edit
+                                               'ss_good_articles' => 0, # Main page is not a good article - no internal link
+                                               'ss_total_pages'   => 1, # Main page
+                                               'ss_users'         => $conf->SysopName ? 1 : 0, # Sysop account, if created
+                                               'ss_admins'        => $conf->SysopName ? 1 : 0, # Sysop account, if created
+                                               'ss_images'        => 0 ) );
 
                        # Set up the "regular user" account *if we can, and if we need to*
                        if( $conf->Root and $conf->DBtype == 'mysql') {
@@ -864,11 +1235,11 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                if( $wgDatabase2->isOpen() ) {
                                        # Nope, just close the test connection and continue
                                        $wgDatabase2->close();
-                                       echo( "<li>User $wgDBuser exists. Skipping grants.</li>\n" );
+                                       echo( "<li>User " . htmlspecialchars( $wgDBuser ) . " exists. Skipping grants.</li>\n" );
                                } else {
                                        # Yes, so run the grants
-                                       echo( "<li>Granting user permissions to $wgDBuser on $wgDBname..." );
-                                       dbsource( "../maintenance/users.sql", $wgDatabase );
+                                       echo( "<li>" . htmlspecialchars( "Granting user permissions to $wgDBuser on $wgDBname..." ) );
+                                       $wgDatabase->sourceFile( "../maintenance/users.sql" );
                                        echo( "success.</li>\n" );
                                }
                        }
@@ -908,37 +1279,38 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $revid = $revision->insertOn( $wgDatabase );
                        $article->updateRevisionOn( $wgDatabase, $revision );
                }
+               // Now that all database work is done, make sure everything is committed
+               $wgDatabase->commit();
 
                /* Write out the config file now that all is well */
                print "<li style=\"list-style: none\">\n";
                print "<p>Creating LocalSettings.php...</p>\n\n";
-               $localSettings = "<" . "?php$endl$local$endl\r\n";
+               $localSettings = "<" . "?php$endl$local";
                // Fix up a common line-ending problem (due to CVS on Windows)
                $localSettings = str_replace( "\r\n", "\n", $localSettings );
                $f = fopen( "LocalSettings.php", 'xt' );
 
                if( $f == false ) {
+                       print( "</li>\n" );
                        dieout( "<p>Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a file of that name here...</p>\n" .
                        "<p>Here's the file that would have been written, try to paste it into place manually:</p>\n" .
                        "<pre>\n" . htmlspecialchars( $localSettings ) . "</pre>\n" );
                }
                if(fwrite( $f, $localSettings ) ) {
                        fclose( $f );
+                       print "<hr/>\n";
                        writeSuccessMessage();
+                       print "</li>\n";
                } else {
                        fclose( $f );
-                       die("<p class='error'>An error occured while writing the config/LocalSettings.php file. Check user rights and disk space then try again.</p>\n");
-
+                       dieout( "<p class='error'>An error occured while writing the config/LocalSettings.php file. Check user rights and disk space then try again.</p></li>\n" );
                }
-               print "</li>\n";
 
        } while( false );
 }
-?>
-</ul>
-
 
-<?php
+print "</ul>\n";
+$mainListOpened = false;
 
 if( count( $errs ) ) {
        /* Display options form */
@@ -948,41 +1320,34 @@ if( count( $errs ) ) {
        }
 ?>
 
-<form action="index.php" name="config" method="post">
-
+<form action="<?php echo defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php'; ?>" name="config" method="post">
 
 <h2>Site config</h2>
 
 <div class="config-section">
        <div class="config-input">
-               <?php
-               aField( $conf, "Sitename", "Wiki name:" );
-               ?>
+               <?php aField( $conf, "Sitename", "Wiki name:" ); ?>
        </div>
        <p class="config-desc">
                Preferably a short word without punctuation, i.e. "Wikipedia".<br />
                Will appear as the namespace name for "meta" pages, and throughout the interface.
        </p>
-
-       <div class="config-input">
-               <?php
-               aField( $conf, "EmergencyContact", "Contact e-mail:" );
-               ?>
-       </div>
+       <div class="config-input"><?php aField( $conf, "EmergencyContact", "Contact e-mail:" ); ?></div>
        <p class="config-desc">
                Displayed to users in some error messages, used as the return address for password reminders, and used as the default sender address of e-mail notifications.
        </p>
 
        <div class="config-input">
                <label class='column' for="LanguageCode">Language:</label>
-               <select id="LanguageCode" name="LanguageCode">
-
-               <?php
+               <select id="LanguageCode" name="LanguageCode"><?php
                        $list = getLanguageList();
                        foreach( $list as $code => $name ) {
                                $sel = ($code == $conf->LanguageCode) ? 'selected="selected"' : '';
-                               echo "\t\t<option value=\"$code\" $sel>$name</option>\n";
+                               $encCode = htmlspecialchars( $code );
+                               $encName = htmlspecialchars( $name );
+                               echo "\n\t\t<option value=\"$encCode\" $sel>$encName</option>";
                        }
+                       echo "\n";
                ?>
                </select>
        </div>
@@ -995,23 +1360,25 @@ if( count( $errs ) ) {
 
                <ul class="plain">
                <li><?php aField( $conf, "License", "No license metadata", "radio", "none" ); ?></li>
-               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li>
+               <li><?php aField( $conf, "License", "Public Domain", "radio", "pd" ); ?></li>
+               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2", "radio", "gfdl1_2" ); ?></li>
+               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.3", "radio", "gfdl1_3" ); ?></li>
                <li><?php
                        aField( $conf, "License", "A Creative Commons license - ", "radio", "cc" );
                        $partner = "MediaWiki";
-                       $exit = urlencode( "$wgServer{$conf->ScriptPath}/config/index.php?License=cc&RightsUrl=[license_url]&RightsText=[license_name]&RightsCode=[license_code]&RightsIcon=[license_button]" );
+   $script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
+                       $exit = urlencode( "$wgServer{$conf->ScriptPath}/config/$script?License=cc&RightsUrl=[license_url]&RightsText=[license_name]&RightsCode=[license_code]&RightsIcon=[license_button]" );
                        $icon = urlencode( "$wgServer$wgUploadPath/wiki.png" );
                        $ccApp = htmlspecialchars( "http://creativecommons.org/license/?partner=$partner&exit_url=$exit&partner_icon_url=$icon" );
                        print "<a href=\"$ccApp\" target='_blank'>choose</a>";
-                       ?>
-               <?php if( $conf->License == "cc" ) { ?>
+                       if( $conf->License == "cc" ) { ?>
                        <ul>
-                               <li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='(Creative Commons icon)' />", "hidden" ); ?></li>
-                               <li><?php aField( $conf, "RightsText", htmlspecialchars( $conf->RightsText ), "hidden" ); ?></li>
-                               <li><?php aField( $conf, "RightsCode", "code: " . htmlspecialchars( $conf->RightsCode ), "hidden" ); ?></li>
-                               <li><?php aField( $conf, "RightsUrl", "<a href=\"" . htmlspecialchars( $conf->RightsUrl ) . "\">" . htmlspecialchars( $conf->RightsUrl ) . "</a>", "hidden" ); ?></li>
+                       <li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='(Creative Commons icon)' />", "hidden" ); ?></li>
+                       <li><?php aField( $conf, "RightsText", htmlspecialchars( $conf->RightsText ), "hidden" ); ?></li>
+                       <li><?php aField( $conf, "RightsCode", "code: " . htmlspecialchars( $conf->RightsCode ), "hidden" ); ?></li>
+                       <li><?php aField( $conf, "RightsUrl", "<a href=\"" . htmlspecialchars( $conf->RightsUrl ) . "\">" . htmlspecialchars( $conf->RightsUrl ) . "</a>", "hidden" ); ?></li>
                        </ul>
-               <?php } ?>
+                       <?php } ?>
                        </li>
                </ul>
        </div>
@@ -1032,10 +1399,12 @@ if( count( $errs ) ) {
        <p class="config-desc">
                An admin can lock/delete pages, block users from editing, and do other maintenance tasks.<br />
                A new account will be added only when creating a new wiki database.
+               <br /><br />
+               The password cannot be the same as the username.
        </p>
 
        <div class="config-input">
-               <label class='column'>Shared memory caching:</label>
+               <label class='column'>Object caching:</label>
 
                <ul class="plain">
                <li><?php aField( $conf, "Shm", "No caching", "radio", "none" ); ?></li>
@@ -1043,16 +1412,26 @@ if( count( $errs ) ) {
                        if ( $conf->turck ) {
                                echo "<li>";
                                aField( $conf, "Shm", "Turck MMCache", "radio", "turck" );
-                               echo "</li>";
+                               echo "</li>\n";
+                       }
+                       if( $conf->xcache ) {
+                               echo "<li>";
+                               aField( $conf, 'Shm', 'XCache', 'radio', 'xcache' );
+                               echo "</li>\n";
                        }
                        if ( $conf->apc ) {
                                echo "<li>";
                                aField( $conf, "Shm", "APC", "radio", "apc" );
-                               echo "</li>";
+                               echo "</li>\n";
                        }
                        if ( $conf->eaccel ) {
                                echo "<li>";
                                aField( $conf, "Shm", "eAccelerator", "radio", "eaccel" );
+                               echo "</li>\n";
+                       }
+                       if ( $conf->dba ) {
+                               echo "<li>";
+                               aField( $conf, "Shm", "DBA (not recommended)", "radio", "dba" );
                                echo "</li>";
                        }
                ?>
@@ -1061,10 +1440,14 @@ if( count( $errs ) ) {
                <div style="clear:left"><?php aField( $conf, "MCServers", "Memcached servers:", "text" ) ?></div>
        </div>
        <p class="config-desc">
-               Using a shared memory system such as Turck MMCache, APC, eAccelerator, or Memcached 
-               will speed up MediaWiki significantly. Memcached is the best solution but needs to be
-               installed. Specify the server addresses and ports in a comma-separated list. Only
-               use Turck shared memory if the wiki will be running on a single Apache server.
+               An object caching system such as memcached will provide a significant performance boost,
+               but needs to be installed. Provide the server addresses and ports in a comma-separated list.
+               <br /><br />
+               MediaWiki can also detect and support eAccelerator, Turck MMCache, APC, and XCache, but
+               these should not be used if the wiki will be running on multiple application servers.
+               <br/><br/>
+               DBA (Berkeley-style DB) is generally slower than using no cache at all, and is only 
+               recommended for testing.
        </p>
 </div>
 
@@ -1119,7 +1502,7 @@ if( count( $errs ) ) {
        </div>
        <div class="config-desc">
                <p>If this option is enabled, users have to confirm their e-mail address using a magic link sent to them whenever they set or change it, and only authenticated e-mail addresses can receive mails from other users and/or
-               change notification mails. Setting this option is <B>recommended</B> for public wikis because of potential abuse of the e-mail features above.</p>
+               change notification mails. Setting this option is <b>recommended</b> for public wikis because of potential abuse of the e-mail features above.</p>
        </div>
 
 </div>
@@ -1128,30 +1511,28 @@ if( count( $errs ) ) {
 
 <div class="config-section">
 <div class="config-input">
-               <label class='column'>Database type:</label>
-<?php if (isset($errs['DBpicktype'])) print "<span class='error'>$errs[DBpicktype]</span>\n"; ?>
-               <ul class='plain'><?php database_picker($conf) ?></ul>
+       <label class='column'>Database type:</label>
+<?php 
+       if (isset($errs['DBpicktype'])) {
+               print "\t<span class='error'>" . htmlspecialchars( $errs['DBpicktype'] ) . "</span>\n";
+       }
+?>
+       <ul class='plain'><?php 
+               database_picker($conf); 
+       ?></ul>
        </div>
 
-       <div class="config-input" style="clear:left"><?php
-               aField( $conf, "DBserver", "Database host:" );
-       ?></div>
+       <div class="config-input" style="clear:left">
+       <?php aField( $conf, "DBserver", "Database host:" ); ?>
+       </div>
        <p class="config-desc">
                If your database server isn't on your web server, enter the name or IP address here.
        </p>
 
-       <div class="config-input"><?php
-               aField( $conf, "DBname", "Database name:" );
-       ?></div>
-       <div class="config-input"><?php
-               aField( $conf, "DBuser", "DB username:" );
-       ?></div>
-       <div class="config-input"><?php
-               aField( $conf, "DBpassword", "DB password:", "password" );
-       ?></div>
-       <div class="config-input"><?php
-               aField( $conf, "DBpassword2", "DB password confirm:", "password" );
-       ?></div>
+       <div class="config-input"><?php aField( $conf, "DBname", "Database name:" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBuser", "DB username:" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBpassword", "DB password:", "password" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBpassword2", "DB password confirm:", "password" ); ?></div>
        <p class="config-desc">
                If you only have a single user account and database available,
                enter those here. If you have database root access (see below)
@@ -1162,19 +1543,13 @@ if( count( $errs ) ) {
 
        <div class="config-input">
                <label class="column">Superuser account:</label>
-               <input type="checkbox" name="useroot" id="useroot" <?php if( $useRoot ) { ?>checked="checked" <?php } ?>/>
+               <input type="checkbox" name="useroot" id="useroot" <?php if( $useRoot ) { ?>checked="checked" <?php } ?> />
                &nbsp;<label for="useroot">Use superuser account</label>
+               <input type="checkbox" name="populateadmin" id="populateadmin" <?php if( $conf->populateadmin ) { ?>checked="checked" <?php } ?> />
+               &nbsp;<label for="populateadmin">Set as admin user for maintenance</label>
        </div>
-       <div class="config-input">
-               <?php
-               aField( $conf, "RootUser", "Superuser name:", "superuser" );
-               ?>
-       </div>
-       <div class="config-input">
-               <?php
-               aField( $conf, "RootPW", "Superuser password:", "password" );
-               ?>
-       </div>
+       <div class="config-input"><?php aField( $conf, "RootUser", "Superuser name:", "text" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "RootPW", "Superuser password:", "password" ); ?></div>
 
        <p class="config-desc">
                If the database user specified above does not exist, or does not have access to create
@@ -1183,9 +1558,7 @@ if( count( $errs ) ) {
        </p>
 
        <?php database_switcher('mysql'); ?>
-       <div class="config-input"><?php
-               aField( $conf, "DBprefix", "Database table prefix:" );
-       ?></div>
+       <div class="config-input"><?php aField( $conf, "DBprefix", "Database table prefix:" ); ?></div>
        <div class="config-desc">
                <p>If you need to share one database between multiple wikis, or
                between MediaWiki and another web application, you may choose to
@@ -1194,84 +1567,162 @@ if( count( $errs ) ) {
                <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
        </div>
 
-       <div class="config-input"><label class="column">Database charset</label>
+       <div class="config-input"><label class="column">Storage Engine</label>
                <div>Select one:</div>
                <ul class="plain">
-               <li><?php aField( $conf, "DBschema", "Backwards-compatible UTF-8", "radio", "mysql4" ); ?></li>
-               <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li>
-               <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li>
+               <li><?php aField( $conf, "DBengine", "InnoDB", "radio", "InnoDB" ); ?></li>
+               <li><?php aField( $conf, "DBengine", "MyISAM", "radio", "MyISAM" ); ?></li>
                </ul>
        </div>
        <p class="config-desc">
-               <b>EXPERIMENTAL:</b> You can enable explicit Unicode charset support
-               for MySQL 4.1 and 5.0 servers. This is not well tested and may
-               cause things to break. <b>If upgrading an older installation, leave
-               in backwards-compatible mode.</b>
+               InnoDB is best for public web installations, since it has good concurrency 
+               support. MyISAM may be faster in single-user installations. MyISAM databases 
+               tend to get corrupted more often than InnoDB databases.
        </p>
+       <div class="config-input"><label class="column">Database character set</label>
+               <div>Select one:</div>
+               <ul class="plain">
+               <li><?php aField( $conf, "DBschema", "MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li>
+               <li><?php aField( $conf, "DBschema", "MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li>
+               <li><?php aField( $conf, "DBschema", "MySQL 4.0 backwards-compatible UTF-8", "radio", "mysql4" ); ?></li>
+               </ul>
        </div>
+       <p class="config-desc">
+               This option is ignored on upgrade, the same character set will be kept. 
+               <br/><br/>
+               <b>WARNING:</b> If you use <b>backwards-compatible UTF-8</b> on MySQL 4.1+, and subsequently back up the database with <tt>mysqldump</tt>, it may destroy all non-ASCII characters, irreversibly corrupting your backups!.
+               <br/><br/>
+               In <b>binary mode</b>, MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters. In <b>UTF-8 mode</b>, MySQL will know what character set your data is in, and can present and convert it appropriately, but it won't let you store characters above the <a target="_blank" href="http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes">Basic Multilingual Plane</a>.
+       </p>
+       </fieldset>
 
        <?php database_switcher('postgres'); ?>
+       <div class="config-input"><?php aField( $conf, "DBport", "Database port:" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBmwschema", "Schema for mediawiki:" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBts2schema", "Schema for tsearch2:" ); ?></div>
+       <div class="config-desc">
+               <p>The username specified above (at "DB username") will have its search path set to the above schemas, 
+               so it is recommended that you create a new user. The above schemas are generally correct: 
+        only change them if you are sure you need to.</p>
+       </div>
+       </fieldset>
+
+       <?php database_switcher('sqlite'); ?>
+       <div class="config-desc">
+               <b>NOTE:</b> SQLite only uses the <i>Database name</i> setting above, the user, password and root settings are ignored.
+       </div>
        <div class="config-input"><?php
-               aField( $conf, "DBport", "Database port:" );
+               aField( $conf, "SQLiteDataDir", "SQLite data directory:" );
        ?></div>
+       <div class="config-desc">
+               <p>SQLite stores table data into files in the filesystem.
+               If you do not provide an explicit path, a "data" directory in
+               the parent of your document root will be used.</p>
+               
+               <p>This directory must exist and be writable by the web server.</p>
+       </div>
+       </fieldset>
+
+       <?php database_switcher('mssql'); ?>
        <div class="config-input"><?php
-               aField( $conf, "DBmwschema", "Schema for mediawiki:" );
+               aField( $conf, "DBprefix2", "Database table prefix:" );
        ?></div>
+       <div class="config-desc">
+               <p>If you need to share one database between multiple wikis, or
+               between MediaWiki and another web application, you may choose to
+               add a prefix to all the table names to avoid conflicts.</p>
+
+               <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
+       </div>
+       </fieldset>
+       
+       <?php database_switcher('ibm_db2'); ?>
        <div class="config-input"><?php
-               aField( $conf, "DBts2schema", "Schema for tsearch2:" );
+               aField( $conf, "DBport_db2", "Database port:" );
+       ?></div>
+       <div class="config-input"><?php
+               aField( $conf, "DBmwschema", "Schema for mediawiki:" );
        ?></div>
+       <div>Select one:</div>
+               <ul class="plain">
+               <li><?php aField( $conf, "DBcataloged", "Cataloged (DB2 installed locally)", "radio", "cataloged" ); ?></li>
+               <li><?php aField( $conf, "DBcataloged", "Uncataloged (remote DB2 through ODBC)", "radio", "uncataloged" ); ?></li>
+               </ul>
        <div class="config-desc">
-               <p>The username specified above (at "DB username") will have its search path set to the above schemas, 
-               so it is recommended that you create a new user. The above schemas are generally correct: 
-        only change them if you are sure you need to.</p>
+               <p>If you need to share one database between multiple wikis, or
+               between MediaWiki and another web application, you may specify
+               a different schema to avoid conflicts.</p>
        </div>
+       </fieldset>
+
+       <?php database_switcher('oracle'); ?>
+       <div class="config-input"><?php aField( $conf, "DBprefix_ora", "Database table prefix:" ); ?></div>
+       <div class="config-desc">
+               <p>If you need to share one database between multiple wikis, or
+               between MediaWiki and another web application, you may choose to
+               add a prefix to all the table names to avoid conflicts.</p>
+
+               <p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
        </div>
+       <div class="config-input"><?php aField( $conf, "DBdefTS_ora", "Default tablespace:" ); ?></div>
+       <div class="config-input"><?php aField( $conf, "DBtempTS_ora", "Temporary tablespace:" ); ?></div>
+       </fieldset>
 
        <div class="config-input" style="padding:2em 0 3em">
                <label class='column'>&nbsp;</label>
                <input type="submit" value="Install MediaWiki!" class="btn-install" />
        </div>
-
 </div>
-
+</form>
 <script type="text/javascript">
-window.onload = toggleDBarea('<?php echo $conf->DBtype; ?>',
+window.onload = toggleDBarea( <?php echo Xml::encodeJsVar( $conf->DBtype ); ?>,
 <?php
        ## If they passed in a root user name, don't populate it on page load
        echo strlen(importPost('RootUser', '')) ? 0 : 1;
 ?>);
 </script>
-
-</form>
-
 <?php
 }
 
 /* -------------------------------------------------------------------------------------- */
 function writeSuccessMessage() {
-       if ( ini_get( 'safe_mode' ) && !ini_get( 'open_basedir' ) ) {
+ $script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
+       if ( wfIniGetBool( 'safe_mode' ) && !ini_get( 'open_basedir' ) ) {
                echo <<<EOT
+<div class="success-box">
 <p>Installation successful!</p>
 <p>To complete the installation, please do the following:
 <ol>
        <li>Download config/LocalSettings.php with your FTP client or file manager</li>
        <li>Upload it to the parent directory</li>
        <li>Delete config/LocalSettings.php</li>
-       <li>Start using <a href='../index.php'>your wiki</a>!
+       <li>Start using <a href='../$script'>your wiki</a>!
 </ol>
 <p>If you are in a shared hosting environment, do <strong>not</strong> just move LocalSettings.php
 remotely. LocalSettings.php is currently owned by the user your webserver is running under,
 which means that anyone on the same server can read your database password! Downloading
 it and uploading it again will hopefully change the ownership to a user ID specific to you.</p>
+</div>
 EOT;
        } else {
-               echo "<p><span style='font-weight:bold;color:green;font-size:110%'>Installation successful!</span> Move the <tt>config/LocalSettings.php</tt> file into the parent directory, then follow
-                       <strong><a href='../index.php'>this link</a></strong> to your wiki.</p>\n";
+               echo <<<EOT
+<div class="success-box">
+<p>
+<span class="success-message">Installation successful!</span>
+Move the <tt>config/LocalSettings.php</tt> file to the parent directory, then follow
+<a href="../$script"> this link</a> to your wiki.</p>
+<p>You should change file permissions for <tt>LocalSettings.php</tt> as required to
+prevent other users on the server reading passwords and altering configuration data.</p>
+</div>
+EOT;
        }
 }
 
 
 function escapePhpString( $string ) {
+       if ( is_array( $string ) || is_object( $string ) ) {
+               return false;
+       }
        return strtr( $string,
                array(
                        "\n" => "\\n",
@@ -1284,25 +1735,35 @@ function escapePhpString( $string ) {
 }
 
 function writeLocalSettings( $conf ) {
-       $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false';
        $conf->PasswordSender = $conf->EmergencyContact;
-       $zlib = ($conf->zlib ? "" : "# ");
        $magic = ($conf->ImageMagick ? "" : "# ");
        $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
        $rights = ($conf->RightsUrl) ? "" : "# ";
        $hashedUploads = $conf->safeMode ? '' : '# ';
 
+       if ( $conf->ShellLocale ) {
+               $locale = '';
+       } else {
+               $locale = '# ';
+               $conf->ShellLocale = 'en_US.UTF-8';
+       }
+
        switch ( $conf->Shm ) {
                case 'memcached':
                        $cacheType = 'CACHE_MEMCACHED';
                        $mcservers = var_export( $conf->MCServerArray, true );
                        break;
                case 'turck':
+               case 'xcache':
                case 'apc':
                case 'eaccel':
                        $cacheType = 'CACHE_ACCEL';
                        $mcservers = 'array()';
                        break;
+               case 'dba':
+                       $cacheType = 'CACHE_DBA';
+                       $mcservers = 'array()';
+                       break;
                default:
                        $cacheType = 'CACHE_NONE';
                        $mcservers = 'array()';
@@ -1346,11 +1807,56 @@ function writeLocalSettings( $conf ) {
        }
 
        # Add slashes to strings for double quoting
-       $slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
-       if( $conf->License == 'gfdl' ) {
+       $slconf = wfArrayMap( "escapePhpString", get_object_vars( $conf ) );
+       if( $conf->License == 'gfdl1_2' || $conf->License == 'pd' || $conf->License == 'gfdl1_3' ) {
                # Needs literal string interpolation for the current style path
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }
+       
+       if( $conf->populateadmin ) {
+               $slconf['DBadminuser'] = $conf->RootUser;
+               $slconf['DBadminpassword'] = $conf->RootPW;
+       }
+
+       if( $conf->DBtype == 'mysql' ) {
+               $dbsettings =
+"# MySQL specific settings
+\$wgDBprefix         = \"{$slconf['DBprefix']}\";
+
+# MySQL table options to use during installation or update
+\$wgDBTableOptions   = \"{$slconf['DBTableOptions']}\";
+
+# Experimental charset support for MySQL 4.1/5.0.
+\$wgDBmysql5 = {$conf->DBmysql5};";
+       } elseif( $conf->DBtype == 'postgres' ) {
+               $dbsettings =
+"# Postgres specific settings
+\$wgDBport           = \"{$slconf['DBport']}\";
+\$wgDBmwschema       = \"{$slconf['DBmwschema']}\";
+\$wgDBts2schema      = \"{$slconf['DBts2schema']}\";";
+       } elseif( $conf->DBtype == 'sqlite' ) {
+               $dbsettings =
+"# SQLite-specific settings
+\$wgSQLiteDataDir    = \"{$slconf['SQLiteDataDir']}\";";
+       } elseif( $conf->DBtype == 'mssql' ) {
+               $dbsettings =
+"# MSSQL specific settings
+\$wgDBprefix         = \"{$slconf['DBprefix2']}\";";
+       } elseif( $conf->DBtype == 'ibm_db2' ) {
+               $dbsettings =
+"# DB2 specific settings
+\$wgDBport_db2       = \"{$slconf['DBport_db2']}\";
+\$wgDBmwschema       = \"{$slconf['DBmwschema']}\";
+\$wgDBcataloged      = \"{$slconf['DBcataloged']}\";";
+       } elseif( $conf->DBtype == 'oracle' ) {
+               $dbsettings =
+"# Oracle specific settings
+\$wgDBprefix         = \"{$slconf['DBprefix']}\";";
+       } else {
+               // ummm... :D
+               $dbsettings = '';
+       }
+
 
        $localsettings = "
 # This file was automatically generated by the MediaWiki installer.
@@ -1360,6 +1866,9 @@ function writeLocalSettings( $conf ) {
 # See includes/DefaultSettings.php for all configurable settings
 # and their default values, but don't forget to make changes in _this_
 # file, not there.
+#
+# Further documentation for configuration settings may be found at:
+# http://www.mediawiki.org/wiki/Manual:Configuration_settings
 
 # If you customize your file layout, set \$IP to the directory that contains
 # the other MediaWiki files. It will be used as a base to locate files.
@@ -1372,58 +1881,49 @@ if( defined( 'MW_INSTALL_PATH' ) ) {
 \$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
 set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_include_path() );
 
-require_once( \"includes/DefaultSettings.php\" );
-
-# If PHP's memory limit is very low, some operations may fail.
-" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . "
+require_once( \"\$IP/includes/DefaultSettings.php\" );
 
 if ( \$wgCommandLineMode ) {
        if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
                die( \"This script must be run from the command line\\n\" );
        }
-} elseif ( empty( \$wgNoOutputBuffer ) ) {
-       ## Compress output if the browser supports it
-       {$zlib}if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
 }
+## Uncomment this to disable output compression
+# \$wgDisableOutputCompression = true;
 
 \$wgSitename         = \"{$slconf['Sitename']}\";
 
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
-\$wgScriptPath       = \"{$slconf['ScriptPath']}\";
-
 ## For more information on customizing the URLs please see:
 ## http://www.mediawiki.org/wiki/Manual:Short_URL
+\$wgScriptPath       = \"{$slconf['ScriptPath']}\";
+\$wgScriptExtension  = \"{$slconf['ScriptExtension']}\";
+
+## UPO means: this is also a user preference option
 
 \$wgEnableEmail      = $enableemail;
-\$wgEnableUserEmail  = $enableuseremail;
+\$wgEnableUserEmail  = $enableuseremail; # UPO
 
 \$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
 \$wgPasswordSender = \"{$slconf['PasswordSender']}\";
 
-## For a detailed description of the following switches see
-## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent
-## There are many more options for fine tuning available see
-## /includes/DefaultSettings.php
-## UPO means: this is also a user preference option
 \$wgEnotifUserTalk = $enotifusertalk; # UPO
 \$wgEnotifWatchlist = $enotifwatchlist; # UPO
 \$wgEmailAuthentication = $eauthent;
 
+## Database settings
 \$wgDBtype           = \"{$slconf['DBtype']}\";
 \$wgDBserver         = \"{$slconf['DBserver']}\";
 \$wgDBname           = \"{$slconf['DBname']}\";
 \$wgDBuser           = \"{$slconf['DBuser']}\";
 \$wgDBpassword       = \"{$slconf['DBpassword']}\";
-\$wgDBport           = \"{$slconf['DBport']}\";
-\$wgDBprefix         = \"{$slconf['DBprefix']}\";
 
-# Schemas for Postgres
-\$wgDBmwschema       = \"{$slconf['DBmwschema']}\";
-\$wgDBts2schema      = \"{$slconf['DBts2schema']}\";
+{$dbsettings}
 
-# Experimental charset support for MySQL 4.1/5.0.
-\$wgDBmysql5 = {$conf->DBmysql5};
+## Database admin settings, used for maintenance scripts
+\$wgDBadminuser     = \"". ($conf->populateadmin ? $slconf['DBadminuser'] : '' )."\";
+\$wgDBadminpassword     = \"". ($conf->populateadmin ? $slconf['DBadminpassword'] : '' )."\";
 
 ## Shared memory settings
 \$wgMainCacheType = $cacheType;
@@ -1432,10 +1932,14 @@ if ( \$wgCommandLineMode ) {
 ## To enable image uploads, make sure the 'images' directory
 ## is writable, then set this to true:
 \$wgEnableUploads       = false;
-\$wgUseImageResize      = {$conf->UseImageResize};
 {$magic}\$wgUseImageMagick = true;
 {$magic}\$wgImageMagickConvertCommand = \"{$convert}\";
 
+## If you use ImageMagick (or any other shell command) on a
+## Linux server, this will need to be set to the name of an
+## available UTF-8 locale
+{$locale}\$wgShellLocale = \"{$slconf['ShellLocale']}\";
+
 ## If you want to use image uploads under safe mode,
 ## create the directories images/archive, images/thumb and
 ## images/temp, and make them all writable. Then uncomment
@@ -1446,11 +1950,16 @@ if ( \$wgCommandLineMode ) {
 ## you can enable inline LaTeX equations:
 \$wgUseTeX           = false;
 
-\$wgLocalInterwiki   = \$wgSitename;
+## Set \$wgCacheDirectory to a writable directory on the web server
+## to make your wiki go slightly faster. The directory should not
+## be publically accessible from the web.
+#\$wgCacheDirectory = \"\$IP/cache\";
+
+\$wgLocalInterwiki   = strtolower( \$wgSitename );
 
 \$wgLanguageCode = \"{$slconf['LanguageCode']}\";
 
-\$wgProxyKey = \"$secretKey\";
+\$wgSecretKey = \"$secretKey\";
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
@@ -1468,11 +1977,12 @@ if ( \$wgCommandLineMode ) {
 
 \$wgDiff3 = \"{$slconf['diff3']}\";
 
+\$wgPhpCliPath = \"{$slconf['phpCliPath']}\";
+
 # When you make changes to this configuration file, this will make
 # sure that cached pages are cleared.
-\$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
-\$wgCacheEpoch = max( \$wgCacheEpoch, \$configdate );
-       "; ## End of setting the $localsettings string
+\$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
+"; ## End of setting the $localsettings string
 
        // Keep things in Unix line endings internally;
        // the system will write out as local text type.
@@ -1480,7 +1990,14 @@ if ( \$wgCommandLineMode ) {
 }
 
 function dieout( $text ) {
-       die( $text . "\n\n</body>\n</html>" );
+       global $mainListOpened;
+       if( $mainListOpened ) echo( "</ul>" );
+       if( $text != '' && substr( $text, 0, 2 ) != '<p'  && substr( $text, 0, 2 ) != '<h' ){
+               echo "<p>$text</p>\n";
+       } else {
+               echo $text;
+       }
+       die( "\n\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>" );
 }
 
 function importVar( &$var, $name, $default = "" ) {
@@ -1492,6 +2009,7 @@ function importVar( &$var, $name, $default = "" ) {
        } else {
                $retval = $default;
        }
+       taint( $retval );
        return $retval;
 }
 
@@ -1507,10 +2025,8 @@ function importRequest( $name, $default = "" ) {
        return importVar( $_REQUEST, $name, $default );
 }
 
-$radioCount = 0;
-
 function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick = '' ) {
-       global $radioCount;
+       static $radioCount = 0;
        if( $type != "" ) {
                $xtype = "type=\"$type\"";
        } else {
@@ -1523,10 +2039,8 @@ function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick =
        if ($type == 'radio')
                $id .= $radioCount++;
 
-       if( $nolabel ) {
-               echo "\t\t<label>";
-       } else {
-               echo "\t\t<label class='column' for=\"$id\">$text</label>\n";
+       if( !$nolabel ) {
+               echo "<label class='column' for=\"$id\">$text</label>";
        }
 
        if( $type == "radio" && $value == $conf->$field ) {
@@ -1534,7 +2048,7 @@ function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick =
        } else {
                $checked = "";
        }
-       echo "\t\t<input $xtype name=\"$field\" id=\"$id\" class=\"iput-$type\" $checked ";
+       echo "<input $xtype name=\"$field\" id=\"$id\" class=\"iput-$type\" $checked ";
        if ($onclick) {
                echo " onclick='toggleDBarea(\"$value\",1)' " ;
        }
@@ -1546,19 +2060,21 @@ function aField( &$conf, $field, $text, $type = "text", $value = "", $onclick =
        }
 
 
-       echo "\" />\n";
+       echo "\" />";
        if( $nolabel ) {
-               echo " $text</label>\n";
+               echo "<label for=\"$id\">$text</label>";
        }
 
        global $errs;
-       if(isset($errs[$field])) echo "<span class='error'>" . $errs[$field] . "</span>\n";
+       if(isset($errs[$field])) {
+               echo "<span class='error'>" . htmlspecialchars( $errs[$field] ) . "</span>\n";
+       }
 }
 
 function getLanguageList() {
-       global $wgLanguageNames;
+       global $wgLanguageNames, $IP;
        if( !isset( $wgLanguageNames ) ) {
-               require_once( "languages/Names.php" );
+               require_once( "$IP/languages/Names.php" );
        }
 
        $codes = array();
@@ -1572,7 +2088,7 @@ function getLanguageList() {
                if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
                        $code = str_replace( '_', '-', strtolower( $m[1] ) );
                        if( isset( $wgLanguageNames[$code] ) ) {
-                               $name = $code . ' - ' . $wgLanguageNames[$code];
+                               $name = wfBCP47( $code ) . ' - ' . $wgLanguageNames[$code];
                        } else {
                                $name = $code;
                        }
@@ -1594,7 +2110,7 @@ function locate_executable($loc, $names, $versioninfo = false) {
 
        foreach ($names as $name) {
                $command = "$loc".DIRECTORY_SEPARATOR."$name";
-               if (file_exists($command)) {
+               if (@file_exists($command)) {
                        if (!$versioninfo)
                                return $command;
 
@@ -1616,7 +2132,6 @@ function testMemcachedServer( $server ) {
        }
        if ( !$errstr && count( $hostport ) != 2 ) {
                $errstr = 'Please specify host and port';
-               var_dump( $hostport );
        }
        if ( !$errstr ) {
                list( $host, $port ) = $hostport;
@@ -1646,7 +2161,7 @@ function testMemcachedServer( $server ) {
                fclose( $fp );
        }
        if ( !$errstr ) {
-               echo "<li>Connected to memcached on $host:$port successfully";
+               echo "<li>Connected to memcached on " . htmlspecialchars( "$host:$port" ) ." successfully</li>";
        }
        return $errstr;
 }
@@ -1656,30 +2171,105 @@ function database_picker($conf) {
        print "\n";
        foreach(array_keys($ourdb) as $db) {
                if ($ourdb[$db]['havedriver']) {
-                       print "<li>";
+                       print "\t<li>";
                        aField( $conf, "DBtype", $ourdb[$db]['fullname'], 'radio', $db, 'onclick');
                        print "</li>\n";
                }
        }
-       print "\n";
+       print "\n\t";
 }
 
 function database_switcher($db) {
        global $ourdb;
        $color = $ourdb[$db]['bgcolor'];
        $full = $ourdb[$db]['fullname'];
-       print "<div id='$db' style='display:none; background: $color'>\n";
-       print "<h3>$full specific options:</h3>\n";
+       print "<fieldset id='$db'><legend>$full specific options</legend>\n";
 }
 
 function printListItem( $item ) {
        print "<li>$item</li>";
 }
 
+# Determine a suitable value for $wgShellLocale
+function getShellLocale( $wikiLang ) {
+       # Give up now if we're in safe mode or open_basedir
+       # It's theoretically possible but tricky to work with
+       if ( wfIniGetBool( "safe_mode" ) || ini_get( 'open_basedir' ) ) {
+               return false;
+       }
+
+       $os = php_uname( 's' );
+       $supported = array( 'Linux', 'SunOS', 'HP-UX' ); # Tested these
+       if ( !in_array( $os, $supported ) ) {
+               return false;
+       }
+
+       # Get a list of available locales
+       $lines = $ret = false;
+       exec( '/usr/bin/locale -a', $lines, $ret );
+       if ( $ret ) {
+               return false;
+       }
+
+       $lines = wfArrayMap( 'trim', $lines );
+       $candidatesByLocale = array();
+       $candidatesByLang = array();
+       foreach ( $lines as $line ) {
+               if ( $line === '' ) {
+                       continue;
+               }
+               if ( !preg_match( '/^([a-zA-Z]+)(_[a-zA-Z]+|)\.(utf8|UTF-8)(@[a-zA-Z_]*|)$/i', $line, $m ) ) {
+                       continue;
+               }
+               list( $all, $lang, $territory, $charset, $modifier ) = $m;
+               $candidatesByLocale[$m[0]] = $m;
+               $candidatesByLang[$lang][] = $m;
+       }
+
+       # Try the current value of LANG
+       if ( isset( $candidatesByLocale[ getenv( 'LANG' ) ] ) ) {
+               return getenv( 'LANG' );
+       }
+
+       # Try the most common ones
+       $commonLocales = array( 'en_US.UTF-8', 'en_US.utf8', 'de_DE.UTF-8', 'de_DE.utf8' );
+       foreach ( $commonLocales as $commonLocale ) {
+               if ( isset( $candidatesByLocale[$commonLocale] ) ) {
+                       return $commonLocale;
+               }
+       }
+
+       # Is there an available locale in the Wiki's language?
+       if ( isset( $candidatesByLang[$wikiLang] ) ) {
+               $m = reset( $candidatesByLang[$wikiLang] );
+               return $m[0];
+       }
+
+       # Are there any at all?
+       if ( count( $candidatesByLocale ) ) {
+               $m = reset( $candidatesByLocale );
+               return $m[0];
+       }
+
+       # Give up
+       return false;
+}
+
+function wfArrayMap( $function, $input ) {
+       $ret = array_map( $function, $input );
+       foreach ( $ret as $key => $value ) {
+               $taint = istainted( $input[$key] );
+               if ( $taint ) {
+                       taint( $ret[$key], $taint );
+               }
+       }
+       return $ret;
+}
+
 ?>
 
        <div class="license">
-       <hr>
+       <hr/>
        <p>This program is free software; you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
         the Free Software Foundation; either version 2 of the License, or
@@ -1702,20 +2292,22 @@ function printListItem( $item ) {
 <div id="column-one">
        <div class="portlet" id="p-logo">
          <a style="background-image: url(../skins/common/images/mediawiki.png);"
-           href="http://www.mediawiki.org/"
+           href="../"
            title="Main Page"></a>
        </div>
        <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
        <div class='portlet'><div class='pBody'>
                <ul>
-                       <li><strong><a href="http://www.mediawiki.org/">MediaWiki home</a></strong></li>
                        <li><a href="../README">Readme</a></li>
                        <li><a href="../RELEASE-NOTES">Release notes</a></li>
                        <li><a href="../docs/">Documentation</a></li>
-                       <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
-                       <li><a href="http://meta.wikimedia.org/wiki/MediaWiki_FAQ">FAQ</a></li>
+                       <li><a href="http://www.mediawiki.org/wiki/Help:Contents">User's Guide</a></li>
+                       <li><a href="http://www.mediawiki.org/wiki/Manual:Contents">Administrator's Guide</a></li>
+                       <li><a href="http://www.mediawiki.org/wiki/Manual:FAQ">FAQ</a></li>
                </ul>
-               <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2007 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+               <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright © 2001-2009 by Magnus Manske, Brion Vibber,
+                Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström,
+                Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz and others.</p>
        </div></div>
 </div>