X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=index.php;h=ffc481d6b1bf79122d03825d2105581fd8c82253;hb=fc11eaedaa5c702df47b47f8525ecc3987f8d9c0;hp=a8b400954e33eb2ee3a71c635401292e3bff1d06;hpb=d11bdf29ca7bc32200cc439b88ccbbacf89630f3;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index a8b400954e..ffc481d6b1 100644
--- a/index.php
+++ b/index.php
@@ -1,44 +1,48 @@
set the wiki up first!" );
-}
-include_once( "./LocalSettings.php" );
-
-if( $wgSitename == "MediaWiki" ) {
- die( "You must set the site name in \$wgSitename before installation.\n\n" );
+@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 config/LocalSettings.php to the parent directory.\n" );
+ } else {
+ die( "You'll have to set the wiki up first!" );
+ }
}
-# Windows requires ';' as separator, ':' for Unix
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-ini_set( "include_path", "$IP$sep$include_path" );
+# 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 );
-include_once( "Setup.php" );
+require_once( "./includes/Defines.php" );
+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" );
+$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 ) );
-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 ) {
+ $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 );
} else {
@@ -46,37 +50,78 @@ if ( "" == $title && "delete" != $action ) {
}
wfProfileOut( "main-misc-setup" );
-if ( "" != $search ) {
- if( isset($_REQUEST['fulltext']) ) {
- wfSearch( $search );
+# 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())
+if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
+ $wgOut->loginToUse();
+ $wgOut->output();
+ exit;
+}
+
+wfProfileIn( "main-action" );
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+ require_once( 'SearchEngine.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 {
- wfGo( $search );
+ $searchEngine->goResult();
}
-} else if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
- $wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
+} else if( !$wgTitle or $wgTitle->getDBkey() == "" ) {
+ $wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
-} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title ) {
- /* redirect to canonical url */
- $wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
+} 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( wfMsgForContent( "badtitle" ) );
+ $wgOut->errorpage( "badtitle", "badtitletext" );
+ }
+} 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() ) {
- wfSpecialPage();
+ # 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() ) {
- $wgTitle = Title::makeTitle( Namespace::getImage(), $wgTitle->getDBkey() );
- }
-
+ $wgTitle = Title::makeTitle( NS_IMAGE, $wgTitle->getDBkey() );
+ }
+
switch( $wgTitle->getNamespace() ) {
- case 6:
- include_once( "ImagePage.php" );
+ case NS_IMAGE:
+ 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 );
}
- wfQuery("BEGIN", DB_WRITE);
switch( $action ) {
case "view":
+ $wgOut->setSquidMaxage( $wgSquidMaxage );
+ $wgArticle->view();
+ break;
case "watch":
case "unwatch":
case "delete":
@@ -84,33 +129,87 @@ if ( "" != $search ) {
case "rollback":
case "protect":
case "unprotect":
+ case "validate":
+ case "info":
+ case "markpatrolled":
$wgArticle->$action();
break;
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 "credits":
+ require_once( "includes/Credits.php" );
+ showCreditsPage( $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();
+ $editor->submit();
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 );
+ $wgTitle->invalidateCache();
+ $wgArticle->view();
+ break;
default:
$wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
}
- wfQuery("COMMIT", DB_WRITE);
}
+wfProfileOut( "main-action" );
+
+# 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 ) {
+ $up->doUpdate();
+}
+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();
-foreach ( $wgDeferredUpdateList as $up ) { $up->doUpdate(); }
+wfProfileOut( "main-cleanup" );
+
logProfilingData();
+$wgLoadBalancer->closeAll();
wfDebug( "Request ended normally\n" );
?>