remove bad functions:

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

diff --git a/index.php b/index.php
index f980599..b22c63b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-
+#apd_set_pprof_trace();
 # Main wiki script; see design.doc
 #
 $wgRequestTime = microtime();
@@ -10,7 +10,13 @@ if(!file_exists("LocalSettings.php")) {
        die( "You'll have to <a href='config/index.php'>set the wiki up</a> first!" );
 }
 
+# Valid web server entry point, enable includes.
+# Please don't move this line to includes/Defines.php. This line essentially defines
+# a valid entry point. If you put it in includes/Defines.php, then any script that includes
+# it becomes an entry point, thereby defeating its purpose.
 define( "MEDIAWIKI", true );
+
+require_once( "./includes/Defines.php" );
 require_once( "./LocalSettings.php" );
 require_once( "includes/Setup.php" );
 
@@ -56,10 +62,13 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 
 if ( $search = $wgRequest->getText( 'search' ) ) {
        $wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
-       if( $wgRequest->getVal( 'fulltext' ) ) {
-               wfSearch( $search );
+       $searchEngine = new SearchEngine( $search );
+       if( $wgRequest->getVal( 'fulltext' ) ||
+               !is_null( $wgRequest->getVal( 'offset' ) ) ||
+               !is_null ($wgRequest->getVal( 'searchx' ) ) ) {
+               $searchEngine->showResults();
        } else {
-               wfGo( $search );
+               $searchEngine->goResult();
        }
 } else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
        $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
@@ -73,10 +82,15 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
                $wgOut->errorpage( "badtitle", "badtitletext" );
        }
-} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title ) {
+} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $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');
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
+       # actions that need to be made when we have a special pages
+       require_once( 'includes/SpecialPage.php' );
+       if ( !$wgAllowSysopQueries ) {SpecialPage::removePage( 'Asksql' ); }
        SpecialPage::executePath( $wgTitle );
 } else {
        if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
@@ -92,7 +106,6 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                $wgArticle = new Article( $wgTitle );
        }
 
-       wfQuery("BEGIN", DB_WRITE);
        switch( $action ) {
                case "view":
                        $wgOut->setSquidMaxage( $wgSquidMaxage );
@@ -105,6 +118,9 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                case "rollback":
                case "protect":
                case "unprotect":
+               case "validate":
+               case "info":
+               case "markpatrolled":
                        $wgArticle->$action();
                        break;
                case "print":
@@ -126,6 +142,10 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                                wfCreativeCommonsRdf( $wgArticle );
                        }
                        break;
+               case "credits":
+                       require_once( "includes/Credits.php" );
+                       showCreditsPage( $wgArticle );
+                       break;
                case "edit":
                case "submit":
                        if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {
@@ -133,7 +153,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                        }
                        require_once( "includes/EditPage.php" );
                        $editor = new EditPage( $wgArticle );
-                       $editor->$action();
+                       $editor->submit();
                        break;
                case "history":
                        if ($_SERVER["REQUEST_URI"] == $wgTitle->getInternalURL('action=history')) {
@@ -157,12 +177,23 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
                default:
                        $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
        }
-       wfQuery("COMMIT", DB_WRITE);
 }
 
+# Deferred updates aren't really deferred anymore. It's important to report errors to the
+# user, and that means doing this before OutputPage::output(). Note that for page saves,
+# the client will wait until the script exits anyway before following the redirect.
+foreach ( $wgDeferredUpdateList as $up ) {
+       $up->doUpdate();
+}
+
+$wgLoadBalancer->saveMasterPos();
+
+# Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
+$wgLoadBalancer->commitAll();
+
 $wgOut->output();
 
-foreach ( $wgDeferredUpdateList as $up ) { $up->doUpdate(); }
 logProfilingData();
+$wgLoadBalancer->closeAll();
 wfDebug( "Request ended normally\n" );
 ?>