Update for tomg's changes to external link formatting and TOC. Currently passing...

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

diff --git a/index.php b/index.php
index 9b829c7..dcfbed9 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.
@@ -27,10 +31,6 @@ OutputPage::setEncodings(); # Not really used yet
 $action = $wgRequest->getVal( "action", "view" );
 $title = $wgRequest->getVal( "title" );
 
-# Placeholders in case of DB error
-$wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
-$wgArticle = new Article($wgTitle);
-
 $action = strtolower( trim( $action ) );
 if ($wgRequest->getVal( "printable" ) == "yes") {
        $wgOut->setPrintable();
@@ -46,6 +46,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())
@@ -56,18 +59,12 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( "main-action" );
+
 $search = $wgRequest->getText( 'search' );
-if( !is_null( $search ) && $search !== '' ) {
-       require_once( 'SearchEngine.php' );
+if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
+       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( wfMsgForContent( "badtitle" ) );
        $wgOut->errorpage( "badtitle", "badtitletext" );
@@ -85,6 +82,7 @@ if( !is_null( $search ) && $search !== '' ) {
        !count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
 {
        /* redirect to canonical url, make it a 301 to allow caching */
+       $wgOut->setSquidMaxage( 1200 );
        $wgOut->redirect( $wgTitle->getFullURL(), '301');
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
        # actions that need to be made when we have a special pages
@@ -149,15 +147,17 @@ 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;
-               case "edit":
+                       break;
                case "submit":
                        if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {
+                               # Send a cookie so anons get talk message notifications
                                User::SetupSession();
                        }
+                       # Continue...
+               case "edit":
                        require_once( "includes/EditPage.php" );
                        $editor = new EditPage( $wgArticle );
                        $editor->submit();
@@ -182,7 +182,9 @@ if( !is_null( $search ) && $search !== '' ) {
                        $wgArticle->view();
                        break;
                default:
-                       $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+                   if (wfRunHooks('UnknownAction', $action, $wgArticle)) {
+                               $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+                       }
        }
 }
 wfProfileOut( "main-action" );