Code cleanup: normalize case for intval(), strval(), floatval() calls.
[lhc/web/wiklou.git] / config / index.php
index 82bcdc9..8952fce 100644 (file)
@@ -79,9 +79,9 @@ header( "Content-type: text/html; charset=utf-8" );
   </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>
+ <p><strong><a href="http://www.mediawiki.org/">MediaWiki</a></strong> is
+ Copyright (C) 2001-2005 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>
@@ -108,13 +108,21 @@ header( "Content-type: text/html; charset=utf-8" );
 
 <?php
 
-$IP = ".."; # Just to suppress notices, not for anything useful
+# Relative includes seem to break if a parent directory is not readable;
+# this is common for public_html subdirs under user home directories.
+#
+# 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" );
+
 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" );
+require_once( "includes/Defines.php" );
+require_once( "includes/DefaultSettings.php" );
+require_once( "includes/MagicWord.php" );
+require_once( "includes/Namespace.php" );
 ?>
 
 <h1>MediaWiki <?php print $wgVersion ?> installation</h1>
@@ -133,11 +141,9 @@ if( file_exists( "../LocalSettings.php" ) ) {
 }
 
 if( file_exists( "./LocalSettings.php" ) ) {
-       dieout( "<h2>You're configured!</h2>
+       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( "." ) ) {
@@ -150,17 +156,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" );
+require_once( "install-utils.inc" );
+require_once( "maintenance/updaters.inc" );
 
 class ConfigData {
        function getEncoded( $data ) {
@@ -181,7 +185,7 @@ class ConfigData {
 <?php
 $endl = "
 ";
-$wgConfiguring = true;
+$wgNoOutputBuffer = true;
 $conf = new ConfigData;
 
 install_version_checks();
@@ -190,7 +194,7 @@ print "<li>PHP " . phpversion() . ": ok</li>\n";
 
 if( ini_get( "register_globals" ) ) {
        ?>
-       <li><b class='error'>Warning:</strong> <strong>PHP's
+       <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
@@ -198,15 +202,6 @@ if( ini_get( "register_globals" ) ) {
        <?php
 }
 
-if( ini_get( "safe_mode" ) ) {
-       ?>
-       <li class='error'><strong>Warning: 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
-}
-
 $fatal = false;
 
 if( ini_get( "magic_quotes_runtime" ) ) {
@@ -229,6 +224,19 @@ if( $fatal ) {
        dieout( "</ul><p>Cannot install wiki.</p>" );
 }
 
+if( ini_get( "safe_mode" ) ) {
+       $conf->safeMode = true;
+       ?>
+       <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();
 $conf->prettyURLs = true;
 print "<li>PHP server API is $sapi; ";
@@ -259,13 +267,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 ) . ". <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... ";
@@ -300,6 +308,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(":", getenv("PATH"));
+$diff3names = array("gdiff3", "diff3");
+
+$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 ) {
@@ -341,6 +367,7 @@ 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" );
@@ -427,6 +454,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;
@@ -435,58 +470,80 @@ 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->ignoreErrors(true);
-
-               @$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->ignoreErrors(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";
+               $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 {
-                                               $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() ) {
@@ -494,34 +551,49 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        continue;
                }
 
-               print "<li>Connected to database... $myver";
+               print "<li>Connected to $myver";
                if( version_compare( $myver, "4.0.0" ) >= 0 ) {
                        print "; enabling MySQL 4 enhancements";
                        $conf->DBmysql4 = true;
                        $local = writeLocalSettings( $conf );
                }
+               $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>";
+               }
                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" ) || $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 );
@@ -529,7 +601,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 );
                                }
                        }
@@ -544,9 +620,14 @@ 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') {
+                               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...";
@@ -566,19 +647,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;
-                                       $u->setGroups( $groups );
-                                       $u->saveSettings();
-                                       
+
+                                       $u->addGroup( "sysop" );
+                                       $u->addGroup( "bureaucrat" );
+
                                        print "<li>Created sysop account <tt>" .
                                                htmlspecialchars( $conf->SysopName ) . "</tt>.</li>\n";
                                } else {
@@ -600,7 +673,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                ) );
                        $revid = $revision->insertOn( $wgDatabase );
                        $article->updateRevisionOn( $wgDatabase, $revision );
-                       
+
                        print "<li><pre>";
                        initialiseMessages();
                        print "</pre></li>\n";
@@ -609,6 +682,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
@@ -624,13 +699,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 );
@@ -649,7 +722,7 @@ if( count( $errs ) ) {
        }
 ?>
 
-<form name="config" method="post">
+<form action="index.php" name="config" method="post">
 
 
 <h2>Site config</h2>
@@ -755,14 +828,14 @@ if( count( $errs ) ) {
 
                <ul class="plain">
                <li><?php aField( $conf, "Shm", "no caching", "radio", "none" ); ?></li>
-               <?php 
+               <?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" );
@@ -775,12 +848,12 @@ if( count( $errs ) ) {
        </dd>
        <dt>
                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>
+<h2>E-mail, e-mail notification and authentication setup</h2>
 
 <dl class="setup">
        <dd>
@@ -819,11 +892,8 @@ if( count( $errs ) ) {
                </ul>
        </dd>
        <dt>
-               <p><?php
-                       $ccEnotif = htmlspecialchars( 'http://meta.wikipedia.org/Enotif' );
-                       print "<a href=\"$ccEnotif\">E-mail notification</a>";
-               ?>
-                sends a notification e-mail to a user, when the user_talk page is changed
+               <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>
@@ -844,13 +914,8 @@ if( count( $errs ) ) {
                </ul>
        </dd>
        <dt>
-               <p><?php
-                       $ccEauthent = htmlspecialchars( 'http://meta.wikipedia.org/Eauthent' );
-                       print "<a href=\"$ccEnotif\">E-mail address authentication</a>";
-               ?>
-                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>
+               <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>
@@ -864,17 +929,31 @@ if( count( $errs ) ) {
 <h2>Database config</h2>
 
 <dl class="setup">
+       <dd>
+               <label class='column'>Database type</label>
+               <div>Select the database server software:</div>
+               <ul class='plain'>
+               <?php
+                       aField( $conf, "DBtype", "MySQL", "radio", "mysql");
+                       aField( $conf, "DBtype", "Oracle", "radio", "oracle" );
+               ?>
+               </ul>
+       </dd>
+
        <dd><?php
-               aField( $conf, "DBserver", "MySQL server" );
+               aField( $conf, "DBserver", "SQL server host" );
        ?></dd>
        <dt>
                If your database server isn't on your web server, enter the name
-               or IP address here.
+               or IP address here.  MySQL only.
        </dt>
 
        <dd><?php
                aField( $conf, "DBname", "Database name" );
        ?></dd>
+       <dt>
+               If using Oracle, set this to your connection identifier.
+       </dt>
        <dd><?php
                aField( $conf, "DBuser", "DB username" );
        ?></dd>
@@ -897,7 +976,7 @@ if( count( $errs ) ) {
                <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>
 
@@ -927,6 +1006,29 @@ if( count( $errs ) ) {
 }
 
 /* -------------------------------------------------------------------------------------- */
+function writeSuccessMessage() {
+       global $conf;
+       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,
@@ -950,23 +1052,21 @@ function writeLocalSettings( $conf ) {
        $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':
                case 'eaccel':
-                       $memcached = 'false';
+                       $cacheType = 'CACHE_ACCEL';
                        $mcservers = 'array()';
-                       $turck = '';
                        break;
                default:
-                       $memcached = 'false';
+                       $cacheType = 'CACHE_NONE';
                        $mcservers = 'array()';
-                       $turck = '#';
        }
 
        if ( $conf->Email == 'email_enabled' ) {
@@ -1014,7 +1114,7 @@ function writeLocalSettings( $conf ) {
        }
 
        $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
-       return "
+       $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.
@@ -1030,7 +1130,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' );
 }
@@ -1063,8 +1163,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']}\";
@@ -1072,15 +1172,14 @@ 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};
+\$wgDBmysql4 = {$conf->DBmysql4};
 
 ## Shared memory settings
-\$wgUseMemCached = $memcached;
+\$wgMainCacheType = $cacheType;
 \$wgMemCachedServers = $mcservers;
-{$turck}\$wgUseTurckShm = function_exists( 'mmcache_get' ) && ( php_sapi_name() == 'apache' || php_sapi_name() == 'apache2handler' );
-{$turck}\$wgUseEAccelShm = function_exists( 'eaccelerator_get' ) && ( php_sapi_name() == 'apache' || php_sapi_name() == 'apache2handler' );
 
 ## To enable image uploads, make sure the 'images' directory
 ## is writable, then uncomment this:
@@ -1089,6 +1188,12 @@ 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
+## 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;
@@ -1115,7 +1220,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 ) {
@@ -1183,7 +1293,7 @@ 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();
@@ -1205,6 +1315,35 @@ 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) {
+               if (file_exists("$loc/$name")) {
+                       if (!$versioninfo)
+                               return "$loc/$name";
+
+                       $file = str_replace('$1', "$loc/$name", $versioninfo[0]);
+                       if (strstr(`$file`, $versioninfo[1]) !== false)
+                               return "$loc/$name";
+               }
+       }
+       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);