fixed notice and nasty error due to /dev/random exhaustion
[lhc/web/wiklou.git] / config / index.php
index bd88567..c97d78b 100644 (file)
@@ -2,23 +2,25 @@
 # 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 
+# 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">
@@ -38,7 +40,7 @@ header( "Content-type: text/html; charset=utf-8" );
                padding: 8px;
                margin-left: 8px;
        }
-       
+
        dl.setup dd {
                margin-left: 0;
        }
@@ -73,30 +75,30 @@ header( "Content-type: text/html; charset=utf-8" );
 <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 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.
@@ -106,7 +108,11 @@ header( "Content-type: text/html; charset=utf-8" );
 <?php
 
 $IP = ".."; # Just to suppress notices, not for anything useful
-include( "../includes/DefaultSettings.php" );
+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>
@@ -118,15 +124,15 @@ 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>" );
@@ -134,14 +140,14 @@ if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" )
 
 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
@@ -149,16 +155,19 @@ if( !is_writable( "." ) ) {
 }
 
 
-include( "../install-utils.inc" );
-include( "../maintenance/updaters.inc" );
+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 ) {
                # Hackish
-               global $wgInputEncoding;
-               if( strcasecmp( $wgInputEncoding, "utf-8" ) == 0 ) {
-                       return $data;
-               } else {
+               global $wgUseLatin1;
+               if( $wgUseLatin1 ) {
                        return utf8_decode( $data ); /* to latin1 wikis */
+               } else {
+                       return $data;
                }
        }
        function getSitename() { return $this->getEncoded( $this->Sitename ); }
@@ -199,6 +208,35 @@ default:
 }
 print "</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><b>XML / Latin1-UTF-8 conversion is missing! Wiki will probably not work.</b></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 {
+       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";
@@ -231,7 +269,7 @@ $conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
 # $conf->IP = "/Users/brion/Sites/inplace";
 chdir( ".." );
 $conf->IP = getcwd();
-$conf->IP = preg_replace( "/\\\\/","\\\\\\\\",$conf->IP );  // For Windows, \ -> \\ 
+$conf->IP = preg_replace( "/\\\\/","\\\\\\\\",$conf->IP );  // For Windows, \ -> \\
 chdir( "config" );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
@@ -240,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" );
@@ -249,7 +287,7 @@ 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" );
@@ -279,7 +317,7 @@ 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 = "{$conf->ScriptPath}/stylesheets/images/gnu-fdl.png";
+       $conf->RightsIcon = '${wgStylePath}/images/gnu-fdl.png';
 } elseif( $conf->License == "none" ) {
        $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
 } else {
@@ -292,23 +330,25 @@ if( $conf->License == "gfdl" ) {
 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 */
-               require_once( "Setup.php" );
+               require_once( "includes/Setup.php" );
+               chdir( "config" );
+
                require_once( "../maintenance/InitialiseMessages.inc" );
 
                $wgTitle = Title::newFromText( "Installation script" );
                $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
                $wgDatabase->mIgnoreErrors = true;
-               
+
                @$myver = mysql_get_server_info( $wgDatabase->mConn );
                if( $myver ) {
                        $conf->Root = true;
@@ -353,7 +393,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        }
                        if( !$ok ) continue;
                }
-               
+
                if ( !$wgDatabase->isOpen() ) {
                        $errs["DBserver"] = "Couldn't connect to database";
                        continue;
@@ -366,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";
@@ -381,23 +421,38 @@ 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. 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 {
@@ -407,11 +462,16 @@ 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)" );
-                       
+                       # setting up the db user
+                       if( $conf->Root ) {
+                               print "<li>Granting user permissions...</li>\n";
+                               dbsource( "../maintenance/users.sql", $wgDatabase );
+                       }
+
                        if( $conf->SysopName ) {
                                $u = User::newFromName( $conf->getSysopName() );
                                if ( 0 == $u->idForName() ) {
@@ -428,7 +488,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        } else {
                                print "<li>Skipped sysop account creation, no name given.</li>\n";
                        }
-                       
+
                        print "<li>Initialising log pages...";
                        $logs = array(
                                "uploadlogpage" => "uploadlogpagetext",
@@ -440,42 +500,37 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        $now = wfTimestampNow();
                        $won = wfInvertTimestamp( $now );
                        foreach( $logs as $page => $text ) {
-                               $logTitle = wfStrencode( $wgLang->ucfirst( str_replace( " ", "_", wfMsgNoDB( $page ) ) ) );
-                               $logText = wfStrencode( wfMsgNoDB( $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";
-                       
-                       if( $conf->Root ) {
-                               print "<li>Granting user permissions...</li>\n";
-                               dbsource( "../maintenance/users.sql", $wgDatabase );
-                       }
                }
 
                /* Write out the config file now that all is well */
                print "<p>Creating LocalSettings.php...</p>\n\n";
                $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( "<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" .
@@ -483,10 +538,10 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                }
                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 );
 }
 ?>
@@ -497,7 +552,7 @@ 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";
        }
@@ -552,7 +607,7 @@ if( count( $errs ) ) {
                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>
@@ -561,7 +616,7 @@ if( count( $errs ) ) {
                <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" );
@@ -580,8 +635,8 @@ if( count( $errs ) ) {
                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>
@@ -667,9 +722,11 @@ function writeLocalSettings( $conf ) {
        $conf->DBmysql4 = @$conf->DBmysql4 ? 'true' : 'false';
        $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false';
        $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 ? "" : "# ");
@@ -678,17 +735,34 @@ function writeLocalSettings( $conf ) {
        $ugly = ($conf->prettyURLs ? "# " : "");
        $rights = ($conf->RightsUrl) ? "" : "# ";
 
-#      $proxyKey = Parser::getRandomString() . Parser::getRandomString();
-       
+       $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 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$sep\$IP/languages$sep\" . ini_get(\"include_path\") );
-require_once( \"DefaultSettings.php\" );
+\$IP = \"{$slconf['IP']}\";
+ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
+include_once( \"DefaultSettings.php\" );
+
+# 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 ) ) {
@@ -699,9 +773,9 @@ if ( \$wgCommandLineMode ) {
        {$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\";
 
@@ -716,13 +790,13 @@ if ( \$wgCommandLineMode ) {
 \$wgUploadPath       = \"\$wgScriptPath/images\";
 \$wgUploadDirectory  = \"\$IP/images\";
 
-\$wgEmergencyContact = \"{$conf->EmergencyContact}\";
-\$wgPasswordSender   = \"{$conf->PasswordSender}\";
+\$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
+\$wgPasswordSender     = \"{$slconf['PasswordSender']}\";
 
-\$wgDBserver         = \"{$conf->DBserver}\";
-\$wgDBname           = \"{$conf->DBname}\";
-\$wgDBuser           = \"{$conf->DBuser}\";
-\$wgDBpassword       = \"{$conf->DBpassword}\";
+\$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
@@ -750,23 +824,17 @@ if ( \$wgCommandLineMode ) {
 \$wgMathDirectory    = \"{\$wgUploadDirectory}/math\";
 \$wgTmpDirectory     = \"{\$wgUploadDirectory}/tmp\";
 
-\$wgUsePHPTal = true;
-if ( \$wgUsePHPTal ) {
-      ini_set( \"include_path\", \"\$IP/PHPTAL-NP-0.7.0/libs$sep\" . ini_get(\"include_path\") );
-}
-
 \$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';
 
-## This is incomplete, ignore it:
-#\$wgProxyKey = $proxyKey;
-
 ## 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.
@@ -784,11 +852,15 @@ function dieout( $text ) {
 }
 
 function importPost( $name, $default = "" ) {
-       if( isset( $_REQUEST[$name] ) ) {
-               return $_REQUEST[$name];
+       if( isset( $_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 = "", $value = "" ) {
@@ -797,7 +869,7 @@ function aField( &$conf, $field, $text, $type = "", $value = "" ) {
        } else {
                $xtype = "";
        }
-       
+
        if(!(isset($id)) or ($id == "") ) $id = $field;
        $nolabel = ($type == "radio") || ($type == "hidden");
        if( $nolabel ) {
@@ -805,7 +877,7 @@ function aField( &$conf, $field, $text, $type = "", $value = "" ) {
        } else {
                echo "\t\t<label class='column' for=\"$id\">$text</label>\n";
        }
-       
+
        if( $type == "radio" && $value == $conf->$field ) {
                $checked = "checked='checked'";
        } else {
@@ -821,7 +893,7 @@ function aField( &$conf, $field, $text, $type = "", $value = "" ) {
        if( $nolabel ) {
                echo " $text</label>\n";
        }
-       
+
        global $errs;
        if(isset($errs[$field])) echo "<span class='error'>" . $errs[$field] . "</span>\n";
 }
@@ -832,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", "nl", "sv" );
-       
+       $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;