X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=index.php;h=7f58774df82658f00dd01ebdb7d77b37edb23123;hb=1b2d65fb81900011d1c2f66400baa2b58e7d7814;hp=58da868e300e0728b387e7e9aeec2928b7152cdc;hpb=47c3eb729879c1bc5cce65e2b6b17fba4ad3756d;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index 58da868e30..7f58774df8 100644
--- a/index.php
+++ b/index.php
@@ -5,12 +5,21 @@
$wgRequestTime = microtime();
unset( $IP );
-@ini_set( "allow_url_fopen", 0 ); # For security...
-if(!file_exists("LocalSettings.php")) {
- die( "You'll have to set the wiki up 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 config/LocalSettings.php to the parent directory.\n" );
+ } else {
+ die( "You'll have to set the wiki up first!" );
+ }
}
-# Valid web server entry point, enable includes
+# 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" );
@@ -20,16 +29,7 @@ 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" );
-}
-
-# Placeholders in case of DB error
-$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
-$wgArticle = new Article($wgTitle);
+$title = $wgRequest->getVal( "title" );
$action = strtolower( trim( $action ) );
if ($wgRequest->getVal( "printable" ) == "yes") {
@@ -37,7 +37,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 );
@@ -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())
@@ -55,18 +58,15 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
exit;
}
-if ( $search = $wgRequest->getText( 'search' ) ) {
+wfProfileIn( "main-action" );
+
+$search = $wgRequest->getText( 'search' );
+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( wfMsg( "badtitle" ) );
+ $wgTitle = Title::newFromText( wfMsgForContent( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
} else if ( $wgTitle->getInterwiki() != "" ) {
$url = $wgTitle->getFullURL();
@@ -74,11 +74,12 @@ 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 &&
- !count( array_diff( array_keys( $_GET ), array( 'action', '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');
@@ -89,7 +90,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() ) {
@@ -97,6 +98,14 @@ 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 );
}
@@ -137,10 +146,10 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
wfCreativeCommonsRdf( $wgArticle );
}
break;
- case "credits":
- require_once( "includes/Credits.php" );
+ case "credits":
+ require_once( "includes/Credits.php" );
showCreditsPage( $wgArticle );
- break;
+ break;
case "edit":
case "submit":
if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) {
@@ -170,23 +179,30 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
$wgArticle->view();
break;
default:
- $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+ if (wfRunHooks('UnknownAction', $action, $wgArticle)) {
+ $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+ }
}
}
+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();
+wfProfileOut( "main-cleanup" );
logProfilingData();
$wgLoadBalancer->closeAll();