X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=index.php;h=eb59c3d5d29b11c1458bbc90b2e6fb98346acba8;hb=33f1e77c11bb5bfb1b4c1a4b467916b70854e855;hp=a8b400954e33eb2ee3a71c635401292e3bff1d06;hpb=d11bdf29ca7bc32200cc439b88ccbbacf89630f3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/index.php b/index.php
index a8b400954e..eb59c3d5d2 100644
--- a/index.php
+++ b/index.php
@@ -1,32 +1,30 @@
 <?php
+
 # Main wiki script; see design.doc
 #
 $wgRequestTime = microtime();
 
 unset( $IP );
-ini_set( "allow_url_fopen", 0 ); # For security...
+@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!" );
 }
-include_once( "./LocalSettings.php" );
-
-if( $wgSitename == "MediaWiki" ) {
-	die( "You must set the site name in \$wgSitename before installation.\n\n" );
-}
-
-# Windows requires ';' as separator, ':' for Unix
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-ini_set( "include_path", "$IP$sep$include_path" );
 
-include_once( "Setup.php" );
+define( "MEDIAWIKI", true );
+require_once( "./LocalSettings.php" );
+require_once( "includes/Setup.php" );
 
 wfProfileIn( "main-misc-setup" );
 OutputPage::setEncodings(); # Not really used yet
 
 # Query string fields
-#
-global $action, $title, $search, $go, $target, $printable;
-global $returnto, $diff, $oldid, $curid;
+$action = $wgRequest->getVal( "action", "view" );
+
+if( isset( $_SERVER['PATH_INFO'] ) && $wgUsePathInfo ) {
+	$title = substr( $_SERVER['PATH_INFO'], 1 );
+} else {
+	$title = $wgRequest->getVal( "title" );
+}
 
 # Placeholders in case of DB error
 $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
@@ -34,11 +32,13 @@ $wgArticle = new Article($wgTitle);
 
 $action = strtolower( trim( $action ) );
 if ( "" == $action ) { $action = "view"; }
-if ( "yes" == $printable ) { $wgOut->setPrintable(); }
+if ($wgRequest->getVal( "printable" ) == "yes") {
+	$wgOut->setPrintable();
+}
 
 if ( "" == $title && "delete" != $action ) {
 	$wgTitle = Title::newFromText( wfMsg( "mainpage" ) );
-} elseif ( $curid ) {
+} elseif ( $curid = $wgRequest->getInt( 'curid' ) ) {
 	# URLs like this are generated by RC, because rc_title isn't always accurate
 	$wgTitle = Title::newFromID( $curid );
 } else {
@@ -46,28 +46,48 @@ if ( "" == $title && "delete" != $action ) {
 }
 wfProfileOut( "main-misc-setup" );
 
-if ( "" != $search ) {
-	if( isset($_REQUEST['fulltext']) ) {
+# 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.
+if ( !$wgUser->getID() && is_array( $wgWhitelistRead ) && $wgTitle) {
+	if ( !in_array( $wgLang->getNsText( $wgTitle->getNamespace() ) . ":" . $wgTitle->getDBkey(), $wgWhitelistRead ) ) {
+		$wgOut->loginToUse();
+		$wgOut->output();
+		exit;
+	}
+}
+
+if ( $search = $wgRequest->getText( 'search' ) ) {
+	$wgTitle = Title::makeTitle( NS_SPECIAL, "Search" );
+	if( $wgRequest->getVal( 'fulltext' ) ) {
 		wfSearch( $search );
 	} else {
 		wfGo( $search );
 	}
-} else if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
+} else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
 	$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
 	$wgOut->errorpage( "badtitle", "badtitletext" );
+} else if ( $wgTitle->getInterwiki() != "" ) {
+	$url = $wgTitle->getFullURL();
+	# Check for a redirect loop
+	if ( !preg_match( "/^" . preg_quote( $wgServer ) . "/", $url ) && $wgTitle->isLocal() ) {
+		$wgOut->redirect( $url );
+	} else {
+		$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
+		$wgOut->errorpage( "badtitle", "badtitletext" );
+	}
 } else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title ) {
-	/* redirect to canonical url */
-	$wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
+	/* redirect to canonical url, make it a 301 to allow caching */
+	$wgOut->redirect( $wgTitle->getFullURL(), '301');
 } else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
 	wfSpecialPage();
 } else {
 	if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
 		$wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
-	}	
-	
+	}
+
 	switch( $wgTitle->getNamespace() ) {
-	case 6:
-		include_once( "ImagePage.php" );
+	case NS_IMAGE:
+		require_once( "includes/ImagePage.php" );
 		$wgArticle = new ImagePage( $wgTitle );
 		break;
 	default:
@@ -77,6 +97,9 @@ if ( "" != $search ) {
 	wfQuery("BEGIN", DB_WRITE);
 	switch( $action ) {
 		case "view":
+			$wgOut->setSquidMaxage( $wgSquidMaxage );
+			$wgArticle->view();
+			break;
 		case "watch":
 		case "unwatch":
 		case "delete":
@@ -89,20 +112,49 @@ if ( "" != $search ) {
 		case "print":
 			$wgArticle->view();
 			break;
+		case "dublincore":
+			if( !$wgEnableDublinCoreRdf ) {
+				wfHttpError( 403, "Forbidden", wfMsg( "nodublincore" ) );
+			} else {
+				require_once( "includes/Metadata.php" );
+				wfDublinCoreRdf( $wgArticle );
+			}
+			break;
+		case "creativecommons":
+			if( !$wgEnableCreativeCommonsRdf ) {
+				wfHttpError( 403, "Forbidden", wfMsg("nocreativecommons") );
+			} else {
+				require_once( "includes/Metadata.php" );
+				wfCreativeCommonsRdf( $wgArticle );
+			}
+			break;
 		case "edit":
 		case "submit":
-			if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get("session.name")] ) ) {
+			if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {
 				User::SetupSession();
 			}
-			include_once( "EditPage.php" );
+			require_once( "includes/EditPage.php" );
 			$editor = new EditPage( $wgArticle );
 			$editor->$action();
 			break;
 		case "history":
-			include_once( "PageHistory.php" );
+			if ($_SERVER["REQUEST_URI"] == $wgTitle->getInternalURL('action=history')) {
+				$wgOut->setSquidMaxage( $wgSquidMaxage );
+			}
+			require_once( "includes/PageHistory.php" );
 			$history = new PageHistory( $wgArticle );
 			$history->history();
 			break;
+		case "raw":
+			require_once( "includes/RawPage.php" );
+			$raw = new RawPage( $wgArticle );
+			$raw->view();
+			break;
+		case "purge":
+			wfPurgeSquidServers(array($wgTitle->getInternalURL()));
+			$wgOut->setSquidMaxage( $wgSquidMaxage );
+			$wgArticle->view();
+			break;
 		default:
 			$wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
 	}
@@ -110,6 +162,7 @@ if ( "" != $search ) {
 }
 
 $wgOut->output();
+
 foreach ( $wgDeferredUpdateList as $up ) { $up->doUpdate(); }
 logProfilingData();
 wfDebug( "Request ended normally\n" );