fixed notice and nasty error due to /dev/random exhaustion
[lhc/web/wiklou.git] / config / index.php
index d9d1959..c97d78b 100644 (file)
@@ -1,4 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+<?php
+# MediaWiki web-based config/installation
+# Copyright (C) 2004 Brion Vibber <brion@pobox.com>
+# http://www.mediawiki.org/
+#
+# 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.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# http://www.gnu.org/copyleft/gpl.html
+
+error_reporting( E_ALL );
+header( "Content-type: text/html; charset=utf-8" );
+@ini_set( "display_errors", true );
+
+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
                padding: 8px;
                margin-left: 8px;
        }
-       
+
        dl.setup dd {
+               margin-left: 0;
        }
-       dl.setup dd label {
+       dl.setup dd label.column {
                clear: left;
                font-weight: bold;
-               width: 10em;
+               width: 12em;
                float: left;
                text-align: right;
                padding-right: 1em;
        .error {
                color: red;
        }
+       ul.plain {
+               list-style: none;
+               clear: both;
+               margin-left: 12em;
+       }
        </style>
 </head>
 
 <div id="credit">
  <center>
   <a href="http://www.mediawiki.org/"><img
-    src="../images/wiki.png" width="135" height="135" alt="" border="0" /></a>
+    src="../stylesheets/images/wiki.png" width="135" height="135" alt="" border="0" /></a>
  </center>
+
  <b><a href="http://www.mediawiki.org/">MediaWiki</a></b> is
  Copyright (C) 2001-2004 by Magnus Manske, Brion Vibber, Lee Daniel Crocker,
- Tim Starling, Erik M&ouml;ller, and others.</p>
+ Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+
  <ul>
  <li><a href="../README">Readme</a></li>
  <li><a href="../RELEASE-NOTES">Release notes</a></li>
  <li><a href="../docs/">doc/</a></li>
  <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
  </ul>
+
  <p>This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.</p>
- <p>This progarm is distributed in the hope that it will be useful,
+
+ <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.
 </div>
 
 <?php
-include( "../includes/DefaultSettings.php" );
+
+$IP = ".."; # Just to suppress notices, not for anything useful
+define( "MEDIAWIKI", true );
+define( "MEDIAWIKI_INSTALL", true );
+require_once( "../includes/DefaultSettings.php" );
+require_once( "../includes/MagicWord.php" );
+require_once( "../includes/Namespace.php" );
 ?>
 
 <h1>MediaWiki <?php print $wgVersion ?> installation</h1>
@@ -88,63 +124,152 @@ include( "../includes/DefaultSettings.php" );
 
 if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) {
        dieout( "<h2>Wiki is configured.</h2>
-       
+
        <p>Already configured... <a href='../index.php'>return to the wiki</a>.</p>
-       
+
        <p>(You should probably remove this directory for added security.)</p>" );
 }
 
 if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) {
        dieout( "<h2>You're configured!</h2>
-       
+
        <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>" );
 }
 
+if( !is_writable( "." ) ) {
+       dieout( "<h2>Can't write config file, aborting</h2>
+
+       <p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
+       writable by the web server. Once configuration is done you'll move the created
+       <tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
+       then remove the <tt>config</tt> subdirectory entirely.</p>
+
+       <p>To make the directory writable on a Unix/Linux system:</p>
+
+       <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" );
 
-include( "../install-utils.inc" );
-class ConfigData {}
+class ConfigData {
+       function getEncoded( $data ) {
+               # Hackish
+               global $wgUseLatin1;
+               if( $wgUseLatin1 ) {
+                       return utf8_decode( $data ); /* to latin1 wikis */
+               } else {
+                       return $data;
+               }
+       }
+       function getSitename() { return $this->getEncoded( $this->Sitename ); }
+       function getSysopName() { return $this->getEncoded( $this->SysopName ); }
+       function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
+}
 
 ?>
 
+<p><i>Please include all of the lines below when reporting installation problems.</i></p>
 
 <h2>Checking environment...</h2>
 <ul>
 <?php
-
+$endl = "
+";
 $conf = new ConfigData;
 
 install_version_checks();
 print "<li>PHP " . phpversion() . " ok</li>\n";
 
-/*
-$conf->zlib = function_exists( "gzencode" );
-$z = $conf->zlib ? "Have" : "No";
-print "<li>$z zlib support</li>\n";
+$sapi = php_sapi_name();
+$conf->prettyURLs = true;
+print "<li>PHP server API is $sapi; ";
+switch( $sapi ) {
+case "apache":
+case "apache2handler":
+       print "ok, using pretty URLs (<tt>index.php/Page_Title</tt>)";
+       break;
+case "cgi":
+case "cgi-fcgi":
+case "apache2filter":
+       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";
 
-$conf->gd = function_exists( "imagejpeg" );
-if( $conf->gd ) {
-       print "<li>Found GD graphics library built-in</li>\n";
+$conf->xml = function_exists( "utf8_encode" );
+if( $conf->xml ) {
+       print "<li>Have XML / Latin1-UTF-8 conversion support.</li>\n";
 } else {
-       print "<li>No built-in GD library</li>\n";
+       print "<li><b>XML / Latin1-UTF-8 conversion is missing! Wiki will probably not work.</b></li>\n";
 }
 
-if( file_exists( "/usr/bin/convert" ) ) {
-       $conf->ImageMagick = "/usr/bin/convert";
-       print "<li>Found ImageMagick: /usr/bin/convert</li>\n";
-} elseif( file_exists( "/usr/local/bin/convert" ) ) {
-       $conf->ImageMagick = "/usr/local/bin/convert";
-       print "<li>Found ImageMagick: /usr/local/bin/convert</li>\n";
+$memlimit = ini_get( "memory_limit" );
+$conf->raiseMemory = false;
+if( empty( $memlimit ) ) {
+       print "<li>PHP is configured with no <tt>memory_limit</tt>.</li>\n";
 } else {
-       $conf->ImageMagick = false;
-       print "<li>No ImageMagick.</li>\n";
+       print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ) . ". <b>If this is too low, installation may fail!</b> ";
+       $n = IntVal( $memlimit );
+       if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
+               $n = IntVal( $m[1] * (1024*1024) );
+       }
+       if( $n < 20*1024*1024 ) {
+               print "Attempting to raise limit to 20M... ";
+               if( false === ini_set( "memory_limit", "20M" ) ) {
+                       print "failed.";
+               } else {
+                       $conf->raiseMemory = true;
+                       print "ok.";
+               }
+       }
+       print "</li>\n";
+}
+
+$conf->zlib = function_exists( "gzencode" );
+if( $conf->zlib ) {
+       print "<li>Have zlib support; enabling output compression.</li>\n";
+} else {
+       print "<li>No zlib support.</li>\n";
+}
+
+$conf->ImageMagick = false;
+
+$conf->HaveGD = function_exists( "imagejpeg" );
+if( $conf->HaveGD ) {
+       print "<li>Found GD graphics library built-in, image thumbnailing will be enabled if you enable uploads.</li>\n";
+} else {
+       $imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin" );
+       foreach( $imcheck as $dir ) {
+               $im = "$dir/convert";
+               if( file_exists( $im ) ) {
+                       print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n";
+                       $conf->ImageMagick = $im;
+                       break;
+               }
+       }
+       if( !$conf->ImageMagick ) {
+               print "<li>Couldn't find GD library or ImageMagick; image thumbnailing disabled.</li>\n";
+       }
 }
-*/
+
+$conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
 
 # $conf->IP = "/Users/brion/Sites/inplace";
 chdir( ".." );
 $conf->IP = getcwd();
+$conf->IP = preg_replace( "/\\\\/","\\\\\\\\",$conf->IP );  // For Windows, \ -> \\
 chdir( "config" );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
@@ -153,7 +278,7 @@ $conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $_SERVER["REQUEST_U
 print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</tt></li>\n";
 
        $conf->posted = ($_SERVER["REQUEST_METHOD"] == "POST");
-       
+
        $conf->Sitename = ucfirst( importPost( "Sitename", "" ) );
        $conf->EmergencyContact = importPost( "EmergencyContact", $_SERVER["SERVER_ADMIN"] );
        $conf->DBserver = importPost( "DBserver", "localhost" );
@@ -162,7 +287,10 @@ print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</t
        $conf->DBpassword = importPost( "DBpassword" );
        $conf->DBpassword2 = importPost( "DBpassword2" );
        $conf->RootPW = importPost( "RootPW" );
-       $conf->LanguageCode = importPost( "LanguageCode", "en-utf8" );
+       $conf->LanguageCode = importPost( "LanguageCode", "en" );
+       $conf->SysopName = importPost( "SysopName", "WikiSysop" );
+       $conf->SysopPass = importPost( "SysopPass" );
+       $conf->SysopPass2 = importPost( "SysopPass2" );
 
 /* Check for validity */
 $errs = array();
@@ -177,57 +305,100 @@ if( $conf->DBpassword != $conf->DBpassword2 ) {
        $errs["DBpassword2"] = "Passwords don't match!";
 }
 
+if( $conf->SysopPass == "" ) {
+       $errs["SysopPass"] = "Must not be blank";
+}
+if( $conf->SysopPass != $conf->SysopPass2 ) {
+       $errs["SysopPass2"] = "Passwords don't match!";
+}
+
+$conf->License = importPost( "License", "none" );
+if( $conf->License == "gfdl" ) {
+       $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+       $conf->RightsText = "GNU Free Documentation License 1.2";
+       $conf->RightsCode = "gfdl";
+       $conf->RightsIcon = '${wgStylePath}/images/gnu-fdl.png';
+} elseif( $conf->License == "none" ) {
+       $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
+} else {
+       $conf->RightsUrl = importPost( "RightsUrl", "" );
+       $conf->RightsText = importPost( "RightsText", "" );
+       $conf->RightsCode = importPost( "RightsCode", "" );
+       $conf->RightsIcon = importPost( "RightsIcon", "" );
+}
+
 if( $conf->posted && ( 0 == count( $errs ) ) ) {
        do { /* So we can 'continue' to end prematurely */
                $conf->Root = ($conf->RootPW != "");
-               
+
                /* Load up the settings and get installin' */
                $local = writeLocalSettings( $conf );
                $wgCommandLineMode = false;
+               chdir( ".." );
                eval($local);
-
                $wgDBadminuser = $wgDBuser;
                $wgDBadminpassword = $wgDBpassword;
                $wgCommandLineMode = true;
                $wgUseDatabaseMessages = false; /* FIXME: For database failure */
-               include_once( "Setup.php" );
+               require_once( "includes/Setup.php" );
+               chdir( "config" );
 
-               if( $conf->Root ) {
-                       $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
-               } else {
-                       $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
-               }
+               require_once( "../maintenance/InitialiseMessages.inc" );
+
+               $wgTitle = Title::newFromText( "Installation script" );
+               $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
                $wgDatabase->mIgnoreErrors = true;
-               
-               if ( !$wgDatabase->isOpen() ) {
-                       $errs["DBserver"] = "Couldn't connect to database";
-                       continue;
-               }
 
                @$myver = mysql_get_server_info( $wgDatabase->mConn );
-               if( !$myver ) {
+               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:
                                if( $conf->Root ) {
                                        $errs["RootPW"] = "Check password";
                                } else {
-                                       $errs["DBuser"] = "Check name/pass";
-                                       $errs["DBpassword"] = "or enter root";
-                                       $errs["DBpassword2"] = "password below";
-                                       $errs["RootPW"] = "Got root?";
+                                       print "<li>Trying regular user...\n";
+                                       /* Try the regular user... */
+                                       $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
+                                       $wgDatabase->isOpen();
+                                       $wgDatabase->mIgnoreErrors = true;
+                                       @$myver = mysql_get_server_info( $wgDatabase->mConn );
+                                       if( !$myver ) {
+                                               $errs["DBuser"] = "Check name/pass";
+                                               $errs["DBpassword"] = "or enter root";
+                                               $errs["DBpassword2"] = "password below";
+                                               $errs["RootPW"] = "Got root?";
+                                               print " need password.</li>\n";
+                                       } else {
+                                               $conf->Root = false;
+                                               $conf->RootPW = "";
+                                               print " ok.</li>\n";
+                                               # And keep going...
+                                               $ok = true;
+                                       }
+                                       break;
                                }
-                               break;
                        case 2002:
                        case 2003:
                                $errs["DBserver"] = "Connection failed";
                                break;
                        default:
                                $errs["DBserver"] = "Couldn't connect to database";
+                               break;
                        }
+                       if( !$ok ) continue;
+               }
+
+               if ( !$wgDatabase->isOpen() ) {
+                       $errs["DBserver"] = "Couldn't connect to database";
                        continue;
                }
+
                print "<li>Connected to database... $myver";
                if( version_compare( $myver, "4.0.0" ) >= 0 ) {
                        print "; enabling MySQL 4 enhancements";
@@ -235,7 +406,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $local = writeLocalSettings( $conf );
                }
                print "</li>\n";
-               
+
                @$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
                if( $sel ) {
                        print "<li>Database <tt>" . htmlspecialchars( $wgDBname ) . "</tt> exists</li>\n";
@@ -250,11 +421,40 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        }
                        print "<li>Created database <tt>" . htmlspecialchars( $wgDBname ) . "</tt></li>\n";
                }
-               
+
                $wgDatabase->selectDB( $wgDBname );
-               
+
                if( $wgDatabase->tableExists( "cur" ) ) {
-                       print "<li>There are already MediaWiki tables in this database. Skipping rest of database setup...</li>\n";
+                       print "<li>There are already MediaWiki tables in this database. Checking if updates are needed...</li>\n<pre>";
+
+                       chdir( ".." );
+                       flush();
+                       do_ipblocks_update(); flush();
+                       do_interwiki_update(); flush();
+                       do_index_update(); flush();
+                       do_linkscc_update(); flush();
+                       do_linkscc_1_3_update(); flush();
+                       do_hitcounter_update(); flush();
+                       do_recentchanges_update(); flush();
+                       convertLinks(); flush();
+                       do_user_real_name_update(); flush();
+                       do_querycache_update(); flush();
+                       do_objectcache_update(); flush();
+                       do_categorylinks_update(); flush();
+
+                       if ( isTemplateInitialised() ) {
+                               print "Template namespace already initialised\n";
+                       } else {
+                               moveCustomMessages( 1 ); flush();
+                               moveCustomMessages( 2 ); flush();
+                               moveCustomMessages( 3 ); flush();
+                       }
+
+                       initialiseMessages(); flush();
+                       chdir( "config" );
+
+                       print "</pre>\n";
+                       print "<li>Finished update checks.</li>\n";
                } else {
                        # FIXME: Check for errors
                        print "<li>Creating tables...";
@@ -262,34 +462,86 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        dbsource( "../maintenance/interwiki.sql", $wgDatabase );
                        dbsource( "../maintenance/indexes.sql", $wgDatabase );
                        print " done.</li>\n";
-                       
+
                        print "<li>Initializing data...";
                        $wgDatabase->query( "INSERT INTO site_stats (ss_row_id,ss_total_views," .
                                "ss_total_edits,ss_good_articles) VALUES (1,0,0,0)" );
-                       
-                       # FIXME: Initial sysop account
-                       # FIXME: Main page, logs
-                       # FIXME: Initialize messages
-                       print "<li>(NYI: accounts, pages, messages)</li>\n";
-                       
+                       # setting up the db user
                        if( $conf->Root ) {
-                               # Grant user permissions
+                               print "<li>Granting user permissions...</li>\n";
                                dbsource( "../maintenance/users.sql", $wgDatabase );
                        }
+
+                       if( $conf->SysopName ) {
+                               $u = User::newFromName( $conf->getSysopName() );
+                               if ( 0 == $u->idForName() ) {
+                                       $u->addToDatabase();
+                                       $u->setPassword( $conf->getSysopPass() );
+                                       $u->addRight( "sysop" );
+                                       $u->addRight( "bureaucrat" );
+                                       $u->saveSettings();
+                                       print "<li>Created sysop account <tt>" .
+                                               htmlspecialchars( $conf->SysopName ) . "</tt>.</li>\n";
+                               } else {
+                                       print "<li>Could not create user - already exists!</li>\n";
+                               }
+                       } else {
+                               print "<li>Skipped sysop account creation, no name given.</li>\n";
+                       }
+
+                       print "<li>Initialising log pages...";
+                       $logs = array(
+                               "uploadlogpage" => "uploadlogpagetext",
+                               "dellogpage" => "dellogpagetext",
+                               "protectlogpage" => "protectlogtext",
+                               "blocklogpage" => "blocklogtext"
+                       );
+                       $metaNamespace = Namespace::getWikipedia();
+                       $now = wfTimestampNow();
+                       $won = wfInvertTimestamp( $now );
+                       foreach( $logs as $page => $text ) {
+                               $logTitle = $wgDatabase->strencode( $wgLang->ucfirst( str_replace( " ", "_", wfMsgNoDB( $page ) ) ) );
+                               $logText = $wgDatabase->strencode( wfMsgNoDB( $text ) );
+                               $wgDatabase->query( "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
+                                 "cur_restrictions,cur_timestamp,inverse_timestamp,cur_touched) " .
+                                 "VALUES ($metaNamespace,'$logTitle','$logText','sysop','$now','$won','$now')" );
+                       }
+                       print "</li>\n";
+
+                       $titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
+                       $title = $titleobj->getDBkey();
+                       $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched) " .
+                         "VALUES (0,'$title','" .
+                         wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) . "','$now','$won','$now')";
+                       $wgDatabase->query( $sql, $fname );
+
+                       print "<li><pre>";
+                       initialiseMessages();
+                       print "</pre></li>\n";
                }
 
                /* Write out the config file now that all is well */
                print "<p>Creating LocalSettings.php...</p>\n\n";
-               $f = fopen( "LocalSettings.php", "xt" );
+               $localSettings =  "<" . "?php$endl$local$endl?" . ">";
+
+               if( version_compare( phpversion(), "4.3.2" ) >= 0 ) {
+                       $xt = "xt"; # Refuse to overwrite an existing file
+               } else {
+                       $xt = "wt"; # 'x' is not available prior to PHP 4.3.2. We did check above, but race conditions blah blah
+               }
+               $f = fopen( "LocalSettings.php", $xt );
+
                if( $f == false ) {
-                       dieout( "Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a fiel of that name here." );
+                       dieout( "<p>Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a file of that name here...</p>\n" .
+                       "<p>Here's the file that would have been written, try to paste it into place manually:</p>\n" .
+                       "<pre>\n" . htmlspecialchars( $localSettings ) . "</pre>\n" );
                }
-               fwrite( $f, "<" . "?php\n$local\n?" . ">" );
+               fwrite( $f, $localSettings );
                fclose( $f );
-               
-               print "<p>Success! Move the LocalSettings.php file into the parent directory, then follow
+
+               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";
-               
+
        } while( false );
 }
 ?>
@@ -300,56 +552,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 
 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";
        }
 ?>
-<h2>Database config</h2>
 
 <form name="config" method="post">
 
-<dl class="setup">
-       <dd><?php
-               aField( $conf, "DBserver", "MySQL server" );
-       ?></dd>
-       <dt>
-               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>
-               If you only have a single user account and database available,
-               enter those here. If you have database root access (see below)
-               you can specify new accounts/databases to be created.
-       </dt>
-
-
-       <dd>
-               <?php
-               aField( $conf, "RootPW", "DB root password", "password" );
-               ?>
-       </dd>
-       <dt>
-               You will only need this if the database and/or user account
-               above don't already exist.
-               Do <em>not</em> type in your machine's root password! MySQL
-               has its own "root" user with a separate password. (It might
-               even be blank, depending on your configuration.)
-       </dt>
-</dl>
 
 <h2>Site config</h2>
 
@@ -373,11 +583,13 @@ if( count( $errs ) ) {
                ?>
        </dd>
        <dt>
-               If the wiki breaks terribly, it may display this contact address.
+               This will be used as the return address for password reminders and
+               may be displayed in some error conditions so visitors can get in
+               touch with you.
        </dt>
 
        <dd>
-               <label for="LanguageCode">Language</label>
+               <label class='column' for="LanguageCode">Language</label>
                <select id="LanguageCode" name="LanguageCode">
                <?php
                        $list = getLanguageList();
@@ -392,16 +604,106 @@ if( count( $errs ) ) {
                You may select the language for the user interface of the wiki...
                Some localizations are less complete than others. This also controls
                the character encoding; Unicode is more flexible, but Latin-1 may be
-               more compatible with older browsers for some languages. The default
-               for most languages is Unicode.
+               more compatible with older browsers for some languages. Unicode will
+               be used where not specified otherwise.
+       </dt>
+
+       <dd>
+               <label class='column'>Copyright/license metadata</label>
+               <div>Select one:</div>
+
+               <ul class="plain">
+               <li><?php aField( $conf, "License", "no license metadata", "radio", "none" ); ?></li>
+               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li>
+               <li><?php
+                       aField( $conf, "License", "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>";
+                       ?></li>
+               <li><?php aField( $conf, "RightsUrl", $conf->RightsUrl, "hidden" ); ?></li>
+               <li><?php aField( $conf, "RightsText", $conf->RightsText, "hidden" ); ?></li>
+               <li><?php aField( $conf, "RightsCode", $conf->RightsCode, "hidden" ); ?></li>
+               <li><?php aField( $conf, "RightsIcon", $conf->RightsIcon, "hidden" ); ?></li>
+               </ul>
+       </dd>
+       <dt>
+               MediaWiki can include a basic license notice, icon, and machine-reable
+               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>
-               <label>&nbsp;</label>
+               <?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>
+</dl>
+
+<h2>Database config</h2>
+
+<dl class="setup">
+       <dd><?php
+               aField( $conf, "DBserver", "MySQL server" );
+       ?></dd>
+       <dt>
+               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>
+               If you only have a single user account and database available,
+               enter those here. If you have database root access (see below)
+               you can specify new accounts/databases to be created.
+       </dt>
+
+
+       <dd>
+               <?php
+               aField( $conf, "RootPW", "DB root password", "password" );
+               ?>
+       </dd>
+       <dt>
+               You will only need this if the database and/or user account
+               above don't already exist.
+               Do <em>not</em> type in your machine's root password! MySQL
+               has its own "root" user with a separate password. (It might
+               even be blank, depending on your configuration.)
+       </dt>
+
+       <dd>
+               <label class='column'>&nbsp;</label>
                <input type="submit" value="Install!" />
        </dd>
 </dl>
 
+
 </form>
 
 <?php
@@ -417,70 +719,131 @@ function writeAdminSettings( $conf ) {
 }
 
 function writeLocalSettings( $conf ) {
-       $conf->DBmysql4 = $conf->DBmysql4 ? 'true' : 'false';
+       $conf->DBmysql4 = @$conf->DBmysql4 ? 'true' : 'false';
        $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false';
-       $conf->DBsqluser = $conf->DBuser;
-       $conf->DBsqlpassword = $conf->DBpassword;
        $conf->PasswordSender = $conf->EmergencyContact;
-       if( $conf->LanguageCode == "en-utf8" ) {
-               $conf->LanguageCode = "en";
-               $conf->Encoding = "UTF-8";
+       if( preg_match( '/^([a-z]+)-latin1$/', $conf->LanguageCode, $m ) ) {
+               $conf->LanguageCode = $m[1];
+               $conf->Latin1 = true;
+       } else {
+               $conf->Latin1 = false;
+       }
+       $zlib = ($conf->zlib ? "" : "# ");
+       $magic = ($conf->ImageMagick ? "" : "# ");
+       $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
+       $pretty = ($conf->prettyURLs ? "" : "# ");
+       $ugly = ($conf->prettyURLs ? "# " : "");
+       $rights = ($conf->RightsUrl) ? "" : "# ";
+
+       $file = @fopen( "/dev/random", "r" );
+       if ( $file ) {
+               $proxyKey = bin2hex( fread( $file, 32 ) );
+               fclose( $file );
+       } else {
+               $proxyKey = "";
+               for ( $i=0; $i<8; $i++ ) {
+                       $proxyKey .= dechex(mt_rand(0, 0x7fffffff));
+               }
+               print "Warning: \$wgProxyKey is insecure\n";
        }
+
+       # Add slashes to strings for double quoting
+       $slconf = array_map( "addslashes", get_object_vars( $conf ) );
+
+
+       $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
        return "
-# This file was automatically generated. Don't touch unless you
-# know what you're doing; see LocalSettings.sample for an edit-
-# friendly file.
+# 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.
 
-\$IP = \"{$conf->IP}\";
-ini_set( \"include_path\", \"\$IP/includes:\$IP/languages:\" . ini_get(\"include_path\") );
+\$IP = \"{$slconf['IP']}\";
+ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
 include_once( \"DefaultSettings.php\" );
 
-if( \$wgCommandLineMode ) {
-       die( \"Can't use command-line utils with in-place install yet, sorry.\" );
+# If PHP's memory limit is very low, some operations may fail.
+" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . "
+
+if ( \$wgCommandLineMode ) {
+       if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
+               die( \"This script must be run from the command line\\n\" );
+       }
+} else {
+       ## Compress output if the browser supports it
+       {$zlib}if( !ini_get( 'zlib.output_compression' ) ) ob_start( 'ob_gzhandler' );
 }
 
-\$wgSitename         = \"{$conf->Sitename}\";
+\$wgSitename         = \"{$slconf['Sitename']}\";
 
-\$wgScriptPath     = \"{$conf->ScriptPath}\";
+\$wgScriptPath     = \"{$slconf['ScriptPath']}\";
 \$wgScript           = \"\$wgScriptPath/index.php\";
 \$wgRedirectScript   = \"\$wgScriptPath/redirect.php\";
 
-\$wgArticlePath      = \"\$wgScript?title=\$1\";
-# \$wgArticlePath     = \"\$wgScript/\$1\"; # Prettier if you're setup for it
+## If using PHP as a CGI module, use the ugly URLs
+{$pretty}\$wgArticlePath      = \"\$wgScript/\$1\";
+{$ugly}\$wgArticlePath      = \"\$wgScript?title=\$1\";
 
-\$wgStyleSheetPath   = \"\$wgScriptPath/stylesheets\";
-\$wgStyleSheetDirectory = \"\$IP/stylesheets\";
+\$wgStylePath        = \"\$wgScriptPath/stylesheets\";
+\$wgStyleDirectory   = \"\$IP/stylesheets\";
+\$wgLogo             = \"\$wgStylePath/images/wiki.png\";
 
 \$wgUploadPath       = \"\$wgScriptPath/images\";
-\$wgUploadDirectory    = \"\$IP/images\";
-\$wgLogo                               = \"\$wgUploadPath/wiki.png\";
-
-\$wgEmergencyContact = \"{$conf->EmergencyContact}\";
-\$wgPasswordSender     = \"{$conf->PasswordSender}\";
-
-\$wgDBserver         = \"{$conf->DBserver}\";
-\$wgDBname           = \"{$conf->DBname}\";
-\$wgDBuser           = \"{$conf->DBuser}\";
-\$wgDBpassword       = \"{$conf->DBpassword}\";
-\$wgDBsqluser        = \"{$conf->DBsqluser}\";
-\$wgDBsqlpassword      = \"{$conf->DBsqlpassword}\";
+\$wgUploadDirectory  = \"\$IP/images\";
+
+\$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
+\$wgPasswordSender     = \"{$slconf['PasswordSender']}\";
+
+\$wgDBserver         = \"{$slconf['DBserver']}\";
+\$wgDBname           = \"{$slconf['DBname']}\";
+\$wgDBuser           = \"{$slconf['DBuser']}\";
+\$wgDBpassword       = \"{$slconf['DBpassword']}\";
+
+## To allow SQL queries through the wiki's Special:Askaql page,
+## uncomment the next lines. THIS IS VERY INSECURE. If you want
+## to allow semipublic read-only SQL access for your sysops,
+## you should define a MySQL user with limited privileges.
+## See MySQL docs: http://www.mysql.com/doc/en/GRANT.html
+#
+# \$wgAllowSysopQueries = true;
+# \$wgDBsqluser        = \"sqluser\";
+# \$wgDBsqlpassword    = \"sqlpass\";
 
 \$wgDBmysql4 = \$wgEnablePersistentLC = {$conf->DBmysql4};
 
+## To enable image uploads, make sure the 'images' directory
+## is writable, then uncomment this:
+# \$wgDisableUploads           = false;
 \$wgUseImageResize             = {$conf->UseImageResize};
+{$magic}\$wgUseImageMagick = true;
+{$magic}\$wgImageMagickConvertCommand = \"{$convert}\";
 
 ## If you have the appropriate support software installed
 ## you can enable inline LaTeX equations:
 # \$wgUseTeX                   = true;
-# \$wgMathPath         = \"{$wgUploadPath}/math\";
-# \$wgMathDirectory    = \"{$wgUploadDirectory}/math\";
-# \$wgTmpDirectory     = \"{$wgUploadDirectory}/tmp\";
+\$wgMathPath         = \"{\$wgUploadPath}/math\";
+\$wgMathDirectory    = \"{\$wgUploadDirectory}/math\";
+\$wgTmpDirectory     = \"{\$wgUploadDirectory}/tmp\";
 
 \$wgLocalInterwiki   = \$wgSitename;
 
-\$wgLanguageCode = \"{$conf->LanguageCode}\";
-" . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$conf->Encoding}\";" : "" ) . "
+\$wgLanguageCode = \"{$slconf['LanguageCode']}\";
+\$wgUseLatin1 = " . ($conf->Latin1 ? 'true' : 'false') . ";\n
+
+\$wgProxyKey = \"$proxyKey\";
 
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
+# \$wgDefaultSkin = 'monobook';
+
+## For attaching licensing metadata to pages, and displaying an
+## appropriate copyright notice / icon. GNU Free Documentation
+## License and Creative Commons licenses are supported so far.
+{$rights}\$wgEnableCreativeCommonsRdf = true;
+\$wgRightsPage = \"\"; # Set to the title of a wiki page that describes your license/copyright
+\$wgRightsUrl = \"{$conf->RightsUrl}\";
+\$wgRightsText = \"{$conf->RightsText}\";
+\$wgRightsIcon = \"{$conf->RightsIcon}\";
+# \$wgRightsCode = \"{$conf->RightsCode}\"; # Not yet used
 ";
 }
 
@@ -490,19 +853,47 @@ function dieout( $text ) {
 
 function importPost( $name, $default = "" ) {
        if( isset( $_POST[$name] ) ) {
-               return $_POST[$name];
+               $retval = $_POST[$name];
+               if ( get_magic_quotes_gpc() ) {
+                       $retval = stripslashes( $retval );
+               }
        } else {
-               return $default;
+               $retval = $default;
        }
+       return $retval;
 }
 
-function aField( &$conf, $field, $text, $type = "" ) {
-       if( $type != "" ) $type = "type=\"$type\"";
-       echo "\t\t<label for=\"$field\">$text</label>\n";
-       echo "\t\t<input $type name=\"$field\" id=\"$field\" value=\"";
-       echo htmlspecialchars( $conf->$field );
+function aField( &$conf, $field, $text, $type = "", $value = "" ) {
+       if( $type != "" ) {
+               $xtype = "type=\"$type\"";
+       } else {
+               $xtype = "";
+       }
+
+       if(!(isset($id)) or ($id == "") ) $id = $field;
+       $nolabel = ($type == "radio") || ($type == "hidden");
+       if( $nolabel ) {
+               echo "\t\t<label>";
+       } else {
+               echo "\t\t<label class='column' for=\"$id\">$text</label>\n";
+       }
+
+       if( $type == "radio" && $value == $conf->$field ) {
+               $checked = "checked='checked'";
+       } else {
+               $checked = "";
+       }
+       echo "\t\t<input $xtype name=\"$field\" id=\"$id\" $checked value=\"";
+       if( $type == "radio" ) {
+               echo htmlspecialchars( $value );
+       } else {
+               echo htmlspecialchars( $conf->$field );
+       }
        echo "\" />\n";
-       
+       if( $nolabel ) {
+               echo " $text</label>\n";
+       }
+
        global $errs;
        if(isset($errs[$field])) echo "<span class='error'>" . $errs[$field] . "</span>\n";
 }
@@ -513,23 +904,24 @@ function getLanguageList() {
                $wgLanguageCode = "xxx";
                function wfLocalUrl( $x ) { return $x; }
                function wfLocalUrlE( $x ) { return $x; }
-               include( "../languages/Language.php" );
+               require_once( "../languages/Names.php" );
        }
-       
+
        $codes = array();
        $latin1 = array( "da", "de", "en", "es", "fr", "nl", "sv" );
-       
+
        $d = opendir( "../languages" );
        while( false !== ($f = readdir( $d ) ) ) {
                if( preg_match( '/Language([A-Z][a-z]+)\.php$/', $f, $m ) ) {
                        $code = strtolower( $m[1] );
-                       $codes[$code] = "$code - " . $wgLanguageNames[$code];
                        if( in_array( $code, $latin1 ) ) {
-                               $codes[$code] .= " - Latin-1";
+                               $codes[$code] = "$code - " . $wgLanguageNames[$code] . " - Unicode";
+                               $codes[$code.'-latin1'] = "$code - " . $wgLanguageNames[$code] . " - Latin-1";
+                       } else {
+                               $codes[$code] = "$code - " . $wgLanguageNames[$code];
                        }
                }
        }
-       $codes["en-utf8"] = "en - English - Unicode";
        closedir( $d );
        ksort( $codes );
        return $codes;
@@ -538,4 +930,4 @@ function getLanguageList() {
 ?>
 
 </body>
-</html>
\ No newline at end of file
+</html>