<?php
/**
* MediaWiki is the to-be base class for this whole project
+ *
+ * @internal documentation reviewed 15 Mar 2010
*/
class MediaWiki {
-
- var $GET; /* Stores the $_GET variables at time of creation, can be changed */
var $params = array();
- /** Constructor. It just save the $_GET variable */
- function __construct() {
- $this->GET = $_GET;
- }
+ /** Constructor */
+ function __construct() {}
/**
* Stores key/value pairs to circumvent global variables
* Note that keys are case-insensitive!
*
* @param $key String: key to get
- * @param $default Mixed: default value if if the key doesn't exist
+ * @param $default string default value, defaults to empty string
+ * @return $default Mixed: default value if if the key doesn't exist
*/
function getVal( $key, $default = '' ) {
$key = strtolower( $key );
if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
$wgOut->setPrintable();
}
- $ret = NULL;
- if( $curid = $wgRequest->getInt( 'curid' ) ) {
- # URLs like this are generated by RC, because rc_title isn't always accurate
+ $ret = null;
+ $curid = $wgRequest->getInt( 'curid' );
+ if( $curid ) {
+ // URLs like this are generated by RC, because rc_title isn't always accurate
$ret = Title::newFromID( $curid );
- } elseif( '' == $title && 'delete' != $action ) {
+ } elseif( $title == '' && $action != 'delete' ) {
$ret = Title::newMainPage();
} else {
$ret = Title::newFromURL( $title );
if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 )
$wgContLang->findVariantLink( $title, $ret );
}
- # For non-special titles, check for implicit titles
+ // For non-special titles, check for implicit titles
if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
// We can have urls with just ?diff=,?oldid= or even just ?diff=
$oldid = $wgRequest->getInt( 'oldid' );
* @param $title Title
* @param $output OutputPage
* @param $request WebRequest
+ * @return boolean true if successful
*/
function preliminaryChecks( &$title, &$output, $request ) {
if( $request->getCheck( 'search' ) ) {
// Do this above the read whitelist check for security...
$title = SpecialPage::getTitleFor( '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 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( $title ) && !$title->userCanRead() ) {
global $wgDeferredUpdateList;
$output->loginToUse();
*/
function handleSpecialCases( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
- global $wgContLang, $wgUser;
+
$action = $this->getVal( 'Action' );
- $perferred = $wgContLang->getPreferredVariant( false );
- // Invalid titles
- if( is_null($title) || $title->getDBkey() == '' ) {
+
+ // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
+ if( is_null($title) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) {
$title = SpecialPage::getTitleFor( 'Badtitle' );
- # Die now before we mess up $wgArticle and the skin stops working
+ $output->setTitle( $title ); // bug 21456
+ // Die now before we mess up $wgArticle and the skin stops working
throw new ErrorPageError( 'badtitle', 'badtitletext' );
+
// Interwiki redirects
} else if( $title->getInterwiki() != '' ) {
- if( $rdfrom = $request->getVal( 'rdfrom' ) ) {
+ $rdfrom = $request->getVal( 'rdfrom' );
+ if( $rdfrom ) {
$url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
} else {
$query = $request->getValues();
$output->redirect( $url );
} else {
$title = SpecialPage::getTitleFor( 'Badtitle' );
+ $output->setTitle( $title ); // bug 21456
wfProfileOut( __METHOD__ );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
- // Redirect loops, no title in URL, $wgUsePathInfo URLs
- } else if( $action == 'view' && !$request->wasPosted() &&
- ( ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) ||
- // No valid variant in URL (if the main-language has multi-variants), to ensure
- // the Accept-Language would only be added to XVO when a 301 redirection happened
- ( !isset($this->GET['variant']) && $perferred != $wgContLang->getCode() &&
- $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) ) &&
- !count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) )
+ // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
+ } else if ( $action == 'view' && !$request->wasPosted()
+ && ( !$request->getVal( 'title' ) || $title->getPrefixedDBKey() != $request->getText( 'title' ) )
+ && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
{
$targetUrl = $title->getFullURL();
// Redirect to canonical url, make it a 301 to allow caching
$action = $this->getVal( 'action', 'view' );
$article = self::articleFromTitle( $title );
- # NS_MEDIAWIKI has no redirects.
- # It is also used for CSS/JS, so performance matters here...
+ // NS_MEDIAWIKI has no redirects.
+ // It is also used for CSS/JS, so performance matters here...
if( $title->getNamespace() == NS_MEDIAWIKI ) {
wfProfileOut( __METHOD__ );
return $article;
$file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null;
if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content
&& !$request->getVal( 'oldid' ) && // ... and are not old revisions
+ !$request->getVal( 'diff' ) && // ... and not when showing diff
$request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to
// ... and the article is not a non-redirect image page with associated file
!( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )
{
- # Give extensions a change to ignore/handle redirects as needed
+ // Give extensions a change to ignore/handle redirects as needed
$ignoreRedirect = $target = false;
$dbr = wfGetDB( DB_SLAVE );
// Follow redirects only for... redirects.
// If $target is set, then a hook wanted to redirect.
if( !$ignoreRedirect && ($target || $article->isRedirect()) ) {
- # Is the target already set by an extension?
+ // Is the target already set by an extension?
$target = $target ? $target : $article->followRedirect();
if( is_string( $target ) ) {
if( !$this->getVal( 'DisableHardRedirects' ) ) {
*/
function finalCleanup( &$deferredUpdates, &$output ) {
wfProfileIn( __METHOD__ );
- # Now commit any transactions, so that unreported errors after
- # output() don't roll back the whole DB transaction
+ // Now commit any transactions, so that unreported errors after
+ // output() don't roll back the whole DB transaction
$factory = wfGetLBFactory();
$factory->commitMasterChanges();
- # Output everything!
+ // Output everything!
$output->output();
- # Do any deferred jobs
+ // Do any deferred jobs
$this->doUpdates( $deferredUpdates );
+ // Close the session so that jobs don't access the current session
+ session_write_close();
$this->doJobs();
wfProfileOut( __METHOD__ );
}
foreach( $updates as $up ) {
$up->doUpdate();
- # Commit after every update to prevent lock contention
+ // Commit after every update to prevent lock contention
if( $dbw->trxLevel() ) {
$dbw->commit();
}
* Ends this task peacefully
*/
function restInPeace() {
+ MessageCache::logMessages();
wfLogProfilingData();
- # Commit and close up!
+ // Commit and close up!
$factory = wfGetLBFactory();
$factory->commitMasterChanges();
$factory->shutdown();
$action = 'nosuchaction';
}
- # Workaround for bug #20966: inability of IE to provide an action dependent
- # on which submit button is clicked.
+ // Workaround for bug #20966: inability of IE to provide an action dependent
+ // on which submit button is clicked.
if ( $action === 'historysubmit' ) {
if ( $request->getBool( 'revisiondelete' ) ) {
$action = 'revisiondelete';
+ } elseif ( $request->getBool( 'revisionmove' ) ) {
+ $action = 'revisionmove';
} else {
$action = 'view';
}
$history->history();
break;
case 'revisiondelete':
- # For show/hide submission from history page
+ // For show/hide submission from history page
$special = SpecialPage::getPage( 'Revisiondelete' );
$special->execute( '' );
break;
+ case 'revisionmove':
+ // For revision move submission from history page
+ $special = SpecialPage::getPage( 'RevisionMove' );
+ $special->execute( '' );
+ break;
default:
if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
}
-}; /* End of class MediaWiki */
+}
dépôts / lhc / web / wiklou.git / blobdiff