Some corrections, and a test for bug 361

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

diff --git a/index.php b/index.php
index ad36e52..ffc481d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -5,9 +5,13 @@
 $wgRequestTime = microtime();
 
 unset( $IP );
-@ini_set( "allow_url_fopen", 0 ); # For security...
-if(!file_exists("LocalSettings.php")) {
-       die( "You'll have to <a href='config/index.php'>set the wiki up</a> first!" );
+@ini_set( 'allow_url_fopen', 0 ); # For security...
+if( !file_exists( 'LocalSettings.php' ) ) {
+       if ( file_exists( 'config/LocalSettings.php' ) ) {
+               die( "To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory.\n" );
+       } else {
+               die( "You'll have to <a href='config/index.php'>set the wiki up</a> first!" );
+       }
 }
 
 # Valid web server entry point, enable includes.
@@ -25,15 +29,10 @@ OutputPage::setEncodings(); # Not really used yet
 
 # Query string fields
 $action = $wgRequest->getVal( "action", "view" );
-
-if( isset( $_SERVER['PATH_INFO'] ) && $wgUsePathInfo ) {
-       $title = substr( $_SERVER['PATH_INFO'], 1 );
-} else {
-       $title = $wgRequest->getVal( "title" );
-}
+$title = $wgRequest->getVal( "title" );
 
 # Placeholders in case of DB error
-$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
+$wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
 $wgArticle = new Article($wgTitle);
 
 $action = strtolower( trim( $action ) );
@@ -42,7 +41,7 @@ if ($wgRequest->getVal( "printable" ) == "yes") {
 }
 
 if ( "" == $title && "delete" != $action ) {
-       $wgTitle = Title::newFromText( wfMsg( "mainpage" ) );
+       $wgTitle = Title::newFromText( wfMsgForContent( "mainpage" ) );
 } elseif ( $curid = $wgRequest->getInt( 'curid' ) ) {
        # URLs like this are generated by RC, because rc_title isn't always accurate
        $wgTitle = Title::newFromID( $curid );
@@ -61,7 +60,8 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( "main-action" );
-if( $search = $wgRequest->getText( 'search' ) ) {
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
        require_once( 'SearchEngine.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
        $searchEngine = new SearchEngine( $search );
@@ -73,7 +73,7 @@ if( $search = $wgRequest->getText( 'search' ) ) {
                $searchEngine->goResult();
        }
 } else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
-       $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
+       $wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
        $wgOut->errorpage( "badtitle", "badtitletext" );
 } else if ( $wgTitle->getInterwiki() != "" ) {
        $url = $wgTitle->getFullURL();
@@ -81,11 +81,12 @@ if( $search = $wgRequest->getText( 'search' ) ) {
        if ( !preg_match( "/^" . preg_quote( $wgServer, "/" ) . "/", $url ) && $wgTitle->isLocal() ) {
                $wgOut->redirect( $url );
        } else {
-               $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
+               $wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
                $wgOut->errorpage( "badtitle", "badtitletext" );
        }
-} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title &&
-  !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
+} else if ( ( $action == "view" ) &&
+       (!isset( $_GET['title'] ) || $wgTitle->getPrefixedDBKey() != $_GET['title'] ) &&
+       !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
 {
        /* redirect to canonical url, make it a 301 to allow caching */
        $wgOut->redirect( $wgTitle->getFullURL(), '301');
@@ -96,7 +97,7 @@ if( $search = $wgRequest->getText( 'search' ) ) {
        SpecialPage::executePath( $wgTitle );
 } else {
        if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
-               $wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
+               $wgTitle = Title::makeTitle( NS_IMAGE, $wgTitle->getDBkey() );
        }
 
        switch( $wgTitle->getNamespace() ) {