Set $wgRequestTime so db errors end cleanly; mark Oracle support as experimental.
[lhc/web/wiklou.git] / config / index.php
index c5c65c5..7051b01 100644 (file)
@@ -1,6 +1,7 @@
 <?php
+
 # MediaWiki web-based config/installation
-# Copyright (C) 2004 Brion Vibber <brion@pobox.com>
+# Copyright (C) 2004 Brion Vibber <brion@pobox.com>, 2006 Rob Church <robchur@gmail.com>
 # http://www.mediawiki.org/
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,121 +23,133 @@ error_reporting( E_ALL );
 header( "Content-type: text/html; charset=utf-8" );
 @ini_set( "display_errors", true );
 
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
+# In case of errors, let output be clean.
+$wgRequestTime = microtime();
+
+# 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 );
+define( "MEDIAWIKI_INSTALL", true );
+require_once( "includes/Defines.php" );
+require_once( "includes/DefaultSettings.php" );
+require_once( "includes/MagicWord.php" );
+require_once( "includes/Namespace.php" );
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-       <meta name="robots" content="noindex,nofollow">
-       <title>MediaWiki installation</title>
+       <title>MediaWiki <?php echo( $wgVersion ); ?> Installation</title>
        <style type="text/css">
-       #credit {
-               float: right;
-               width: 200px;
-               font-size: 0.7em;
-               background-color: #eee;
-               color: black;
-               border: solid 1px #444;
-               padding: 8px;
-               margin-left: 8px;
-       }
 
-       dl.setup dd {
-               margin-left: 0;
-       }
-       dl.setup dd label.column {
-               clear: left;
-               font-weight: bold;
-               width: 12em;
-               float: left;
-               text-align: right;
-               padding-right: 1em;
-       }
-       dl.setup dt {
-               clear: left;
-               font-size: 0.8em;
-               margin-left: 10em;
-               /* margin-right: 200px; */
-               margin-bottom: 2em;
-       }
-       .error {
-               color: red;
-       }
-       ul.plain {
-               list-style: none;
-               clear: both;
-               margin-left: 12em;
-       }
-       </style>
-</head>
+               @import "../skins/monobook/main.css";
 
-<body>
+               .env-check {
+                       font-size: 90%;
+                       margin: 1em 0 1em 2.5em;
+               }
 
-<div id="credit">
- <center>
-  <a href="http://www.mediawiki.org/"><img
-    src="../skins/common/images/wiki.png" width="135" height="135" alt="" border="0" /></a>
- </center>
-
- <b><a href="http://www.mediawiki.org/">MediaWiki</a></b> is
- Copyright (C) 2001-2004 by Magnus Manske, Brion Vibber, Lee Daniel Crocker,
- Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
-
- <ul>
- <li><a href="../README">Readme</a></li>
- <li><a href="../RELEASE-NOTES">Release notes</a></li>
- <li><a href="../docs/">doc/</a></li>
- <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
- </ul>
-
- <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
- (at your option) any later version.</p>
-
- <p>This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.</p>
-
- <p>You should have received <a href="../COPYING">a copy of the GNU General Public License</a>
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- or <a href="http://www.gnu.org/copyleft/gpl.html">read it online</a></p>
-</div>
+               .config-section {
+                       margin-top: 2em;
+               }
 
-<?php
+               .config-section label.column {
+                       clear: left;
+                       font-weight: bold;
+                       width: 13em;
+                       float: left;
+                       text-align: right;
+                       padding-right: 1em;
+                       padding-top: .2em;
+               }
 
-$IP = ".."; # Just to suppress notices, not for anything useful
-define( "MEDIAWIKI", true );
-define( "MEDIAWIKI_INSTALL", true );
-require_once( "../includes/Defines.php" );
-require_once( "../includes/DefaultSettings.php" );
-require_once( "../includes/MagicWord.php" );
-require_once( "../includes/Namespace.php" );
-?>
+               .config-input {
+                       clear: left;
+                       zoom: 100%; /* IE hack */
+               }
+
+               .config-section .config-desc {
+                       clear: left;
+                       margin: 0 0 2em 18em;
+                       padding-top: 1em;
+                       font-size: 85%;
+               }
 
-<h1>MediaWiki <?php print $wgVersion ?> installation</h1>
+               .iput-text, .iput-password {
+                       width: 14em;
+                       margin-right: 1em;
+               }
 
+               .error {
+                       color: red;
+                       background-color: #fff;
+                       font-weight: bold;
+                       left: 1em;
+                       font-size: 100%;
+               }
+
+               .error-top {
+                       color: red;
+                       background-color: #FFF0F0;
+                       border: 2px solid        red;
+                       font-size: 130%;
+                       font-weight: bold;
+                       padding: 1em 1.5em;
+                       margin: 2em 0 1em;
+               }
+
+               ul.plain {
+                       list-style-type: none;
+                       list-style-image: none;
+                       float: left;
+                       margin: 0;
+                       padding: 0;
+               }
+
+               .btn-install {
+                       font-weight: bold;
+                       font-size: 110%;
+                       padding: .2em .3em;
+               }
+
+               .license {
+                       font-size: 85%;
+                       padding-top: 3em;
+               }
+
+       </style>
+</head>
+
+<body>
+<div id="globalWrapper">
+<div id="column-content">
+<div id="content">
+<div id="bodyContent">
+
+<h1>MediaWiki <?php print $wgVersion ?> Installation</h1>
 
 <?php
 
 /* Check for existing configurations and bug out! */
 
-if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) {
-       dieout( "<h2>Wiki is configured.</h2>
+if( file_exists( "../LocalSettings.php" ) ) {
+       dieout( "       <p><strong>Setup has completed, <a href='../index.php'>your wiki</a> is configured.</strong></p>
 
-       <p>Already configured... <a href='../index.php'>return to the wiki</a>.</p>
-
-       <p>(You should probably remove this directory for added security.)</p>" );
+       <p>Please delete the /config directory for extra security.</p></div></div></div></div>" );
 }
 
-if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) {
-       dieout( "<h2>You're configured!</h2>
+if( file_exists( "./LocalSettings.php" ) ) {
+       writeSuccessMessage();
 
-       <p>Please move <tt>LocalSettings.php</tt> to the parent directory, then
-       <a href='../index.php'>try out your wiki</a>.
-       (You should remove this config directory for added security once you're done.)</p>" );
+       dieout( '' );
 }
 
 if( !is_writable( "." ) ) {
@@ -156,20 +169,13 @@ if( !is_writable( "." ) ) {
 }
 
 
-require_once( "../install-utils.inc" );
-require_once( "../maintenance/updaters.inc" );
-require_once( "../maintenance/convertLinks.inc" );
-require_once( "../maintenance/archives/moveCustomMessages.inc" );
+require_once( "install-utils.inc" );
+require_once( "maintenance/updaters.inc" );
 
 class ConfigData {
        function getEncoded( $data ) {
-               # Hackish
-               global $wgUseLatin1;
-               if( $wgUseLatin1 ) {
-                       return utf8_decode( $data ); /* to latin1 wikis */
-               } else {
-                       return $data;
-               }
+               # removing latin1 support, no need...
+               return $data;
        }
        function getSitename() { return $this->getEncoded( $this->Sitename ); }
        function getSysopName() { return $this->getEncoded( $this->SysopName ); }
@@ -178,39 +184,71 @@ class ConfigData {
 
 ?>
 
-<p><i>Please include all of the lines below when reporting installation problems.</i></p>
-
 <h2>Checking environment...</h2>
-<ul>
+<p><em>Please include all of the lines below when reporting installation problems.</em></p>
+<ul class="env-check">
 <?php
 $endl = "
 ";
-$wgConfiguring = true;
+$wgNoOutputBuffer = true;
 $conf = new ConfigData;
 
 install_version_checks();
 
-print "<li>PHP " . phpversion() . ": ok</li>\n";
+print "<li>PHP " . phpversion() . " installed</li>\n";
 
 if( ini_get( "register_globals" ) ) {
        ?>
-       <li><b class='error'>Warning:</b> <b>PHP's
-       <tt><a href="http://php.net/register_globals">register_globals</a></tt>
-       option is enabled.</b> MediaWiki will work correctly, but this setting
-       increases your exposure to potential security vulnerabilities in PHP-based
-       software running on your server. <b>You should disable it if you are able.</b></li>
+       <li>
+               <div style="font-size:110%">
+               <strong class="error">Warning:</strong>
+               <strong>PHP's   <tt><a href="http://php.net/register_globals">register_globals</a></tt> option is enabled. Disable it if you can.</strong>
+               </div>
+               MediaWiki will work, but your server is more exposed to PHP-based security vulnerabilities.
+       </li>
+       <?php
+}
+
+$fatal = false;
+
+if( ini_get( "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.
        <?php
 }
 
+if( ini_get( "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.
+       <?php
+}
+
+if( ini_get( "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.
+       <?php
+}
+
+if( $fatal ) {
+       dieout( "</ul><p>Cannot install MediaWiki.</p>" );
+}
+
 if( ini_get( "safe_mode" ) ) {
+       $conf->safeMode = true;
        ?>
-       <li class='error'><b>Warning: PHP's
-       <a href='http://www.php.net/features.safe-mode'>safe mode</a> is active!</b>
-       You will likely have problems caused by this. You may need to make the
-       'images' subdirectory writable or specify a TMP environment variable pointing to
-       a writable temporary directory owned by you, since safe mode breaks the system
-       temporary directory.</li>
+       <li><b class='error'>Warning:</b> <strong>PHP's
+       <a href='http://www.php.net/features.safe-mode'>safe mode</a> is active.</strong>
+       You may have problems caused by this, particularly if using image uploads.
+       </li>
        <?php
+} else {
+       $conf->safeMode = false;
 }
 
 $sapi = php_sapi_name();
@@ -221,14 +259,15 @@ case "apache":
 case "apache2handler":
        print "ok, using pretty URLs (<tt>index.php/Page_Title</tt>)";
        break;
+default:
+       print "unknown; ";
 case "cgi":
 case "cgi-fcgi":
 case "apache2filter":
+case "isapi":
        print "using ugly URLs (<tt>index.php?title=Page_Title</tt>)";
        $conf->prettyURLs = false;
        break;
-default:
-       print "unknown; using pretty URLs (<tt>index.php/Page_Title</tt>), if you have trouble change this in <tt>LocalSettings.php</tt>";
 }
 print "</li>\n";
 
@@ -243,13 +282,13 @@ if( $conf->xml ) {
 
 $memlimit = ini_get( "memory_limit" );
 $conf->raiseMemory = false;
-if( empty( $memlimit ) ) {
+if( empty( $memlimit ) || $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 ) . ". <b>If this is too low, installation may fail!</b> ";
-       $n = IntVal( $memlimit );
+       print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ) . ". <strong>If this is too low, installation may fail!</strong> ";
+       $n = intval( $memlimit );
        if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
-               $n = IntVal( $m[1] * (1024*1024) );
+               $n = intval( $m[1] * (1024*1024) );
        }
        if( $n < 20*1024*1024 ) {
                print "Attempting to raise limit to 20M... ";
@@ -273,11 +312,35 @@ if( $conf->zlib ) {
 $conf->turck = function_exists( 'mmcache_get' );
 if ( $conf->turck ) {
        print "<li><a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> installed</li>\n";
-} else {
-       print "<li><a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> not installed, " .
+}
+$conf->eaccel = function_exists( 'eaccelerator_get' );
+if ( $conf->eaccel ) {
+    $conf->turck = 'eaccelerator';
+    print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
+}
+if (!$conf->turck && !$conf->eaccel) {
+       print "<li>Neither <a href=\"http://turck-mmcache.sourceforge.net/\">Turck MMCache</a> nor <a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> are installed, " .
          "can't use object caching functions</li>\n";
 }
 
+$conf->diff3 = false;
+$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH"));
+$diff3names = array("gdiff3", "diff3", "diff3.exe");
+
+$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');
+foreach ($diff3locations as $loc) {
+       $exe = locate_executable($loc, $diff3names, $diff3versioninfo);
+       if ($exe !== false) {
+               $conf->diff3 = $exe;
+               break;
+       }
+}
+
+if ($conf->diff3)
+       print "<li>Found GNU diff3: <tt>$conf->diff3</tt>.</li>";
+else
+       print "<li>GNU diff3 not found.</li>";
+
 $conf->ImageMagick = false;
 $imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
 foreach( $imcheck as $dir ) {
@@ -304,25 +367,30 @@ if( $conf->HaveGD ) {
 
 $conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
 
-# $conf->IP = "/Users/brion/Sites/inplace";
 $conf->IP = dirname( dirname( __FILE__ ) );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
-# $conf->ScriptPath = "/~brion/inplace";
-$conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $_SERVER["REQUEST_URI"] );
+$conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $_SERVER["PHP_SELF"] ); # was SCRIPT_NAME
 print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</tt></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");
 
        $conf->Sitename = ucfirst( importPost( "Sitename", "" ) );
-       $conf->EmergencyContact = importPost( "EmergencyContact", $_SERVER["SERVER_ADMIN"] );
+       $defaultEmail = empty( $_SERVER["SERVER_ADMIN"] )
+               ? 'root@localhost'
+               : $_SERVER["SERVER_ADMIN"];
+       $conf->EmergencyContact = importPost( "EmergencyContact", $defaultEmail );
+       $conf->DBtype = importPost( "DBtype", "mysql" );
        $conf->DBserver = importPost( "DBserver", "localhost" );
        $conf->DBname = importPost( "DBname", "wikidb" );
        $conf->DBuser = importPost( "DBuser", "wikiuser" );
        $conf->DBpassword = importPost( "DBpassword" );
        $conf->DBpassword2 = importPost( "DBpassword2" );
        $conf->DBprefix = importPost( "DBprefix" );
-       $conf->RootPW = importPost( "RootPW" );
+       $conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
+       $conf->RootUser = importPost( "RootUser", "root" );
+       $conf->RootPW = importPost( "RootPW", "-" );
        $conf->LanguageCode = importPost( "LanguageCode", "en" );
        $conf->SysopName = importPost( "SysopName", "WikiSysop" );
        $conf->SysopPass = importPost( "SysopPass" );
@@ -332,7 +400,7 @@ print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</t
 $errs = array();
 
 if( $conf->Sitename == "" || $conf->Sitename == "MediaWiki" || $conf->Sitename == "Mediawiki" ) {
-       $errs["Sitename"] = "Must not be blank or \"MediaWiki\".";
+       $errs["Sitename"] = "Must not be blank or \"MediaWiki\"";
 }
 if( $conf->DBuser == "" ) {
        $errs["DBuser"] = "Must not be blank";
@@ -387,15 +455,32 @@ if ( $conf->Shm == 'memcached' && $conf->MCServers ) {
        $errs["MCServers"] = "Please specify at least one server if you wish to use memcached";
 }
 
+/* default values for installation */
+$conf->Email   =importRequest("Email", "email_enabled");
+$conf->Emailuser=importRequest("Emailuser", "emailuser_enabled");
+$conf->Enotif  =importRequest("Enotif", "enotif_allpages");
+$conf->Eauthent        =importRequest("Eauthent", "eauthent_enabled");
+
 if( $conf->posted && ( 0 == count( $errs ) ) ) {
        do { /* So we can 'continue' to end prematurely */
                $conf->Root = ($conf->RootPW != "");
 
                /* Load up the settings and get installin' */
                $local = writeLocalSettings( $conf );
+               echo "<p><b>Generating configuration file...</b></p>\n";
+               echo "<pre>" . htmlspecialchars( $local ) . "</pre>\n";
+               
                $wgCommandLineMode = false;
                chdir( ".." );
                eval($local);
+               if (!in_array($conf->DBtype, array("mysql", "oracle"))) {
+                       $errs["DBtype"] = "Unknown database type.";
+                       continue;
+               }
+               print "<li>Database type: {$conf->DBtype}</li>\n";
+               $dbclass = 'Database'.ucfirst($conf->DBtype);
+               require_once("$dbclass.php");
+               $wgDBtype = $conf->DBtype;
                $wgDBadminuser = "root";
                $wgDBadminpassword = $conf->RootPW;
                $wgDBprefix = $conf->DBprefix;
@@ -404,58 +489,87 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                require_once( "includes/Setup.php" );
                chdir( "config" );
 
-               require_once( "../maintenance/InitialiseMessages.inc" );
+               require_once( "maintenance/InitialiseMessages.inc" );
 
                $wgTitle = Title::newFromText( "Installation script" );
-               $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
-               $wgDatabase->mIgnoreErrors = true;
+               $mysqlOldClient = version_compare( mysql_get_client_info(), "4.1.0", "lt" );
+               if( $mysqlOldClient ) {
+                       print "<li><b>PHP is linked with old MySQL client libraries. If you are
+                               using a MySQL 4.1 server and have problems connecting to the database,
+                               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></li>\n";
+               }
+               $dbc = new $dbclass;
+               
+               if( $conf->DBtype == 'mysql' ) {
+                       $ok = true; # Let's be optimistic
+                       
+                       # Decide if we're going to use the superuser or the regular database user
+                       if( $conf->RootPW == '-' ) {
+                               # Regular user
+                               $conf->Root = false;
+                               $db_user = $wgDBuser;
+                               $db_pass = $wgDBpassword;
+                       } else {
+                               # Superuser
+                               $conf->Root = true;
+                               $db_user = $conf->RootUser;
+                               $db_pass = $conf->RootPW;
+                       }
+                       
+                       # Attempt to connect
+                       echo( "<li>Attempting to connect to database server as $db_user..." );
+                       $wgDatabase = Database::newFromParams( $wgDBserver, $db_user, $db_pass, '', 1 );
+                       
+                       # Check the connection and respond to errors
+                       if( $wgDatabase->isOpen() ) {
+                               # Seems OK
+                               $ok = true;
+                               $wgDBadminuser = $db_user;
+                               $wgDBadminpassword = $db_pass;
+                               echo( "success.</li>\n" );
+                               $wgDatabase->ignoreErrors( true );
+                               $myver = mysql_get_server_info( $wgDatabase->mConn );
+                       } else {
+                               # There were errors, report them and back out
+                               $ok = false;
+                               $errno = mysql_errno();
+                               $errtx = htmlspecialchars( mysql_error() );
+                               switch( $errno ) {
+                                       case 1045:
+                                       case 2000:
+                                               echo( "failed due to authentication errors. Check passwords.</li>" );
+                                               if( $conf->Root ) {
+                                                       # The superuser details are wrong
+                                                       $errs["RootUser"] = "Check username";
+                                                       $errs["RootPW"] = "and password";
+                                               } else {
+                                                       # The regular user details are wrong
+                                                       $errs["DBuser"] = "Check username";
+                                                       $errs["DBpassword"] = "and password";
+                                               }
+                                               break;
+                                       case 2002:
+                                       case 2003:
+                                       default:
+                                               # General connection problem
+                                               echo( "failed with error [$errno] $errtx.</li>\n" );
+                                               $errs["DBserver"] = "Connection failed";
+                                               break;
+                               } # switch
+                       } #conn. att.
+               
+                       if( !$ok ) { continue; }
 
-               @$myver = mysql_get_server_info( $wgDatabase->mConn );
-               if( $myver ) {
-                       $conf->Root = true;
-                       print "<li>Connected as root (automatic)</li>\n";
-               } else {
-                       print "<li>MySQL error " . ($err = mysql_errno() ) .
-                               ": " . htmlspecialchars( mysql_error() );
-                       $ok = false;
-                       switch( $err ) {
-                       case 1045:
-                       case 2000:
-                               if( $conf->Root ) {
-                                       $errs["RootPW"] = "Check password";
-                               } else {
-                                       print "<li>Trying regular user...\n";
-                                       /* Try the regular user... */
-                                       $wgDBadminuser = $wgDBuser;
-                                       $wgDBadminpassword = $wgDBpassword;
-                                       $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
-                                       $wgDatabase->isOpen();
-                                       $wgDatabase->mIgnoreErrors = true;
-                                       @$myver = mysql_get_server_info( $wgDatabase->mConn );
-                                       if( !$myver ) {
-                                               $errs["DBuser"] = "Check name/pass";
-                                               $errs["DBpassword"] = "or enter root";
-                                               $errs["DBpassword2"] = "password below";
-                                               $errs["RootPW"] = "Got root?";
-                                               print " need password.</li>\n";
-                                       } else {
-                                               $conf->Root = false;
-                                               $conf->RootPW = "";
-                                               print " ok.</li>\n";
-                                               # And keep going...
-                                               $ok = true;
-                                       }
-                                       break;
-                               }
-                       case 2002:
-                       case 2003:
-                               $errs["DBserver"] = "Connection failed";
-                               break;
-                       default:
-                               $errs["DBserver"] = "Couldn't connect to database";
-                               break;
+               } else /* not mysql */ {
+                       print "<li>Connecting to SQL server...";
+                       $wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1);
+                       if (!$wgDatabase->isOpen()) {
+                               print " error: " . $wgDatabase->lastError() . "</li>\n";
+                       } else {
+                               $wgDatabase->ignoreErrors(true);
+                               $myver = get_db_version();
                        }
-                       if( !$ok ) continue;
                }
 
                if ( !$wgDatabase->isOpen() ) {
@@ -463,34 +577,54 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        continue;
                }
 
-               print "<li>Connected to database... $myver";
-               if( version_compare( $myver, "4.0.0" ) >= 0 ) {
-                       print "; enabling MySQL 4 enhancements";
-                       $conf->DBmysql4 = true;
-                       $local = writeLocalSettings( $conf );
+               print "<li>Connected to $myver";
+               if( version_compare( $myver, "4.0.0" ) < 0 ) {
+                       die( " -- mysql 4.0 or later required. Aborting." );
+               }
+               $mysqlNewAuth   = version_compare( $myver, "4.1.0", "ge" );
+               if( $mysqlNewAuth && $mysqlOldClient ) {
+                       print "; <b class='error'>You are using MySQL 4.1 server, but PHP is linked
+                               to old client libraries; if you have trouble with authentication, 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( $wgDBmysql5 ) {
+                       if( $mysqlNewAuth ) {
+                               print "; enabling MySQL 4.1/5.0 charset mode";
+                       } else {
+                               print "; <b class='error'>MySQL 4.1/5.0 charset mode enabled,
+                                       but older version detected; will likely fail.</b>";
+                       }
                }
                print "</li>\n";
 
-               @$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
-               if( $sel ) {
-                       print "<li>Database <tt>" . htmlspecialchars( $wgDBname ) . "</tt> exists</li>\n";
-               } else {
-                       $res = $wgDatabase->query( "CREATE DATABASE `$wgDBname`" );
-                       if( !$res ) {
-                               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";
-                               continue;
+               if ($conf->DBtype == 'mysql') {
+                       @$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
+                       if( $sel ) {
+                               print "<li>Database <tt>" . htmlspecialchars( $wgDBname ) . "</tt> exists</li>\n";
+                       } else {
+                               $err = mysql_errno();
+                               if ( $err != 1049 ) {
+                                       print "<ul><li>Error selecting database $wgDBname: $err " .
+                                               htmlspecialchars( mysql_error() ) . "</li></ul>";
+                                       continue;
+                               }
+                               $res = $wgDatabase->query( "CREATE DATABASE `$wgDBname`" );
+                               if( !$res ) {
+                                       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";
+                                       continue;
+                               }
+                               print "<li>Created database <tt>" . htmlspecialchars( $wgDBname ) . "</tt></li>\n";
                        }
-                       print "<li>Created database <tt>" . htmlspecialchars( $wgDBname ) . "</tt></li>\n";
+                       $wgDatabase->selectDB( $wgDBname );
                }
 
-               $wgDatabase->selectDB( $wgDBname );
-
-               if( $wgDatabase->tableExists( "cur" ) ) {
+               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
                        if ( $conf->Root ) {
                                $conn = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
@@ -498,7 +632,11 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                        print "<li>DB user account ok</li>\n";
                                        $conn->close();
                                } else {
-                                       print "<li>Granting user permissions...</li>\n";
+                                       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";
                                        dbsource( "../maintenance/users.sql", $wgDatabase );
                                }
                        }
@@ -513,9 +651,20 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                } else {
                        # FIXME: Check for errors
                        print "<li>Creating tables...";
-                       dbsource( "../maintenance/tables.sql", $wgDatabase );
-                       dbsource( "../maintenance/interwiki.sql", $wgDatabase );
-                       dbsource( "../maintenance/archives/patch-userlevels-defaultgroups.sql", $wgDatabase );
+                       if ($conf->DBtype == 'mysql') {
+                               if( $wgDBmysql5 ) {
+                                       print " using MySQL 5 table defs...";
+                                       dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
+                               } else {
+                                       print " using MySQL 4 table defs...";
+                                       dbsource( "../maintenance/tables.sql", $wgDatabase );
+                               }
+                               dbsource( "../maintenance/interwiki.sql", $wgDatabase );
+                       } else {
+                               dbsource( "../maintenance/oracle/tables.sql", $wgDatabase );
+                               dbsource( "../maintenance/oracle/interwiki.sql", $wgDatabase );
+                       }
+
                        print " done.</li>\n";
 
                        print "<li>Initializing data...";
@@ -524,20 +673,33 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                       'ss_total_views'   => 0,
                                       'ss_total_edits'   => 0,
                                       'ss_good_articles' => 0 ) );
-                       # setting up the db user
+                                          
+                       # Set up the "regular user" account *if we can, and if we need to*
                        if( $conf->Root ) {
-                               print "<li>Granting user permissions...</li>\n";
-                               dbsource( "../maintenance/users.sql", $wgDatabase );
+                               # See if we need to
+                               $wgDatabase2 = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, '', 1 );
+                               if( $wgDatabase2->isOpen() ) {
+                                       # Nope, just close the test connection and continue
+                                       $wgDatabase2->close();
+                                       echo( "<li>User $wgDBuser exists. Skipping grants.</li>" );
+                               } else {
+                                       # Yes, so run the grants
+                                       echo( "<li>Granting user permissions to $wgDBuser on $wgDBname..." );
+                                       dbsource( "../maintenance/users.sql", $wgDatabase );
+                                       echo( "success.</li>" );
+                               }
                        }
-
+                                          
                        if( $conf->SysopName ) {
                                $u = User::newFromName( $conf->getSysopName() );
                                if ( 0 == $u->idForName() ) {
                                        $u->addToDatabase();
                                        $u->setPassword( $conf->getSysopPass() );
-                                       $u->addRight( "sysop" );
-                                       $u->addRight( "bureaucrat" );
                                        $u->saveSettings();
+
+                                       $u->addGroup( "sysop" );
+                                       $u->addGroup( "bureaucrat" );
+
                                        print "<li>Created sysop account <tt>" .
                                                htmlspecialchars( $conf->SysopName ) . "</tt>.</li>\n";
                                } else {
@@ -548,18 +710,17 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        }
 
                        $titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
-                       $now = wfTimestampNow();
-                       $won = wfInvertTimestamp( $now );
-                       $wgDatabase->insert( 'cur',
-                               array( 'cur_namespace'     => $titleobj->getNamespace(),
-                                      'cur_title'         => $titleobj->getDBkey(),
-                                      'cur_text'          => wfMsg( 'mainpagetext' ) . "\n\n" .
-                                                             wfMsg( 'mainpagedocfooter' ),
-                                      'cur_timestamp'     => $now,
-                                      'inverse_timestamp' => $won,
-                                      'cur_touched'       => $now,
-                                      'cur_user'          => 0,
-                                      'cur_user_text'     => 'MediaWiki default' ) );
+                       $article = new Article( $titleobj );
+                       $newid = $article->insertOn( $wgDatabase );
+                       $revision = new Revision( array(
+                               'page'      => $newid,
+                               'text'      => wfMsg( 'mainpagetext' ) . "\n\n" . wfMsg( 'mainpagedocfooter' ),
+                               'comment'   => '',
+                               'user'      => 0,
+                               'user_text' => 'MediaWiki default',
+                               ) );
+                       $revid = $revision->insertOn( $wgDatabase );
+                       $article->updateRevisionOn( $wgDatabase, $revision );
 
                        print "<li><pre>";
                        initialiseMessages();
@@ -569,6 +730,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                /* Write out the config file now that all is well */
                print "<p>Creating LocalSettings.php...</p>\n\n";
                $localSettings =  "<" . "?php$endl$local$endl?" . ">";
+               // Fix up a common line-ending problem (due to CVS on Windows)
+               $localSettings = str_replace( "\r\n", "\n", $localSettings );
 
                if( version_compare( phpversion(), "4.3.2" ) >= 0 ) {
                        $xt = "xt"; # Refuse to overwrite an existing file
@@ -584,13 +747,11 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                }
                if(fwrite( $f, $localSettings ) ) {
                        fclose( $f );
-
-                       print "<p>Success! Move the config/LocalSettings.php file into the parent directory, then follow
-                       <a href='{$conf->ScriptPath}/index.php'>this link</a> to your wiki.</p>\n";
+                       writeSuccessMessage();
                } 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");
-                        
+
                }
 
        } while( false );
@@ -605,43 +766,39 @@ if( count( $errs ) ) {
        /* Display options form */
 
        if( $conf->posted ) {
-               echo "<p class='error'>Something's not quite right yet; make sure everything below is filled out correctly.</p>\n";
+               echo "<p class='error-top'>Something's not quite right yet; make sure everything below is filled out correctly.</p>\n";
        }
 ?>
 
-<form name="config" method="post">
+<form action="index.php" name="config" method="post">
 
 
 <h2>Site config</h2>
 
-<dl class="setup">
-       <dd>
+<div class="config-section">
+       <div class="config-input">
                <?php
-               aField( $conf, "Sitename", "Site name:" );
+               aField( $conf, "Sitename", "Wiki name:" );
                ?>
-       </dd>
-       <dt>
-               Your site name should be a relatively short word. It'll appear as the namespace
-               name for 'meta' pages as well as throughout the user interface. Good site names
-               are things like "<a href="http://www.wikipedia.org/">Wikipedia</a>" and
-               "<a href="http://openfacts.berlios.de/">OpenFacts</a>"; avoid punctuation,
-               which may cause problems.
-       </dt>
-
-       <dd>
+       </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" );
+               aField( $conf, "EmergencyContact", "Contact e-mail:" );
                ?>
-       </dd>
-       <dt>
-               This will be used as the return address for password reminders and
-               may be displayed in some error conditions so visitors can get in
-               touch with you.
-       </dt>
-
-       <dd>
-               <label class='column' for="LanguageCode">Language</label>
+       </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
                        $list = getLanguageList();
                        foreach( $list as $code => $name ) {
@@ -650,30 +807,25 @@ if( count( $errs ) ) {
                        }
                ?>
                </select>
-       </dd>
-       <dt>
-               You may select the language for the user interface of the wiki...
-               Some localizations are less complete than others. This also controls
-               the character encoding; Unicode is more flexible, but Latin-1 may be
-               more compatible with older browsers for some languages. Unicode will
-               be used where not specified otherwise.
-       </dt>
-
-       <dd>
-               <label class='column'>Copyright/license metadata</label>
-               <div>Select one:</div>
+       </div>
+       <p class="config-desc">
+               Select the language for your wiki's interface. Some localizations aren't fully complete. Unicode (UTF-8) used for all localizations.
+       </p>
+
+       <div class="config-input">
+               <label class='column'>Copyright/license:</label>
 
                <ul class="plain">
-               <li><?php aField( $conf, "License", "no license metadata", "radio", "none" ); ?></li>
+               <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", "a Creative Commons license...", "radio", "cc" );
+                       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]" );
                        $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\">choose</a>";
-                       ?> (link will wipe out any other data in this form!)
+                       print "<a href=\"$ccApp\" target='_blank'>choose</a>";
+                       ?>
                <?php if( $conf->License == "cc" ) { ?>
                        <ul>
                                <li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='icon' />", "hidden" ); ?></li>
@@ -684,114 +836,214 @@ if( count( $errs ) ) {
                <?php } ?>
                        </li>
                </ul>
-       </dd>
-       <dt>
-               MediaWiki can include a basic license notice, icon, and machine-readable
-               copyright metadata if your wiki's content is to be licensed under
-               the GNU FDL or a Creative Commons license. If you're not sure, leave
-               it at "none".
-       </dt>
-
-
-       <dd>
-               <?php aField( $conf, "SysopName", "Sysop account name:", "" ) ?>
-       </dd>
-       <dd>
-               <?php aField( $conf, "SysopPass", "password:", "password" ) ?>
-       </dd>
-       <dd>
-               <?php aField( $conf, "SysopPass2", "again:", "password" ) ?>
-       </dd>
-       <dt>
-               A sysop user account can lock or delete pages, block problematic IP
-               addresses from editing, and other maintenance tasks. If creating a new
-               wiki database, a sysop account will be created with the given name
-               and password.
-       </dt>
-
-       <dd>
-               <label class='column'>Shared memory caching</label>
-               <div>Select one:</div>
+       </div>
+       <p class="config-desc">
+               A notice, icon, and machine-readable copyright metadata will be displayed for the license you pick.
+       </p>
+
+
+       <div class="config-input">
+               <?php aField( $conf, "SysopName", "Admin username:" ) ?>
+       </div>
+       <div class="config-input">
+               <?php aField( $conf, "SysopPass", "Password:", "password" ) ?>
+       </div>
+       <div class="config-input">
+               <?php aField( $conf, "SysopPass2", "Password confirm:", "password" ) ?>
+       </div>
+       <p class="config-desc">
+               An admin can lock/delete pages, block users from editing, and other maintenance tasks.<br>
+               A new account will be added only when creating a new wiki database.
+       </p>
+
+       <div class="config-input">
+               <label class='column'>Shared memory caching:</label>
 
                <ul class="plain">
-               <li><?php aField( $conf, "Shm", "no caching", "radio", "none" ); ?></li>
-               <?php 
+               <li><?php aField( $conf, "Shm", "No caching", "radio", "none" ); ?></li>
+               <?php
                        if ( $conf->turck ) {
                                echo "<li>";
                                aField( $conf, "Shm", "Turck MMCache", "radio", "turck" );
                                echo "</li>";
                        }
                ?>
+               <?php
+                       if ( $conf->eaccel ) {
+                               echo "<li>";
+                               aField( $conf, "Shm", "eAccelerator", "radio", "eaccel" );
+                               echo "</li>";
+                       }
+               ?>
                <li><?php aField( $conf, "Shm", "Memcached", "radio", "memcached" ); ?></li>
-               <li><?php aField( $conf, "MCServers", "Memcached servers", "" ) ?></li>
                </ul>
-       </dd>
-       <dt>
-               Using a shared memory system such as Turck MMCache 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-separted list. Only 
+               <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, 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-separted list. Only
                use Turck shared memory if the wiki will be running on a single Apache server.
-       </dl>
+       </p>
+</div>
+
+<h2>E-mail, e-mail notification and authentication setup</h2>
+
+<div class="config-section">
+       <div class="config-input">
+               <label class='column'>E-mail (general):</label>
+               <ul class="plain">
+               <li><?php aField( $conf, "Email", "Enabled", "radio", "email_enabled" ); ?></li>
+               <li><?php aField( $conf, "Email", "Disabled", "radio", "email_disabled" ); ?></li>
+               </ul>
+       </div>
+       <p class="config-desc">
+               Use this to disable all e-mail functions (send a password reminder, user-to-user e-mail and e-mail notification),
+               if sending e-mails on your server doesn't work.
+       </p>
+       <div class="config-input">
+               <label class='column'>User-to-user e-mail:</label>
+               <ul class="plain">
+               <li><?php aField( $conf, "Emailuser", "Enabled", "radio", "emailuser_enabled" ); ?></li>
+               <li><?php aField( $conf, "Emailuser", "Disabled", "radio", "emailuser_disabled" ); ?></li>
+               </ul>
+       </div>
+       <p class="config-desc">
+               Use this to disable only the user-to-user e-mail function (EmailUser).
+       </p>
+       <div class="config-input">
+               <label class='column'>E-mail notification:</label>
+               <ul class="plain">
+               <li><?php aField( $conf, "Enotif", "Disabled", "radio", "enotif_disabled" ); ?></li>
+               <li><?php aField( $conf, "Enotif", "Enabled for user_talk changes only", "radio", "enotif_usertalk" ); ?></li>
+               <li><?php aField( $conf, "Enotif", "Enabled for user_talk and watch list changes (not recommended for large wikis)", "radio", "enotif_allpages" ); ?></li>
+               </ul>
+       </div>
+       <div class="config-desc">
+               <p>
+               E-mail notification sends a notification e-mail to a user, when the user_talk page is changed
+                and/or when watch-listed pages are changed, depending on the above settings.
+               When testing this feature, be reminded, that obviously an e-mail address must be present in your preferences
+               and that your own changes never trigger notifications to be sent to yourself.</p>
+
+               <p>Users get corresponding options to select or deselect in their users' preferences.
+               The user options are not shown on the preference page, if e-mail notification is disabled.</p>
+
+               <p>There are additional options for fine tuning in /includes/DefaultSettings.php .</p>
+       </div>
+
+       <div class="config-input">
+               <label class='column'>E-mail authentication:</label>
+               <ul class="plain">
+               <li><?php aField( $conf, "Eauthent", "Disabled", "radio", "eauthent_disabled" ); ?></li>
+               <li><?php aField( $conf, "Eauthent", "Enabled", "radio", "eauthent_enabled" ); ?></li>
+               </ul>
+       </div>
+       <div class="config-desc">
+               <p>E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or changes his/her stored e-mail address
+               gets a link with a token mailed to that address. The stored e-mail address is authenticated at the moment the user comes back to the wiki via the link.</p>
+
+               <p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated
+               on the user preference page.</p>
+
+               <p>If the option is enabled, only authenticated e-mail addresses can receive EmailUser mails and/or
+               e-mail notification mails.</p>
+       </div>
+
+</div>
 
 <h2>Database config</h2>
 
-<dl class="setup">
-       <dd><?php
-               aField( $conf, "DBserver", "MySQL server" );
-       ?></dd>
-       <dt>
+<div class="config-section">
+<div class="config-input">
+               <label class='column'>Database type:</label>
+               <ul class='plain'>
+                       <li><?php aField( $conf, "DBtype", "MySQL", "radio", "mysql"); ?></li>
+                       <li><?php aField( $conf, "DBtype", "Oracle (experimental)", "radio", "oracle" ); ?></li>
+               </ul>
+       </div>
+
+       <div class="config-input" style="clear:left"><?php
+               aField( $conf, "DBserver", "SQL server host:" );
+       ?></div>
+       <p class="config-desc">
                If your database server isn't on your web server, enter the name
-               or IP address here.
-       </dt>
-
-       <dd><?php
-               aField( $conf, "DBname", "Database name" );
-       ?></dd>
-       <dd><?php
-               aField( $conf, "DBuser", "DB username" );
-       ?></dd>
-       <dd><?php
-               aField( $conf, "DBpassword", "DB password", "password" );
-       ?></dd>
-       <dd><?php
-               aField( $conf, "DBpassword2", "again", "password" );
-       ?></dd>
-       <dt>
+               or IP address here.  MySQL only.
+       </p>
+
+       <div class="config-input"><?php
+               aField( $conf, "DBname", "Database name:" );
+       ?></div>
+       <div class="config-desc">
+               If using Oracle, set this to your connection identifier.
+       </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)
                you can specify new accounts/databases to be created.
-       </dt>
-
-       <dd><?php
-               aField( $conf, "DBprefix", "Database table prefix" );
-       ?></dd>
-       <dt>
+       </p>
+       <p>
+               This account will not be created if it pre-exists. If this is the case, ensure that it
+               has SELECT, INSERT, UPDATE and DELETE permissions on the MediaWiki database.
+       </p>
+
+       <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
                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>
-       </dt>
+       </div>
 
-       <dd>
+       <div class="config-input"><label class="column">Database charset</label>
+               <div>Select one:</div>
+               <ul class="plain">
+               <li><?php aField( $conf, "DBmysql5", "Backwards-compatible UTF-8", "radio", "false" ); ?></li>
+               <li><?php aField( $conf, "DBmysql5", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "true" ); ?></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>
+       </p>
+
+       <div class="config-input">
                <?php
-               aField( $conf, "RootPW", "DB root password", "password" );
+               aField( $conf, "RootUser", "Superuser account:", "superuser" );
                ?>
-       </dd>
-       <dt>
-               You will only need this if the database and/or user account
-               above don't already exist.
-               Do <em>not</em> type in your machine's root password! MySQL
-               has its own "root" user with a separate password. (It might
-               even be blank, depending on your configuration.)
-       </dt>
-
-       <dd>
+       </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
+               the database (if needed) or tables within it, please provide details of a superuser account,
+               such as <strong>root</strong>, which does. Leave the password set to <strong>-</strong> if this is not needed.
+       </p>
+
+       <div class="config-input" style="padding:2em 0 3em">
                <label class='column'>&nbsp;</label>
-               <input type="submit" value="Install!" />
-       </dd>
-</dl>
+               <input type="submit" value="Install MediaWiki!" class="btn-install" />
+       </div>
 
+</div>
 
 </form>
 
@@ -799,14 +1051,29 @@ if( count( $errs ) ) {
 }
 
 /* -------------------------------------------------------------------------------------- */
-
-function writeAdminSettings( $conf ) {
-       return "
-\$wgDBadminuser      = \"{$conf->DBadminuser}\";
-\$wgDBadminpassword  = \"{$conf->DBadminpassword}\";
-";
+function writeSuccessMessage() {
+       if ( ini_get( 'safe_mode' ) && !ini_get( 'open_basedir' ) ) {
+               echo <<<EOT
+<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>!
+</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>
+EOT;
+       } else {
+               echo "<p>Installation successful! Move the config/LocalSettings.php file into the parent directory, then follow
+                       <a href='../index.php'>this link</a> to your wiki.</p>\n";
+       }
 }
 
+
 function escapePhpString( $string ) {
        return strtr( $string,
                array(
@@ -820,50 +1087,66 @@ function escapePhpString( $string ) {
 }
 
 function writeLocalSettings( $conf ) {
-       $conf->DBmysql4 = @$conf->DBmysql4 ? 'true' : 'false';
        $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false';
        $conf->PasswordSender = $conf->EmergencyContact;
-       if( preg_match( '/^([a-z]+)-latin1$/', $conf->LanguageCode, $m ) ) {
-               $conf->LanguageCode = $m[1];
-               $conf->Latin1 = true;
-       } else {
-               $conf->Latin1 = false;
-       }
        $zlib = ($conf->zlib ? "" : "# ");
        $magic = ($conf->ImageMagick ? "" : "# ");
        $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
        $pretty = ($conf->prettyURLs ? "" : "# ");
        $ugly = ($conf->prettyURLs ? "# " : "");
        $rights = ($conf->RightsUrl) ? "" : "# ";
-       
+       $hashedUploads = $conf->safeMode ? '' : '# ';
+
        switch ( $conf->Shm ) {
                case 'memcached':
-                       $memcached = 'true';
-                       $turck = '#';
+                       $cacheType = 'CACHE_MEMCACHED';
                        $mcservers = var_export( $conf->MCServerArray, true );
                        break;
                case 'turck':
-                       $memcached = 'false';
+               case 'eaccel':
+                       $cacheType = 'CACHE_ACCEL';
                        $mcservers = 'array()';
-                       $turck = '';
                        break;
                default:
-                       $memcached = 'false';
+                       $cacheType = 'CACHE_NONE';
                        $mcservers = 'array()';
-                       $turck = '#';
        }
 
+       if ( $conf->Email == 'email_enabled' ) {
+               $enableemail = 'true';
+               $enableuseremail = ( $conf->Emailuser == 'emailuser_enabled' ) ? 'true' : 'false' ;
+               $eauthent = ( $conf->Eauthent == 'eauthent_enabled' ) ? 'true' : 'false' ;
+               switch ( $conf->Enotif ) {
+                       case 'enotif_usertalk':
+                               $enotifusertalk = 'true';
+                               $enotifwatchlist = 'false';
+                               break;
+                       case 'enotif_allpages':
+                               $enotifusertalk = 'true';
+                               $enotifwatchlist = 'true';
+                               break;
+                       default:
+                               $enotifusertalk = 'false';
+                               $enotifwatchlist = 'false';
+               }
+       } else {
+               $enableuseremail = 'false';
+               $enableemail = 'false';
+               $eauthent = 'false';
+               $enotifusertalk = 'false';
+               $enotifwatchlist = 'false';
+       }
 
        $file = @fopen( "/dev/urandom", "r" );
        if ( $file ) {
-               $proxyKey = bin2hex( fread( $file, 32 ) );
+               $secretKey = bin2hex( fread( $file, 32 ) );
                fclose( $file );
        } else {
-               $proxyKey = "";
+               $secretKey = "";
                for ( $i=0; $i<8; $i++ ) {
-                       $proxyKey .= dechex(mt_rand(0, 0x7fffffff));
+                       $secretKey .= dechex(mt_rand(0, 0x7fffffff));
                }
-               print "<li>Warning: \$wgProxyKey is insecure</li>\n";
+               print "<li>Warning: \$wgSecretKey key is insecure, generated with mt_rand(). Consider changing it manually.</li>\n";
        }
 
        # Add slashes to strings for double quoting
@@ -873,14 +1156,27 @@ function writeLocalSettings( $conf ) {
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }
 
-       $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
-       return "
+       $sep = PATH_SEPARATOR;
+       $localsettings = "
 # This file was automatically generated by the MediaWiki installer.
 # If you make manual changes, please keep track in case you need to
 # recreate them later.
+#
+# See includes/DefaultSettings.php for all configurable settings
+# and their default values, but don't forget to make changes in _this_
+# file, not there.
+
+# 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.
+if( defined( 'MW_INSTALL_PATH' ) ) {
+       \$IP = MW_INSTALL_PATH;
+} else {
+       \$IP = dirname( __FILE__ );
+}
+
+\$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
+set_include_path( implode( PATH_SEPARATOR, \$path ) );
 
-\$IP = \"{$slconf['IP']}\";
-ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
 require_once( \"includes/DefaultSettings.php\" );
 
 # If PHP's memory limit is very low, some operations may fail.
@@ -890,7 +1186,7 @@ if ( \$wgCommandLineMode ) {
        if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
                die( \"This script must be run from the command line\\n\" );
        }
-} elseif ( empty( \$wgConfiguring ) ) {
+} elseif ( empty( \$wgNoOutputBuffer ) ) {
        ## Compress output if the browser supports it
        {$zlib}if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
 }
@@ -901,7 +1197,9 @@ if ( \$wgCommandLineMode ) {
 \$wgScript           = \"\$wgScriptPath/index.php\";
 \$wgRedirectScript   = \"\$wgScriptPath/redirect.php\";
 
-## If using PHP as a CGI module, use the ugly URLs
+## For more information on customizing the URLs please see:
+## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url
+## If using PHP as a CGI module, the ?title= style usually must be used.
 {$pretty}\$wgArticlePath      = \"\$wgScript/\$1\";
 {$ugly}\$wgArticlePath      = \"\$wgScript?title=\$1\";
 
@@ -912,43 +1210,51 @@ if ( \$wgCommandLineMode ) {
 \$wgUploadPath       = \"\$wgScriptPath/images\";
 \$wgUploadDirectory  = \"\$IP/images\";
 
+\$wgEnableEmail = $enableemail;
+\$wgEnableUserEmail = $enableuseremail;
+
 \$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;
+
 \$wgDBserver         = \"{$slconf['DBserver']}\";
 \$wgDBname           = \"{$slconf['DBname']}\";
 \$wgDBuser           = \"{$slconf['DBuser']}\";
 \$wgDBpassword       = \"{$slconf['DBpassword']}\";
 \$wgDBprefix         = \"{$slconf['DBprefix']}\";
+\$wgDBtype           = \"{$slconf['DBtype']}\";
 
-## To allow SQL queries through the wiki's Special:Askaql page,
-## uncomment the next lines. THIS IS VERY INSECURE. If you want
-## to allow semipublic read-only SQL access for your sysops,
-## you should define a MySQL user with limited privileges.
-## See MySQL docs: http://www.mysql.com/doc/en/GRANT.html
-#
-# \$wgAllowSysopQueries = true;
-# \$wgDBsqluser        = \"sqluser\";
-# \$wgDBsqlpassword    = \"sqlpass\";
-
-# If you're on MySQL 3.x, this next line must be FALSE:
-\$wgDBmysql4 = \$wgEnablePersistentLC = {$conf->DBmysql4};
+# Experimental charset support for MySQL 4.1/5.0.
+\$wgDBmysql5 = {$conf->DBmysql5};
 
 ## Shared memory settings
-\$wgUseMemCached = $memcached;
+\$wgMainCacheType = $cacheType;
 \$wgMemCachedServers = $mcservers;
-{$turck}\$wgUseTurckShm = function_exists( 'mmcache_get' ) && php_sapi_name() == 'apache';
 
 ## To enable image uploads, make sure the 'images' directory
-## is writable, then uncomment this:
-# \$wgDisableUploads           = false;
+## is writable, then set this to true:
+\$wgEnableUploads              = false;
 \$wgUseImageResize             = {$conf->UseImageResize};
 {$magic}\$wgUseImageMagick = true;
 {$magic}\$wgImageMagickConvertCommand = \"{$convert}\";
 
+## 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
+## this, if it's not already uncommented:
+{$hashedUploads}\$wgHashedUploadDirectory = false;
+
 ## If you have the appropriate support software installed
 ## you can enable inline LaTeX equations:
-# \$wgUseTeX                   = true;
+\$wgUseTeX              = false;
 \$wgMathPath         = \"{\$wgUploadPath}/math\";
 \$wgMathDirectory    = \"{\$wgUploadDirectory}/math\";
 \$wgTmpDirectory     = \"{\$wgUploadDirectory}/tmp\";
@@ -956,13 +1262,12 @@ if ( \$wgCommandLineMode ) {
 \$wgLocalInterwiki   = \$wgSitename;
 
 \$wgLanguageCode = \"{$slconf['LanguageCode']}\";
-\$wgUseLatin1 = " . ($conf->Latin1 ? 'true' : 'false') . ";\n
 
-\$wgProxyKey = \"$proxyKey\";
+\$wgProxyKey = \"$secretKey\";
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
-\$wgDefaultSkin = 'monobook';
+\$wgDefaultSkin = 'monobook';
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
@@ -973,7 +1278,17 @@ if ( \$wgCommandLineMode ) {
 \$wgRightsText = \"{$slconf['RightsText']}\";
 \$wgRightsIcon = \"{$slconf['RightsIcon']}\";
 # \$wgRightsCode = \"{$slconf['RightsCode']}\"; # Not yet used
+
+\$wgDiff3 = \"{$slconf['diff3']}\";
+
+# 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 );
 ";
+       // Keep things in Unix line endings internally;
+       // the system will write out as local text type.
+       return str_replace( "\r\n", "\n", $localsettings );
 }
 
 function dieout( $text ) {
@@ -1000,7 +1315,10 @@ function importRequest( $name, $default = "" ) {
        return importVar( $_REQUEST, $name, $default );
 }
 
-function aField( &$conf, $field, $text, $type = "", $value = "" ) {
+$radioCount = 0;
+
+function aField( &$conf, $field, $text, $type = "text", $value = "" ) {
+       global $radioCount;
        if( $type != "" ) {
                $xtype = "type=\"$type\"";
        } else {
@@ -1009,6 +1327,10 @@ function aField( &$conf, $field, $text, $type = "", $value = "" ) {
 
        if(!(isset($id)) or ($id == "") ) $id = $field;
        $nolabel = ($type == "radio") || ($type == "hidden");
+
+       if ($type == 'radio')
+               $id .= $radioCount++;
+
        if( $nolabel ) {
                echo "\t\t<label>";
        } else {
@@ -1020,7 +1342,7 @@ function aField( &$conf, $field, $text, $type = "", $value = "" ) {
        } else {
                $checked = "";
        }
-       echo "\t\t<input $xtype name=\"$field\" id=\"$id\" $checked value=\"";
+       echo "\t\t<input $xtype name=\"$field\" id=\"$id\" class=\"iput-$type\" $checked value=\"";
        if( $type == "radio" ) {
                echo htmlspecialchars( $value );
        } else {
@@ -1041,14 +1363,14 @@ function getLanguageList() {
                $wgContLanguageCode = "xxx";
                function wfLocalUrl( $x ) { return $x; }
                function wfLocalUrlE( $x ) { return $x; }
-               require_once( "../languages/Names.php" );
+               require_once( "languages/Names.php" );
        }
 
        $codes = array();
-       $latin1 = array( "da", "de", "en", "es", "fr", "nl", "sv" );
 
        $d = opendir( "../languages" );
        while( false !== ($f = readdir( $d ) ) ) {
+               $m = array();
                if( preg_match( '/Language([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
                        $code = str_replace( '_', '-', strtolower( $m[1] ) );
                        if( isset( $wgLanguageNames[$code] ) ) {
@@ -1056,12 +1378,7 @@ function getLanguageList() {
                        } else {
                                $name = $code;
                        }
-                       if( in_array( $code, $latin1 ) ) {
-                               $codes[$code] = $name . " - Unicode";
-                               $codes[$code.'-latin1'] = $name . " - Latin-1";
-                       } else {
-                               $codes[$code] = $name;
-                       }
+                       $codes[$code] = $name;
                }
        }
        closedir( $d );
@@ -1069,6 +1386,36 @@ function getLanguageList() {
        return $codes;
 }
 
+#Check for location of an executable
+# @param string $loc single location to check
+# @param array $names filenames to check for.
+# @param mixed $versioninfo array of details to use when checking version, use false for no version checking
+function locate_executable($loc, $names, $versioninfo = false) {
+       if (!is_array($names))
+               $names = array($names);
+
+       foreach ($names as $name) {
+               $command = "$loc".DIRECTORY_SEPARATOR."$name";
+               if (file_exists($command)) {
+                       if (!$versioninfo)
+                               return $command;
+
+                       $file = str_replace('$1', $command, $versioninfo[0]);
+                       if (strstr(`$file`, $versioninfo[1]) !== false)
+                               return $command;
+               }
+       }
+       return false;
+}
+
+function get_db_version() {
+       global $wgDatabase, $conf;
+       if ($conf->DBtype == 'mysql')
+               return mysql_get_server_info( $wgDatabase->mConn );
+       else if ($conf->DBtype == 'oracle')
+               return oci_server_version($wgDatabase->mConn);
+}
+
 # Test a memcached server
 function testMemcachedServer( $server ) {
        $hostport = explode(":", $server);
@@ -1115,5 +1462,48 @@ function testMemcachedServer( $server ) {
 }
 ?>
 
+       <div class="license">
+       <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
+        (at your option) any later version.</p>
+
+        <p>This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.</p>
+
+        <p>You should have received <a href="../COPYING">a copy of the GNU General Public License</a>
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+        or <a href="http://www.gnu.org/copyleft/gpl.html">read it online</a></p>
+       </div>
+
+</div></div></div>
+
+
+<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/"
+           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>
+               </ul>
+               <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2006 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+       </div></div>
+</div>
+
+</div>
+
 </body>
 </html>