X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=index.php;h=ffc481d6b1bf79122d03825d2105581fd8c82253;hb=fc11eaedaa5c702df47b47f8525ecc3987f8d9c0;hp=7680dbb3d7094ffc0bb210d6b84044a73c0119d1;hpb=1b8983ea763f2b1423674e1143737bfbc7905571;p=lhc%2Fweb%2Fwiklou.git

diff --git a/index.php b/index.php
index 7680dbb3d7..ffc481d6b1 100644
--- a/index.php
+++ b/index.php
@@ -1,16 +1,26 @@
 <?php
-
+#apd_set_pprof_trace();
 # Main wiki script; see design.doc
 #
 $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.
+# 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" );
 
@@ -19,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 ) );
@@ -36,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 );
@@ -54,17 +59,21 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 	exit;
 }
 
-$db =& wfGetDB( DB_MASTER );
-
-if ( $search = $wgRequest->getText( 'search' ) ) {
+wfProfileIn( "main-action" );
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+	require_once( 'SearchEngine.php' );
 	$wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
-	if( $wgRequest->getVal( 'fulltext' ) || !is_null( $wgRequest->getVal( 'offset' ) ) ) {
-		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" ) );
+	$wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
 	$wgOut->errorpage( "badtitle", "badtitletext" );
 } else if ( $wgTitle->getInterwiki() != "" ) {
 	$url = $wgTitle->getFullURL();
@@ -72,10 +81,13 @@ 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 ) {
+} 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');
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
@@ -85,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() ) {
@@ -93,11 +105,18 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
 		require_once( "includes/ImagePage.php" );
 		$wgArticle = new ImagePage( $wgTitle );
 		break;
+	case NS_CATEGORY:
+		if ( $wgUseCategoryMagic ) {
+			require_once( "includes/CategoryPage.php" );
+			$wgArticle = new CategoryPage( $wgTitle );
+			break;
+		}
+		# NO break if wgUseCategoryMagic is false, drop through to next (default).
+		# Don't insert other cases between NS_CATEGORY and default.
 	default:
 		$wgArticle = new Article( $wgTitle );
 	}
 
-	$db->query("BEGIN");
 	switch( $action ) {
 		case "view":
 			$wgOut->setSquidMaxage( $wgSquidMaxage );
@@ -112,6 +131,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
 		case "unprotect":
 		case "validate":
 		case "info":
+		case "markpatrolled":
 			$wgArticle->$action();
 			break;
 		case "print":
@@ -144,7 +164,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')) {
@@ -168,17 +188,28 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
 		default:
 			$wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
 	}
-	$db->query("COMMIT");
 }
+wfProfileOut( "main-action" );
 
-$wgLoadBalancer->saveMasterPos();
-$wgOut->output();
-
+# 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.
+wfProfileIn( "main-updates" );
 foreach ( $wgDeferredUpdateList as $up ) {
-	$db->query("BEGIN");
 	$up->doUpdate();
-	$db->query("COMMIT");
 }
+wfProfileOut( "main-updates" );
+
+wfProfileIn( "main-cleanup" );
+$wgLoadBalancer->saveMasterPos();
+
+# Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
+$wgLoadBalancer->commitAll();
+
+$wgOut->output();
+wfProfileOut( "main-cleanup" );
+
 logProfilingData();
+$wgLoadBalancer->closeAll();
 wfDebug( "Request ended normally\n" );
 ?>