Further cleanup of index.php
[lhc/web/wiklou.git] / config / index.php
index 4bd27d3..12c38ba 100644 (file)
@@ -27,84 +27,93 @@ header( "Content-type: text/html; charset=utf-8" );
 <html>
 <head>
        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-       <meta name="robots" content="noindex,nofollow">
        <title>MediaWiki 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;
-       }
+               @import "../skins/monobook/main.css";
+
+               .env-check {
+                       font-size: 90%;
+                       margin: 1em 0 1em 2.5em;
+               }
+
+               .config-section {
+                       margin-top: 2em;
+               }
+
+               .config-section label.column {
+                       clear: left;
+                       font-weight: bold;
+                       width: 13em;
+                       float: left;
+                       text-align: right;
+                       padding-right: 1em;
+                       padding-top: .2em;
+               }
+
+               .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%;
+               }
+
+               .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">
 
-<div id="credit">
- <center>
-  <a href="http://www.mediawiki.org/">
-   <img src="../skins/common/images/mediawiki.png" width="135" height="135" alt="" border="0" />
-  </a>
- </center>
-
- <strong><a href="http://www.mediawiki.org/">MediaWiki</a></strong> is
- Copyright (C) 2001-<?=date('Y')?> by Magnus Manske, Brion Vibber, Lee Daniel Crocker,
- Tim Starling, Erik M&ouml;ller, Gabriel Wicke, Thomas Gries 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>
 
 <?php
 
@@ -114,8 +123,11 @@ header( "Content-type: text/html; charset=utf-8" );
 # As a dirty hack, we'll try to set up the include path first.
 #
 $IP = dirname( dirname( __FILE__ ) );
-$sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
-ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" );
+$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( "MEDIAWIKI", true );
 define( "MEDIAWIKI_INSTALL", true );
@@ -127,22 +139,19 @@ require_once( "includes/Namespace.php" );
 
 <h1>MediaWiki <?php print $wgVersion ?> installation</h1>
 
-
 <?php
 
 /* Check for existing configurations and bug out! */
 
 if( file_exists( "../LocalSettings.php" ) ) {
-       dieout( "<h2>Wiki is configured.</h2>
-
-       <p>Already configured... <a href='../index.php'>return to the wiki</a>.</p>
+       dieout( "       <p><strong>Setup has completed, <a href='../index.php'>your wiki</a> is configured.</strong></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" ) ) {
        writeSuccessMessage();
-       
+
        dieout( '' );
 }
 
@@ -156,17 +165,15 @@ if( !is_writable( "." ) ) {
 
        <p>To make the directory writable on a Unix/Linux system:</p>
 
-       <blockquote>
-       <tt>cd /path/to/wiki</tt><br>
-       <tt>chmod a+w config</tt>
-       </blockquote>" );
+       <pre>
+       cd <i>/path/to/wiki</i>
+       chmod a+w config
+       </pre>" );
 }
 
 
 require_once( "install-utils.inc" );
 require_once( "maintenance/updaters.inc" );
-require_once( "maintenance/convertLinks.inc" );
-require_once( "maintenance/archives/moveCustomMessages.inc" );
 
 class ConfigData {
        function getEncoded( $data ) {
@@ -180,10 +187,9 @@ class ConfigData {
 
 ?>
 
-<p><em>Please include all of the lines below when reporting installation problems.</em></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 = "
 ";
@@ -192,15 +198,17 @@ $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> <strong>PHP's
-       <tt><a href="http://php.net/register_globals">register_globals</a></tt>
-       option is enabled.</strong> MediaWiki will work correctly, but this setting
-       increases your exposure to potential security vulnerabilities in PHP-based
-       software running on your server. <strong>You should disable it if you are able.</strong></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
 }
 
@@ -222,8 +230,16 @@ if( ini_get( "magic_quotes_sybase" ) ) {
        <?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 wiki.</p>" );
+       dieout( "</ul><p>Cannot install Mediawiki.</p>" );
 }
 
 if( ini_get( "safe_mode" ) ) {
@@ -247,14 +263,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";
 
@@ -273,9 +290,9 @@ 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 ) . ". <strong>If this is too low, installation may fail!</strong> ";
-       $n = IntVal( $memlimit );
+       $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... ";
@@ -310,6 +327,24 @@ if (!$conf->turck && !$conf->eaccel) {
          "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 ) {
@@ -344,6 +379,7 @@ print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt
 $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", "" ) );
@@ -351,12 +387,14 @@ print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</t
                ? '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->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
        $conf->RootPW = importPost( "RootPW" );
        $conf->LanguageCode = importPost( "LanguageCode", "en" );
        $conf->SysopName = importPost( "SysopName", "WikiSysop" );
@@ -367,7 +405,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";
@@ -437,6 +475,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                $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;
@@ -448,58 +494,77 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                require_once( "maintenance/InitialiseMessages.inc" );
 
                $wgTitle = Title::newFromText( "Installation script" );
-               print "<li>Trying to connect to MySQL on $wgDBserver as root...\n";
-               $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
-
-               if( $wgDatabase->isOpen() ) {
-                       $myver = mysql_get_server_info( $wgDatabase->mConn );
-                       $wgDatabase->ignoreErrors(true);
-                       $conf->Root = true;
-                       print "<ul><li>Connected as root (automatic)</li></ul></li>\n";
-               } else {
-                       print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
-                               ": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";
-                       $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;
-                                       /* Wait one second for connection rate limiting, present on some systems */
-                                       sleep(1);
-                                       $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
-                                       if( !$wgDatabase->isOpen() ) {
-                                               print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
-                                                       ": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";
-                                               $errs["DBuser"] = "Check name/pass";
-                                               $errs["DBpassword"] = "or enter root";
-                                               $errs["DBpassword2"] = "password below";
-                                               $errs["RootPW"] = "Got root?";
+               $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') {
+                       print "<li>Trying to connect to database server on $wgDBserver as root...\n";
+                       $wgDatabase = $dbc->newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
+
+                       if( $wgDatabase->isOpen() ) {
+                               $myver = get_db_version();
+                               $wgDatabase->ignoreErrors(true);
+                               $conf->Root = true;
+                               print "<ul><li>Connected as root (automatic)</li></ul></li>\n";
+                       } else {
+                               print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
+                                       ": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";
+                               $ok = false;
+                               switch( $err ) {
+                               case 1045:
+                               case 2000:
+                                       if( $conf->Root ) {
+                                               $errs["RootPW"] = "Check password";
                                        } else {
-                                               $myver = mysql_get_server_info( $wgDatabase->mConn );
-                                               $wgDatabase->ignoreErrors(true);
-                                               $conf->Root = false;
-                                               $conf->RootPW = "";
-                                               print " ok.</li>\n";
-                                               # And keep going...
-                                               $ok = true;
+                                               print "<li>Trying regular user...\n";
+                                               /* Try the regular user... */
+                                               $wgDBadminuser = $wgDBuser;
+                                               $wgDBadminpassword = $wgDBpassword;
+                                               /* Wait one second for connection rate limiting, present on some systems */
+                                               sleep(1);
+                                               $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
+                                               if( !$wgDatabase->isOpen() ) {
+                                                       print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
+                                                               ": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";
+                                                       $errs["DBuser"] = "Check name/pass";
+                                                       $errs["DBpassword"] = "or enter root";
+                                                       $errs["DBpassword2"] = "password below";
+                                                       $errs["RootPW"] = "Got root?";
+                                               } else {
+                                                       $myver = mysql_get_server_info( $wgDatabase->mConn );
+                                                       $wgDatabase->ignoreErrors(true);
+                                                       $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;
                                }
-                       case 2002:
-                       case 2003:
-                               $errs["DBserver"] = "Connection failed";
-                               break;
-                       default:
-                               $errs["DBserver"] = "Couldn't connect to database";
-                               break;
+                               if( !$ok ) continue;
+                       }
+               } 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() ) {
@@ -508,39 +573,54 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                }
 
                print "<li>Connected to $myver";
-               if( version_compare( $myver, "4.0.0" ) >= 0 ) {
-                       print "; enabling MySQL 4 enhancements";
-                       $conf->DBmysql4 = true;
-                       $local = writeLocalSettings( $conf );
+               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 {
-                       $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;
+               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" ) || $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 );
@@ -548,7 +628,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 );
                                }
                        }
@@ -563,9 +647,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...";
@@ -585,20 +680,11 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                if ( 0 == $u->idForName() ) {
                                        $u->addToDatabase();
                                        $u->setPassword( $conf->getSysopPass() );
-                                       $u->addRight( "sysop" );
-                                       $u->addRight( "bureaucrat" );
                                        $u->saveSettings();
-                                       
-                                       # Set up the new user in the sysop group
-                                       # This is a bit of an ugly hack
-                                       global $wgSysopGroupId, $wgBureaucratGroupId;
-                                       $groups = $u->getGroups();
-                                       $groups[] = $wgSysopGroupId;
-                                       $groups[] = $wgBureaucratGroupId;
-                                       $groups[] = $wgStewardGroupId;
-                                       $u->setGroups( $groups );
-                                       $u->saveSettings();
-                                       
+
+                                       $u->addGroup( "sysop" );
+                                       $u->addGroup( "bureaucrat" );
+
                                        print "<li>Created sysop account <tt>" .
                                                htmlspecialchars( $conf->SysopName ) . "</tt>.</li>\n";
                                } else {
@@ -620,7 +706,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                ) );
                        $revid = $revision->insertOn( $wgDatabase );
                        $article->updateRevisionOn( $wgDatabase, $revision );
-                       
+
                        print "<li><pre>";
                        initialiseMessages();
                        print "</pre></li>\n";
@@ -650,7 +736,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                } 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 );
@@ -665,7 +751,7 @@ 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";
        }
 ?>
 
@@ -674,34 +760,28 @@ if( count( $errs ) ) {
 
 <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. It is also be used as the default sender address of e-mail
-               notifications (enotifs).
-       </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
@@ -712,28 +792,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. Unicode (UTF-8 encoding)
-               is used for all localizations.
-       </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>
@@ -744,45 +821,39 @@ 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 
+               <?php
                        if ( $conf->eaccel ) {
                                echo "<li>";
                                aField( $conf, "Shm", "eAccelerator", "radio", "eaccel" );
@@ -790,55 +861,50 @@ if( count( $errs ) ) {
                        }
                ?>
                <li><?php aField( $conf, "Shm", "Memcached", "radio", "memcached" ); ?></li>
-               <li><?php aField( $conf, "MCServers", "Memcached servers", "" ) ?></li>
                </ul>
-       </dd>
-       <dt>
+               <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 
+               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>
-
-<h2>E-mail, e-mail notification and authentification setup</h2>
+       </p>
+</div>
 
-<dl class="setup">
-       <dd>
-               <label class='column'>E-mail (general)</label>
-               <div>Select one:</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>
+               <li><?php aField( $conf, "Email", "Enabled", "radio", "email_enabled" ); ?></li>
+               <li><?php aField( $conf, "Email", "Disabled", "radio", "email_disabled" ); ?></li>
                </ul>
-       </dd>
-       <dt>
+       </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.
-       </dt>
-       <dd>
-               <label class='column'>User-to-user e-mail</label>
-               <div>Select one:</div>
-
+       </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>
+               <li><?php aField( $conf, "Emailuser", "Enabled", "radio", "emailuser_enabled" ); ?></li>
+               <li><?php aField( $conf, "Emailuser", "Disabled", "radio", "emailuser_disabled" ); ?></li>
                </ul>
-       </dd>
-       <dt>
+       </div>
+       <p class="config-desc">
                Use this to disable only the user-to-user e-mail function (EmailUser).
-       </dt>
-       <dd>
-               <label class='column'>E-mail notification</label>
-               <div>Select one:</div>
-
+       </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 changes of watch-listed and user_talk pages (recommended for small wikis; perhaps not suited for large wikis)", "radio", "enotif_allpages" ); ?></li>
-               <li><?php aField( $conf, "Enotif", "enabled for changes of user_talk pages only (suited for small and large wikis)", "radio", "enotif_usertalk" ); ?></li>
+               <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>
-       </dd>
-       <dt>
+       </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.
@@ -849,91 +915,112 @@ if( count( $errs ) ) {
                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>
-       </dt>
-
-       <dd>
-               <label class='column'>E-mail address authentication</label>
-               <div>Select one:</div>
+       </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>
+               <li><?php aField( $conf, "Eauthent", "Disabled", "radio", "eauthent_disabled" ); ?></li>
+               <li><?php aField( $conf, "Eauthent", "Enabled", "radio", "eauthent_enabled" ); ?></li>
                </ul>
-       </dd>
-       <dt>
-               <p>
-               E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
-               gets a one-time temporary password mailed to that address. The user can use the original password as long as wanted, however, the stored e-mail address
-               is only authenticated at the moment when the user logs in with the one-time temporary password.<p>
+       </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>
-       </dt>
+       </div>
 
-       </dl>
+</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", "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>
+       </p>
 
-       <dd><?php
-               aField( $conf, "DBprefix", "Database table prefix" );
-       ?></dd>
-       <dt>
+       <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, "RootPW", "DB root password:", "password" );
                ?>
-       </dd>
-       <dt>
+       </div>
+       <p class="config-desc">
                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>
+       </p>
 
-       <dd>
+       <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>
 
@@ -942,7 +1029,6 @@ if( count( $errs ) ) {
 
 /* -------------------------------------------------------------------------------------- */
 function writeSuccessMessage() {
-       global $conf;
        if ( ini_get( 'safe_mode' ) && !ini_get( 'open_basedir' ) ) {
                echo <<<EOT
 <p>Installation successful!</p>
@@ -953,8 +1039,8 @@ function writeSuccessMessage() {
        <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, 
+<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;
@@ -978,7 +1064,6 @@ function escapePhpString( $string ) {
 }
 
 function writeLocalSettings( $conf ) {
-       $conf->DBmysql4 = @$conf->DBmysql4 ? 'true' : 'false';
        $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false';
        $conf->PasswordSender = $conf->EmergencyContact;
        $zlib = ($conf->zlib ? "" : "# ");
@@ -988,7 +1073,7 @@ function writeLocalSettings( $conf ) {
        $ugly = ($conf->prettyURLs ? "# " : "");
        $rights = ($conf->RightsUrl) ? "" : "# ";
        $hashedUploads = $conf->safeMode ? '' : '# ';
-       
+
        switch ( $conf->Shm ) {
                case 'memcached':
                        $cacheType = 'CACHE_MEMCACHED';
@@ -1048,14 +1133,20 @@ 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.
 
 \$IP = \"{$slconf['IP']}\";
-ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
+if( !ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" ) ) {
+       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.
@@ -1098,8 +1189,8 @@ if ( \$wgCommandLineMode ) {
 ## There are many more options for fine tuning available see
 ## /includes/DefaultSettings.php
 ## UPO means: this is also a user preference option
-\$wgEmailNotificationForUserTalkPages = $enotifusertalk; # UPO
-\$wgEmailNotificationForWatchlistPages = $enotifwatchlist; # UPO
+\$wgEnotifUserTalk = $enotifusertalk; # UPO
+\$wgEnotifWatchlist = $enotifwatchlist; # UPO
 \$wgEmailAuthentication = $eauthent;
 
 \$wgDBserver         = \"{$slconf['DBserver']}\";
@@ -1107,9 +1198,10 @@ if ( \$wgCommandLineMode ) {
 \$wgDBuser           = \"{$slconf['DBuser']}\";
 \$wgDBpassword       = \"{$slconf['DBpassword']}\";
 \$wgDBprefix         = \"{$slconf['DBprefix']}\";
+\$wgDBtype           = \"{$slconf['DBtype']}\";
 
-# 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
 \$wgMainCacheType = $cacheType;
@@ -1122,9 +1214,9 @@ if ( \$wgCommandLineMode ) {
 {$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 
+## 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;
 
@@ -1154,7 +1246,12 @@ if ( \$wgCommandLineMode ) {
 \$wgRightsText = \"{$slconf['RightsText']}\";
 \$wgRightsIcon = \"{$slconf['RightsIcon']}\";
 # \$wgRightsCode = \"{$slconf['RightsCode']}\"; # Not yet used
+
+\$wgDiff3 = \"{$slconf['diff3']}\";
 ";
+       // 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 ) {
@@ -1181,7 +1278,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 {
@@ -1190,6 +1290,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 {
@@ -1201,7 +1305,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 {
@@ -1229,6 +1333,7 @@ function getLanguageList() {
 
        $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] ) ) {
@@ -1244,6 +1349,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);
@@ -1290,5 +1425,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>