class MediaWiki {
var $params = array();
- /** Constructor */
- function __construct() {}
-
/**
* Stores key/value pairs to circumvent global variables
* Note that keys are case-insensitive!
*/
function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) {
wfProfileIn( __METHOD__ );
-
+
$output->setTitle( $title );
-
+ if( $request->getVal( 'printable' ) === 'yes' ) {
+ $output->setPrintable();
+ }
+
wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) );
-
- if( !$this->preliminaryChecks( $title, $output, $request ) ) {
+
+ if( !$this->preliminaryChecks( $title, $output ) ) {
wfProfileOut( __METHOD__ );
return;
}
/**
* Checks some initial queries
- * Note that $title here is *not* a Title object, but a string!
*
- * @param $title String
- * @param $action String
+ * @param $request WebRequest
* @return Title object to be $wgTitle
*/
- function checkInitialQueries( $title, $action ) {
- global $wgOut, $wgRequest, $wgContLang;
- if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
- $wgOut->setPrintable();
- }
+ function checkInitialQueries( WebRequest $request ) {
+ global $wgContLang;
- if( $curid = $wgRequest->getInt( 'curid' ) ) {
+ $curid = $request->getInt( 'curid' );
+ $title = $request->getVal( 'title' );
+
+ if( $request->getCheck( 'search' ) ) {
+ // Compatibility with old search URLs which didn't use Special:Search
+ // Just check for presence here, so blank requests still
+ // show the search page when using ugly URLs (bug 8054).
+ $ret = SpecialPage::getTitleFor( 'Search' );
+ } elseif( $curid ) {
// URLs like this are generated by RC, because rc_title isn't always accurate
$ret = Title::newFromID( $curid );
- } elseif( $title == '' && $action != 'delete' ) {
+ } elseif( $title == '' && $this->getAction( $request ) != 'delete' ) {
$ret = Title::newMainPage();
} else {
$ret = Title::newFromURL( $title );
// 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' );
- $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' );
+ $oldid = $request->getInt( 'oldid' );
+ $oldid = $oldid ? $oldid : $request->getInt( 'diff' );
// Allow oldid to override a changed or missing title
if( $oldid ) {
$rev = Revision::newFromId( $oldid );
}
/**
- * Checks for search query and anon-cannot-read case
+ * Checks for anon-cannot-read case
*
* @param $title Title
* @param $output OutputPage
- * @param $request WebRequest
* @return boolean true if successful
*/
- function preliminaryChecks( &$title, &$output, $request ) {
- if( $request->getCheck( 'search' ) ) {
- // Compatibility with old search URLs which didn't use Special:Search
- // Just check for presence here, so blank requests still
- // show the search page when using ugly URLs (bug 8054).
-
- // Do this above the read whitelist check for security...
- $title = SpecialPage::getTitleFor( 'Search' );
- }
+ function preliminaryChecks( &$title, &$output ) {
// 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();
- $this->finalCleanup( $wgDeferredUpdateList, $output );
+ $this->finalCleanup( $output );
$output->disable();
return false;
}
function handleSpecialCases( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
- $action = $this->getVal( 'Action' );
-
// 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' );
// 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();
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
// 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' ) )
+ } else if ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
+ && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getText( 'title' ) )
&& !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
{
+ if ( $title->getNamespace() == NS_SPECIAL ) {
+ list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() );
+ if ( $name ) {
+ $title = SpecialPage::getTitleFor( $name, $subpage );
+ }
+ }
$targetUrl = $title->getFullURL();
// Redirect to canonical url, make it a 301 to allow caching
if( $targetUrl == $request->getFullRequestURL() ) {
}
}
+ /**
+ * Returns the action that will be executed, not necesserly the one passed
+ * passed through the "action" parameter. Actions disabled in
+ * $wgDisabledActions will be replaced by "nosuchaction"
+ *
+ * @param $request WebRequest
+ * @return String: action
+ */
+ public function getAction( WebRequest $request ) {
+ global $wgDisabledActions;
+
+ $action = $request->getVal( 'action', 'view' );
+
+ // Check for disabled actions
+ if( in_array( $action, $wgDisabledActions ) ) {
+ return 'nosuchaction';
+ }
+
+ // 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' ) ) {
+ return 'revisiondelete';
+ } elseif ( $request->getBool( 'revisionmove' ) ) {
+ return 'revisionmove';
+ } else {
+ return 'view';
+ }
+ } elseif ( $action == 'editredlink' ) {
+ return 'edit';
+ }
+
+ return $action;
+ }
+
/**
* Initialize the object to be known as $wgArticle for "standard" actions
* Create an Article object for the page, following redirects if needed.
function initializeArticle( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
- $action = $this->getVal( 'action', 'view' );
+ $action = $request->getVal( 'action', 'view' );
$article = self::articleFromTitle( $title );
// NS_MEDIAWIKI has no redirects.
// It is also used for CSS/JS, so performance matters here...
{
// Give extensions a change to ignore/handle redirects as needed
$ignoreRedirect = $target = false;
-
+
$dbr = wfGetDB( DB_SLAVE );
$article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
- wfRunHooks( 'InitializeArticleMaybeRedirect',
+ wfRunHooks( 'InitializeArticleMaybeRedirect',
array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
// Follow redirects only for... redirects.
* Cleaning up request by doing:
** deferred updates, DB transaction, and the output
*
- * @param $deferredUpdates array of updates to do
* @param $output OutputPage
*/
- function finalCleanup( &$deferredUpdates, &$output ) {
+ function finalCleanup( &$output ) {
wfProfileIn( __METHOD__ );
// Now commit any transactions, so that unreported errors after
// output() don't roll back the whole DB transaction
// Output everything!
$output->output();
// Do any deferred jobs
- $this->doUpdates( $deferredUpdates );
+ wfDoUpdates( 'commit' );
// Close the session so that jobs don't access the current session
session_write_close();
$this->doJobs();
wfProfileOut( __METHOD__ );
}
- /**
- * 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.
- *
- * @param $updates array of objects that hold an update to do
- */
- function doUpdates( &$updates ) {
- wfProfileIn( __METHOD__ );
- /* No need to get master connections in case of empty updates array */
- if (!$updates) {
- wfProfileOut( __METHOD__ );
- return;
- }
-
- $dbw = wfGetDB( DB_MASTER );
- foreach( $updates as $up ) {
- $up->doUpdate();
-
- // Commit after every update to prevent lock contention
- if( $dbw->trxLevel() ) {
- $dbw->commit();
- }
- }
- wfProfileOut( __METHOD__ );
- }
-
/**
* Do a job from the job queue
*/
function doJobs() {
- $jobRunRate = $this->getVal( 'JobRunRate' );
+ global $wgJobRunRate;
- if( $jobRunRate <= 0 || wfReadOnly() ) {
+ if( $wgJobRunRate <= 0 || wfReadOnly() ) {
return;
}
- if( $jobRunRate < 1 ) {
+ if( $wgJobRunRate < 1 ) {
$max = mt_getrandmax();
- if( mt_rand( 0, $max ) > $max * $jobRunRate ) {
+ if( mt_rand( 0, $max ) > $max * $wgJobRunRate ) {
return;
}
$n = 1;
} else {
- $n = intval( $jobRunRate );
+ $n = intval( $wgJobRunRate );
}
while ( $n-- && false != ( $job = Job::pop() ) ) {
return;
}
- $action = $this->getVal( 'Action' );
- if( in_array( $action, $this->getVal( 'DisabledActions', array() ) ) ) {
- /* No such action; this will switch to the default case */
- $action = 'nosuchaction';
- }
-
- // 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';
- }
- }
+ $action = $this->getAction( $request );
switch( $action ) {
case 'view':
}
/* Continue... */
case 'edit':
- case 'editredlink':
if( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) {
$internal = $request->getVal( 'internaledit' );
$external = $request->getVal( 'externaledit' );
dépôts / lhc / web / wiklou.git / blobdiff