Subject UtfNormal::cleanUp() to the same tests as UtfNormal::toNFC()

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

diff --git a/index.php b/index.php
index 755e04a..1386b26 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.
@@ -28,7 +32,7 @@ $action = $wgRequest->getVal( "action", "view" );
 $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 ) );
@@ -37,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 );
@@ -46,6 +50,9 @@ if ( "" == $title && "delete" != $action ) {
 }
 wfProfileOut( "main-misc-setup" );
 
+# Debug statement for user levels
+// print_r($wgUser);
+
 # If the user is not logged in, the Namespace:title of the article must be in
 # the Read array in order for the user to see it. (We have to check here to
 # catch special pages etc. We check again in Article::view())
@@ -58,18 +65,11 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 wfProfileIn( "main-action" );
 $search = $wgRequest->getText( 'search' );
 if( !is_null( $search ) && $search !== '' ) {
-       require_once( 'SearchEngine.php' );
+       require_once( 'includes/SpecialSearch.php' );
        $wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
-       $searchEngine = new SearchEngine( $search );
-       if( $wgRequest->getVal( 'fulltext' ) ||
-               !is_null( $wgRequest->getVal( 'offset' ) ) ||
-               !is_null ($wgRequest->getVal( 'searchx' ) ) ) {
-               $searchEngine->showResults();
-       } else {
-               $searchEngine->goResult();
-       }
+       wfSpecialSearch();
 } 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();
@@ -77,7 +77,7 @@ if( !is_null( $search ) && $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" ) &&
@@ -149,10 +149,10 @@ if( !is_null( $search ) && $search !== '' ) {
                                wfCreativeCommonsRdf( $wgArticle );
                        }
                        break;
-               case "credits":
-                       require_once( "includes/Credits.php" );
+               case "credits":
+                       require_once( "includes/Credits.php" );
                        showCreditsPage( $wgArticle );
-                       break;
+                       break;
                case "edit":
                case "submit":
                        if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {