X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=config%2Findex.php;h=85890fa642050f8fab09fbf40474cf663bb1e1f7;hb=aa6a85ed3905f50a8c50a4df531343c6fdd6c902;hp=bd8e62936e59cd6f45094e41ccb22461213a5af1;hpb=39f8a5753dd51da3b2551eb05f756aa0a170e29c;p=lhc%2Fweb%2Fwiklou.git diff --git a/config/index.php b/config/index.php index bd8e62936e..85890fa642 100644 --- a/config/index.php +++ b/config/index.php @@ -2,23 +2,25 @@ # MediaWiki web-based config/installation # Copyright (C) 2004 Brion Vibber # 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 ); ?> @@ -38,11 +40,11 @@ header( "Content-type: text/html; charset=utf-8" ); 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: 12em; @@ -60,6 +62,11 @@ header( "Content-type: text/html; charset=utf-8" ); .error { color: red; } + ul.plain { + list-style: none; + clear: both; + margin-left: 12em; + } @@ -68,30 +75,30 @@ header( "Content-type: text/html; charset=utf-8" );
+ src="../stylesheets/images/wiki.png" width="135" height="135" alt="" border="0" />
- + MediaWiki is Copyright (C) 2001-2004 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, - Tim Starling, Erik Möller, and others.

- + Tim Starling, Erik Möller, Gabriel Wicke and others.

+ - +

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. @@ -101,7 +108,12 @@ header( "Content-type: text/html; charset=utf-8" );

MediaWiki installation

@@ -113,15 +125,15 @@ include( "../includes/DefaultSettings.php" ); if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) { dieout( "

Wiki is configured.

- +

Already configured... return to the wiki.

- +

(You should probably remove this directory for added security.)

" ); } if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) { dieout( "

You're configured!

- +

Please move LocalSettings.php to the parent directory, then try out your wiki. (You should remove this config directory for added security once you're done.)

" ); @@ -129,14 +141,14 @@ if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) if( !is_writable( "." ) ) { dieout( "

Can't write config file, aborting

- +

In order to configure the wiki you have to make the config subdirectory writable by the web server. Once configuration is done you'll move the created LocalSettings.php to the parent directory, and for added safety you can then remove the config subdirectory entirely.

- +

To make the directory writable on a Unix/Linux system:

- + 
 	cd /path/to/wiki
 	chmod a+w config
@@ -144,16 +156,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 ); }
@@ -163,26 +178,60 @@ class ConfigData {
 
 ?>
 
+
Please include all of the lines below when reporting installation problems.

 
 
Checking environment...

 
    
 PHP " . phpversion() . " ok\n";
+
+print "
  • PHP " . phpversion() . ": ";
+if( version_compare( phpversion(), "5.0", "lt" ) ) {
+ 	print "ok";
+} else {
+	print " the MonoBook skin will be disabled due to an incompatibility
+		between the PHPTAL template library and PHP 5. The wiki should
+		function normally, but with the older look and feel.";
+}
+print "
    • \n";
+
+if( ini_get( "register_globals" ) ) {
+	?>
+	
  • Warning: PHP's
+	register_globals
+	option is enabled. MediaWiki will work correctly, but this setting
+	increases your exposure to potential security vulnerabilities in PHP-based
+	software running on your server. You should disable it if you are able.
    • 
+	
+	
  • Warning: PHP's
+	safe mode is active!
+	You will likely have problems caused by this. You may need to make the
+	'images' subdirectory writable or specify a TMP environment variable pointing to
+	a writable temporary directory owned by you, since safe mode breaks the system
+	temporary directory.
    • 
+	prettyURLs = true;
 print "
  • PHP server API is $sapi; ";
 switch( $sapi ) {
 case "apache":
+case "apache2handler":
 	print "ok, using pretty URLs (index.php/Page_Title)";
 	break;
 case "cgi":
 case "cgi-fcgi":
+case "apache2filter":
 	print "using ugly URLs (index.php?title=Page_Title)";
 	$conf->prettyURLs = false;
 	break;
@@ -191,6 +240,37 @@ default:
 }
 print "
    • \n";
 
+$conf->xml = function_exists( "utf8_encode" );
+if( $conf->xml ) {
+	print "
  • Have XML / Latin1-UTF-8 conversion support.
    • \n";
+} else {
+	dieout( "PHP's XML module is missing; the wiki requires functions in
+		this module and won't work in this configuration.
+		If you're running Mandrake, install the php-xml package." );
+}
+
+$memlimit = ini_get( "memory_limit" );
+$conf->raiseMemory = false;
+if( empty( $memlimit ) ) {
+	print "
  • PHP is configured with no memory_limit.
    • \n";
+} else {
+	print "
  • PHP's memory_limit is " . htmlspecialchars( $memlimit ) . ". If this is too low, installation may fail! ";
+	$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 "
    • \n";
+}
+
 $conf->zlib = function_exists( "gzencode" );
 if( $conf->zlib ) {
 	print "
  • Have zlib support; enabling output compression.
    • \n";
@@ -223,7 +303,6 @@ $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 "
  • Installation directory: " . htmlspecialchars( $conf->IP ) . "
    • \n";
 
@@ -232,7 +311,7 @@ $conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $_SERVER["REQUEST_U
 print "
  • Script URI path: " . htmlspecialchars( $conf->ScriptPath ) . "
    • \n";
 
 	$conf->posted = ($_SERVER["REQUEST_METHOD"] == "POST");
-	
+
 	$conf->Sitename = ucfirst( importPost( "Sitename", "" ) );
 	$conf->EmergencyContact = importPost( "EmergencyContact", $_SERVER["SERVER_ADMIN"] );
 	$conf->DBserver = importPost( "DBserver", "localhost" );
@@ -241,7 +320,7 @@ print "
  • Script URI path: " . htmlspecialchars( $conf->ScriptPath ) . "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" );
@@ -252,6 +331,9 @@ $errs = array();
 if( $conf->Sitename == "" || $conf->Sitename == "MediaWiki" || $conf->Sitename == "Mediawiki" ) {
 	$errs["Sitename"] = "Must not be blank or \"MediaWiki\".";
 }
+if( $conf->DBuser == "" ) {
+	$errs["DBuser"] = "Must not be blank";
+}
 if( $conf->DBpassword == "" ) {
 	$errs["DBpassword"] = "Must not be blank";
 }
@@ -266,28 +348,48 @@ if( $conf->SysopPass != $conf->SysopPass2 ) {
 	$errs["SysopPass2"] = "Passwords don't match!";
 }
 
+$conf->License = importRequest( "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 = importRequest( "RightsUrl", "" );
+	$conf->RightsText = importRequest( "RightsText", "" );
+	$conf->RightsCode = importRequest( "RightsCode", "" );
+	$conf->RightsIcon = importRequest( "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" );
-		include_once( "../maintenance/InitialiseMessages.inc" );
+		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 ) {
+		if( $myver ) {
+			$conf->Root = true;
+			print "
  • Connected as root (automatic)
    • \n";
+		} else {
 			print "
  • MySQL error " . ($err = mysql_errno() ) .
 				": " . htmlspecialchars( mysql_error() );
 			$ok = false;
@@ -327,7 +429,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			}
 			if( !$ok ) continue;
 		}
-		
+
 		if ( !$wgDatabase->isOpen() ) {
 			$errs["DBserver"] = "Couldn't connect to database";
 			continue;
@@ -340,7 +442,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			$local = writeLocalSettings( $conf );
 		}
 		print "
    • \n";
-		
+
 		@$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
 		if( $sel ) {
 			print "
  • Database " . htmlspecialchars( $wgDBname ) . " exists
    • \n";
@@ -355,23 +457,39 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			}
 			print "
  • Created database " . htmlspecialchars( $wgDBname ) . "
    • \n";
 		}
-		
+
 		$wgDatabase->selectDB( $wgDBname );
-		
+
 		if( $wgDatabase->tableExists( "cur" ) ) {
 			print "
  • There are already MediaWiki tables in this database. Checking if updates are needed...
    • \n
    ";
-			
+
 			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();
+			do_image_name_unique_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 "
    \n";
 			print "
  • Finished update checks.
    • \n";
 		} else {
@@ -381,11 +499,16 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			dbsource( "../maintenance/interwiki.sql", $wgDatabase );
 			dbsource( "../maintenance/indexes.sql", $wgDatabase );
 			print " done.\n";
-			
+
 			print "
  • 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 "
  • Granting user permissions...
    • \n";
+				dbsource( "../maintenance/users.sql", $wgDatabase );
+			}
+
 			if( $conf->SysopName ) {
 				$u = User::newFromName( $conf->getSysopName() );
 				if ( 0 == $u->idForName() ) {
@@ -402,7 +525,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			} else {
 				print "
  • Skipped sysop account creation, no name given.
    • \n";
 			}
-			
+
 			print "
  • Initialising log pages...";
 			$logs = array(
 				"uploadlogpage" => "uploadlogpagetext",
@@ -414,53 +537,48 @@ 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 "
    • \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" ) ) . "','$now','$won','$now')";
+			  wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) . "','$now','$won','$now')";
 			$wgDatabase->query( $sql, $fname );
-			
+
 			print "
  • ";
 			initialiseMessages();
 			print "
    • \n";
-			
-			if( $conf->Root ) {
-				# Grant user permissions
-				dbsource( "../maintenance/users.sql", $wgDatabase );
-			}
 		}
 
 		/* Write out the config file now that all is well */
 		print "
    Creating LocalSettings.php...
    \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( "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...
    \n" .
+			dieout( "
    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...
    \n" .
 			"
    Here's the file that would have been written, try to paste it into place manually:
    \n" .
 			"
    \n" . htmlspecialchars( $localSettings ) . "
    \n" );
 		}
 		fwrite( $f, $localSettings );
 		fclose( $f );
-		
-		print "
    Success! Move the LocalSettings.php file into the parent directory, then follow
+
+		print "
    Success! Move the config/LocalSettings.php file into the parent directory, then follow
 		this link to your wiki.
    \n";
-		
+
 	} while( false );
 }
 ?>
@@ -471,7 +589,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 
 if( count( $errs ) ) {
 	/* Display options form */
-	
+
 	if( $conf->posted ) {
 		echo "
    Something's not quite right yet; make sure everything below is filled out correctly.
    \n";
 	}
@@ -508,7 +626,7 @@ if( count( $errs ) ) {
 	
 
 	
    
-		
+		
 		
 	
    
 
@@ -608,43 +760,79 @@ function writeAdminSettings( $conf ) {
 ";
 }
 
+function escapePhpString( $string ) {
+	return strtr( $string,
+		array(
+			"\n" => "\\n",
+			"\r" => "\\r",
+			"\t" => "\\t",
+			"\\" => "\\\\",
+			"\$" => "\\\$",
+			"\"" => "\\\""
+		));
+}
+
 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 ? "" : "# ");
 	$convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
 	$pretty = ($conf->prettyURLs ? "" : "# ");
 	$ugly = ($conf->prettyURLs ? "# " : "");
-	$proxyKey = Parser::getRandomString() . Parser::getRandomString();
-	
+	$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( "escapePhpString", get_object_vars( $conf ) );
+	if( $conf->License == 'gfdl' ) {
+		# Needs literal string interpolation for the current style path
+		$slconf['RightsIcon'] = $conf->RightsIcon;
+	}
+
 	$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\") );
+\$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 ) ) {
 		die( \"This script must be run from the command line\\n\" );
 	}
-} else {
+} elseif ( empty( \$wgConfiguring ) ) {
 	## 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\";
 
@@ -652,20 +840,20 @@ if ( \$wgCommandLineMode ) {
 {$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\";
+\$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
@@ -693,22 +881,26 @@ if ( \$wgCommandLineMode ) {
 \$wgMathDirectory    = \"{\$wgUploadDirectory}/math\";
 \$wgTmpDirectory     = \"{\$wgUploadDirectory}/tmp\";
 
-## Experimental layout template subsystems
-\$wgUsePHPTal = false;
-\$wgUseSmarty = false;
-if ( \$wgUsePHPTal ) {
-      ini_set( \"include_path\", \"\$IP/PHPTAL-NP-0.7.0/libs$sep\" . ini_get(\"include_path\") );
-}
-if ( \$wgUseSmarty ) {
-      ini_set( \"include_path\", \"\$IP/Smarty-2.6.2/libs$sep\" . ini_get(\"include_path\") );
-}
-
 \$wgLocalInterwiki   = \$wgSitename;
 
-\$wgLanguageCode = \"{$conf->LanguageCode}\";
-" . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$conf->Encoding}\";" : "" ) . "
-\$wgProxyKey = $proxyKey;
+\$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 = \"{$slconf['RightsUrl']}\";
+\$wgRightsText = \"{$slconf['RightsText']}\";
+\$wgRightsIcon = \"{$slconf['RightsIcon']}\";
+# \$wgRightsCode = \"{$slconf['RightsCode']}\"; # Not yet used
 ";
 }
 
@@ -716,21 +908,57 @@ function dieout( $text ) {
 	die( $text . "\n\n\n" );
 }
 
-function importPost( $name, $default = "" ) {
-	if( isset( $_POST[$name] ) ) {
-		return $_POST[$name];
+function importVar( &$var, $name, $default = "" ) {
+	if( isset( $var[$name] ) ) {
+		$retval = $var[$name];
+		if ( get_magic_quotes_gpc() ) {
+			$retval = stripslashes( $retval );
+		}
 	} else {
-		return $default;
+		$retval = $default;
 	}
+	return $retval;
+}
+
+function importPost( $name, $default = "" ) {
+	return importVar( $_POST, $name, $default );
+}
+
+function importRequest( $name, $default = "" ) {
+	return importVar( $_REQUEST, $name, $default );
 }
 
-function aField( &$conf, $field, $text, $type = "" ) {
-	if( $type != "" ) $type = "type=\"$type\"";
-	echo "\t\t\n";
-	echo "\t\t$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\n";
+	}
+
 	global $errs;
 	if(isset($errs[$field])) echo "" . $errs[$field] . "\n";
 }
@@ -741,23 +969,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;