Remove a single space that breaks a parser test

[lhc/web/wiklou.git] / config / index.php

diff --git a/config/index.php b/config/index.php
index 85890fa..6adbc3f 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -75,7 +75,7 @@ header( "Content-type: text/html; charset=utf-8" );
 <div id="credit">
  <center>
   <a href="http://www.mediawiki.org/"><img
-    src="../stylesheets/images/wiki.png" width="135" height="135" alt="" border="0" /></a>
+    src="../skins/common/images/wiki.png" width="135" height="135" alt="" border="0" /></a>
  </center>
 
  <b><a href="http://www.mediawiki.org/">MediaWiki</a></b> is
@@ -301,9 +301,7 @@ if( $conf->HaveGD ) {
 $conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
 
 # $conf->IP = "/Users/brion/Sites/inplace";
-chdir( ".." );
-$conf->IP = getcwd();
-chdir( "config" );
+$conf->IP = dirname( dirname( __FILE__ ) );
 print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
 
 # $conf->ScriptPath = "/~brion/inplace";
@@ -353,7 +351,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 = '${wgStylePath}/images/gnu-fdl.png';
+       $conf->RightsIcon = '${wgStylePath}/common/images/gnu-fdl.png';
 } elseif( $conf->License == "none" ) {
        $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
 } else {
@@ -372,8 +370,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                $wgCommandLineMode = false;
                chdir( ".." );
                eval($local);
-               $wgDBadminuser = $wgDBuser;
-               $wgDBadminpassword = $wgDBpassword;
+               $wgDBadminuser = "root";
+               $wgDBadminpassword = $conf->RootPW;
                $wgCommandLineMode = true;
                $wgUseDatabaseMessages = false; /* FIXME: For database failure */
                require_once( "includes/Setup.php" );
@@ -400,6 +398,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                } else {
                                        print "<li>Trying regular user...\n";
                                        /* Try the regular user... */
+                                       $wgDBadminuser = $wgDBuser;
+                                       $wgDBadminpassword = $wgDBpassword;
                                        $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
                                        $wgDatabase->isOpen();
                                        $wgDatabase->mIgnoreErrors = true;
@@ -478,6 +478,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        do_objectcache_update(); flush();
                        do_categorylinks_update(); flush();
                        do_image_name_unique_update(); flush();
+                       do_logging_update(); flush();
+                       do_user_rights_update(); flush();
 
                        if ( isTemplateInitialised() ) {
                                print "Template namespace already initialised\n";
@@ -497,7 +499,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        print "<li>Creating tables...";
                        dbsource( "../maintenance/tables.sql", $wgDatabase );
                        dbsource( "../maintenance/interwiki.sql", $wgDatabase );
-                       dbsource( "../maintenance/indexes.sql", $wgDatabase );
                        print " done.</li>\n";
 
                        print "<li>Initializing data...";
@@ -547,9 +548,10 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 
                        $titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
                        $title = $titleobj->getDBkey();
-                       $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched) " .
+                       $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched,cur_user,cur_user_text) " .
                          "VALUES (0,'$title','" .
-                         wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) . "','$now','$won','$now')";
+                         wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) .
+                         "','$now','$won','$now',0,'MediaWiki default')";
                        $wgDatabase->query( $sql, $fname );
 
                        print "<li><pre>";
@@ -789,7 +791,7 @@ function writeLocalSettings( $conf ) {
        $ugly = ($conf->prettyURLs ? "# " : "");
        $rights = ($conf->RightsUrl) ? "" : "# ";
 
-       $file = @fopen( "/dev/random", "r" );
+       $file = @fopen( "/dev/urandom", "r" );
        if ( $file ) {
                $proxyKey = bin2hex( fread( $file, 32 ) );
                fclose( $file );
@@ -816,7 +818,7 @@ function writeLocalSettings( $conf ) {
 
 \$IP = \"{$slconf['IP']}\";
 ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" );
-include_once( \"DefaultSettings.php\" );
+require_once( \"DefaultSettings.php\" );
 
 # If PHP's memory limit is very low, some operations may fail.
 " . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . "
@@ -827,7 +829,7 @@ if ( \$wgCommandLineMode ) {
        }
 } elseif ( empty( \$wgConfiguring ) ) {
        ## Compress output if the browser supports it
-       {$zlib}if( !ini_get( 'zlib.output_compression' ) ) ob_start( 'ob_gzhandler' );
+       {$zlib}if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
 }
 
 \$wgSitename         = \"{$slconf['Sitename']}\";
@@ -840,9 +842,9 @@ if ( \$wgCommandLineMode ) {
 {$pretty}\$wgArticlePath      = \"\$wgScript/\$1\";
 {$ugly}\$wgArticlePath      = \"\$wgScript?title=\$1\";
 
-\$wgStylePath        = \"\$wgScriptPath/stylesheets\";
-\$wgStyleDirectory   = \"\$IP/stylesheets\";
-\$wgLogo             = \"\$wgStylePath/images/wiki.png\";
+\$wgStylePath        = \"\$wgScriptPath/skins\";
+\$wgStyleDirectory   = \"\$IP/skins\";
+\$wgLogo             = \"\$wgStylePath/common/images/wiki.png\";
 
 \$wgUploadPath       = \"\$wgScriptPath/images\";
 \$wgUploadDirectory  = \"\$IP/images\";
@@ -977,8 +979,8 @@ function getLanguageList() {
 
        $d = opendir( "../languages" );
        while( false !== ($f = readdir( $d ) ) ) {
-               if( preg_match( '/Language([A-Z][a-z]+)\.php$/', $f, $m ) ) {
-                       $code = strtolower( $m[1] );
+               if( preg_match( '/Language([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
+                       $code = str_replace( '_', '-', strtolower( $m[1] ) );
                        if( in_array( $code, $latin1 ) ) {
                                $codes[$code] = "$code - " . $wgLanguageNames[$code] . " - Unicode";
                                $codes[$code.'-latin1'] = "$code - " . $wgLanguageNames[$code] . " - Latin-1";