dépôts / lhc / web / wiklou.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
close profiling on script exits instead of page flushing
[lhc/web/wiklou.git] / index.php
diff --git a/index.php b/index.php
index 27b7fb9..3436e57 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,12 +3,16 @@
  * Main wiki script; see docs/design.txt
  * @package MediaWiki
  */
-
 $wgRequestTime = microtime();
+$wgRUstart = getrusage();
 
 unset( $IP );
 @ini_set( 'allow_url_fopen', 0 ); # For security...
 
+if ( isset( $_REQUEST['GLOBALS'] ) ) {
+       die( '<a href="http://www.hardened-php.net/index.76.html">$GLOBALS overwrite vulnerability</a>');
+}
+
 # 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
@@ -20,18 +24,17 @@ if( !file_exists( 'LocalSettings.php' ) ) {
        $IP = "." ;
        require_once( 'includes/DefaultSettings.php' ); # used for printing the version
 ?>
-<!DOCTYPE html PUBLIC "-//W3C/DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
        <head>
                <title>MediaWiki <?php echo $wgVersion ?></title>
                <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-
                <style type='text/css' media='screen, projection'>
                        html, body {
                                color: #000;
                                background-color: #fff;
-                               font-family: serif;
-                               text-align:center;
+                               font-family: sans-serif;
+                               text-align: center;
                        }
 
                        h1 {
@@ -48,7 +51,7 @@ if( !file_exists( 'LocalSettings.php' ) ) {
                if ( file_exists( 'config/LocalSettings.php' ) ) {
                        echo( "To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory." );
                } else {
-                       echo( "You'll have to <a href='config/index.php' title='setup'>set the wiki up</a> first!" );
+                       echo( "Please <a href='config/index.php' title='setup'>setup the wiki</a> first." );
                }
                ?>
 
@@ -69,7 +72,6 @@ OutputPage::setEncodings(); # Not really used yet
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
-$action = rtrim( $action );
 if ($wgRequest->getVal( 'printable' ) == 'yes') {
        $wgOut->setPrintable();
 }
@@ -84,7 +86,7 @@ if ( '' == $title && 'delete' != $action ) {
        /* check variant links so that interwiki links don't have to worry about
           the possible different language variants
        */
-       if( !is_null($wgTitle) && $wgTitle->getArticleID() == 0 )
+       if( count($wgContLang->getVariants()) > 1 && !is_null($wgTitle) && $wgTitle->getArticleID() == 0 )
                $wgContLang->findVariantLink( $title, $wgTitle );
 
 }
@@ -93,6 +95,13 @@ wfProfileOut( 'main-misc-setup' );
 # Debug statement for user levels
 // print_r($wgUser);
 
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+       // Compatibility with old search URLs which didn't use Special:Search
+       // Do this above the read whitelist check for security...
+       $wgTitle = Title::makeTitle( NS_SPECIAL, '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())
@@ -103,10 +112,6 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( 'main-action' );
-$search = $wgRequest->getText( 'search' );
-if( $wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
-       $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
-}
 
 if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        require_once( 'includes/SpecialSearch.php' );
@@ -144,14 +149,27 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        }
 
        $ns = $wgTitle->getNamespace();
+
+       // Namespace might change when using redirects
+       if($action == 'view' && !$wgRequest->getVal( 'oldid' ) ) {
+               $wgArticle = new Article( $wgTitle );
+               $rTitle = Title::newFromRedirect( $wgArticle->fetchContent() );
+               if($rTitle) {
+                       # Reload from the page pointed to later
+                       $wgArticle->mContentLoaded = false;
+                       $ns = $rTitle->getNamespace();
+               }
+       }
+
+       // Categories and images are handled by a different class
        if ( $ns == NS_IMAGE ) {
+               unset($wgArticle);
                require_once( 'includes/ImagePage.php' );
                $wgArticle = new ImagePage( $wgTitle );
-       } elseif ( $wgUseCategoryMagic && $ns == NS_CATEGORY ) {
+       } elseif ( $ns == NS_CATEGORY ) {
+               unset($wgArticle);
                require_once( 'includes/CategoryPage.php' );
                $wgArticle = new CategoryPage( $wgTitle );
-       } else {
-               $wgArticle = new Article( $wgTitle );
        }
 
        if ( in_array( $action, $wgDisabledActions ) ) {
@@ -173,6 +191,8 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                        case 'markpatrolled':
                        case 'validate':
                        case 'render':
+                       case 'deletetrackback':
+                       case 'purge':
                                $wgArticle->$action();
                                break;
                        case 'print':
@@ -234,12 +254,6 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                                $raw = new RawPage( $wgArticle );
                                $raw->view();
                                break;
-                       case 'purge':
-                               wfPurgeSquidServers(array($wgTitle->getInternalURL()));
-                               $wgOut->setSquidMaxage( $wgSquidMaxage );
-                               $wgTitle->invalidateCache();
-                               $wgArticle->view();
-                               break;
                        default:
                                if (wfRunHooks('UnknownAction', array($action, $wgArticle))) {
                                        $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
@@ -272,6 +286,7 @@ foreach ( $wgPostCommitUpdateList as $up ) {
 
 wfProfileOut( 'main-cleanup' );
 
+wfProfileClose();
 logProfilingData();
 $wgLoadBalancer->closeAll();
 wfDebug( "Request ended normally\n" );
Wiklou, le Wiki du Wiklou