X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=101ba7f2b448181191921a61b5e489de572f44d0;hb=1dfc87b4cba658d178bcd9bb802bb818fc5acd8f;hp=44c935890e7c36086acbabdf0c8ac9bd92935d8e;hpb=c893cdddd6c37158c5e9f646216981e2298ab9c6;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index 44c935890e..101ba7f2b4 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -16,8 +16,8 @@ class MediaWiki { * Stores key/value pairs to circumvent global variables * Note that keys are case-insensitive! * - * @param String $key key to store - * @param mixed $value value to put for the key + * @param $key String: key to store + * @param $value Mixed: value to put for the key */ function setVal( $key, &$value ) { $key = strtolower( $key ); @@ -28,8 +28,8 @@ class MediaWiki { * Retrieves key/value pairs to circumvent global variables * Note that keys are case-insensitive! * - * @param String $key key to get - * @param mixed $default default value if if the key doesn't exist + * @param $key String: key to get + * @param $default Mixed: default value if if the key doesn't exist */ function getVal( $key, $default = '' ) { $key = strtolower( $key ); @@ -43,11 +43,11 @@ class MediaWiki { * Initialization of ... everything * Performs the request too * - * @param Title $title - * @param Article $article - * @param OutputPage $output - * @param User $user - * @param WebRequest $request + * @param $title Title ($wgTitle) + * @param $article Article + * @param $output OutputPage + * @param $user User + * @param $request WebRequest */ function initialize( &$title, &$article, &$output, &$user, $request ) { wfProfileIn( __METHOD__ ); @@ -60,6 +60,7 @@ class MediaWiki { } elseif( is_string( $new_article ) ) { $output->redirect( $new_article ); } else { + wfProfileOut( __METHOD__ ); throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" ); } } @@ -70,13 +71,12 @@ class MediaWiki { * Check if the maximum lag of database slaves is higher that $maxLag, and * if it's the case, output an error message * - * @param LoadBalancer $loadBalancer - * @param int $maxLag maximum lag allowed for the request, as supplied by - * the client - * @return bool true if the requet can continue + * @param $maxLag int: maximum lag allowed for the request, as supplied by + * the client + * @return bool true if the request can continue */ - function checkMaxLag( $loadBalancer, $maxLag ) { - list( $host, $lag ) = $loadBalancer->getMaxLag(); + function checkMaxLag( $maxLag ) { + list( $host, $lag ) = wfGetLB()->getMaxLag(); if ( $lag > $maxLag ) { wfMaxlagError( $host, $lag, $maxLag ); return false; @@ -90,8 +90,8 @@ class MediaWiki { * Checks some initial queries * Note that $title here is *not* a Title object, but a string! * - * @param String $title - * @param String $action + * @param $title String + * @param $action String * @return Title object to be $wgTitle */ function checkInitialQueries( $title, $action ) { @@ -112,7 +112,7 @@ class MediaWiki { // check variant links so that interwiki links don't have to worry // about the possible different language variants if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 ) - $lang->findVariantLink( $title, $ret ); + $wgContLang->findVariantLink( $title, $ret ); } if ( ( $oldid = $wgRequest->getInt( 'oldid' ) ) @@ -129,9 +129,9 @@ class MediaWiki { /** * Checks for search query and anon-cannot-read case * - * @param Title $title - * @param OutputPage $output - * @param WebRequest $request + * @param $title Title + * @param $output OutputPage + * @param $request WebRequest */ function preliminaryChecks( &$title, &$output, $request ) { @@ -139,7 +139,7 @@ class MediaWiki { // 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' ); } @@ -162,9 +162,9 @@ class MediaWiki { * - redirect loop * - special pages * - * @param Title $title - * @param OutputPage $output - * @param WebRequest $request + * @param $title Title + * @param $output OutputPage + * @param $request WebRequest * @return bool true if the request is already executed */ function initializeSpecialCases( &$title, &$output, $request ) { @@ -188,7 +188,7 @@ class MediaWiki { $title = SpecialPage::getTitleFor( 'Badtitle' ); throw new ErrorPageError( 'badtitle', 'badtitletext' ); } - } else if ( ( $action == 'view' ) && !$request->wasPosted() && + } else if ( ( $action == 'view' ) && !$request->wasPosted() && (!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) && !count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) ) { @@ -236,32 +236,28 @@ class MediaWiki { /** * Create an Article object of the appropriate class for the given page. * - * @param Title $title + * @param $title Title * @return Article object */ - static function articleFromTitle( $title ) { - $article = null; - wfRunHooks( 'ArticleFromTitle', array( &$title, &$article ) ); - if ( $article ) { - return $article; - } - + static function articleFromTitle( &$title ) { if( NS_MEDIA == $title->getNamespace() ) { // FIXME: where should this go? $title = Title::makeTitle( NS_IMAGE, $title->getDBkey() ); } + $article = null; + wfRunHooks( 'ArticleFromTitle', array( &$title, &$article ) ); + if( $article ) { + return $article; + } + switch( $title->getNamespace() ) { - case NS_IMAGE: - $file = wfFindFile( $title ); - if( $file && $file->getRedirected() ) { + case NS_IMAGE: + return new ImagePage( $title ); + case NS_CATEGORY: + return new CategoryPage( $title ); + default: return new Article( $title ); - } - return new ImagePage( $title ); - case NS_CATEGORY: - return new CategoryPage( $title ); - default: - return new Article( $title ); } } @@ -269,9 +265,8 @@ class MediaWiki { * Initialize the object to be known as $wgArticle for "standard" actions * Create an Article object for the page, following redirects if needed. * - * @param Title $title - * @param Request $request - * @param string $action + * @param $title Title ($wgTitle) + * @param $request WebRequest * @return mixed an Article, or a string to redirect to another URL */ function initializeArticle( &$title, $request ) { @@ -279,36 +274,46 @@ class MediaWiki { $action = $this->getVal( 'action' ); $article = self::articleFromTitle( $title ); - + // Namespace might change when using redirects - if( ( $action == 'view' || $action == 'render' ) && !$request->getVal( 'oldid' ) && - $request->getVal( 'redirect' ) != 'no' && - !( $title->getNamespace() == NS_IMAGE && wfFindFile( $title->getText() ) ) ) { + // Check for redirects ... + $file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null; + if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content + && !$request->getVal( 'oldid' ) && // ... and are not old revisions + $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 + $ignoreRedirect = $target = false; + wfRunHooks( 'InitializeArticleMaybeRedirect', array( &$title, &$request, &$ignoreRedirect, &$target ) ); $dbr = wfGetDB( DB_SLAVE ); $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) ); // Follow redirects only for... redirects - if( $article->mIsRedirect ) { - $target = $article->followRedirect(); + if( !$ignoreRedirect && $article->isRedirect() ) { + # Is the target already set by an extension? + $target = $target ? $target : $article->followRedirect(); if( is_string( $target ) ) { if( !$this->getVal( 'DisableHardRedirects' ) ) { // we'll need to redirect return $target; } } + if( is_object( $target ) ) { // Rewrite environment to redirected article $rarticle = self::articleFromTitle( $target ); $rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) ); - if ( $rarticle->mTitle->exists() ) { + if ( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; $title = $target; } } } else { - $title = $article->mTitle; + $title = $article->getTitle(); } } wfProfileOut( __METHOD__ ); @@ -316,20 +321,18 @@ class MediaWiki { } /** - * Cleaning up by doing deferred updates, calling loadbalancer and doing the - * output + * Cleaning up by doing deferred updates, calling LBFactory and doing the output * - * @param Array $deferredUpdates array of updates to do - * @param LoadBalancer $loadBalancer - * @param OutputPage $output + * @param $deferredUpdates array of updates to do + * @param $output OutputPage */ - function finalCleanup( &$deferredUpdates, &$loadBalancer, &$output ) { + function finalCleanup ( &$deferredUpdates, &$output ) { wfProfileIn( __METHOD__ ); $this->doUpdates( $deferredUpdates ); $this->doJobs(); - $loadBalancer->saveMasterPos(); # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing - $loadBalancer->commitMasterChanges(); + $factory = wfGetLBFactory(); + $factory->shutdown(); $output->output(); wfProfileOut( __METHOD__ ); } @@ -340,7 +343,7 @@ class MediaWiki { * Note that for page saves, the client will wait until the script exits * anyway before following the redirect. * - * @param Array $updates array of objects that hold an update to do + * @param $updates array of objects that hold an update to do */ function doUpdates( &$updates ) { wfProfileIn( __METHOD__ ); @@ -349,7 +352,7 @@ class MediaWiki { wfProfileOut( __METHOD__ ); return; } - + $dbw = wfGetDB( DB_MASTER ); foreach( $updates as $up ) { $up->doUpdate(); @@ -407,16 +410,16 @@ class MediaWiki { /** * Perform one of the "standard" actions * - * @param OutputPage $output - * @param Article $article - * @param Title $title - * @param User $user - * @param WebRequest $request + * @param $output OutputPage + * @param $article Article + * @param $title Title + * @param $user User + * @param $request WebRequest */ function performAction( &$output, &$article, &$title, &$user, &$request ) { wfProfileIn( __METHOD__ ); - if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request ) ) ) { + if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) { wfProfileOut( __METHOD__ ); return; } @@ -453,21 +456,20 @@ class MediaWiki { if( !$this->getVal( 'EnableDublinCoreRdf' ) ) { wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) ); } else { - require_once( 'includes/Metadata.php' ); - wfDublinCoreRdf( $article ); + $rdf = new DublinCoreRdf( $article ); + $rdf->show(); } break; case 'creativecommons': if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) { wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) ); } else { - require_once( 'includes/Metadata.php' ); - wfCreativeCommonsRdf( $article ); + $rdf = new CreativeCommonsRdf( $article ); + $rdf->show(); } break; case 'credits': - require_once( 'includes/Credits.php' ); - showCreditsPage( $article ); + Credits::showPage( $article ); break; case 'submit': if( session_id() == '' ) { @@ -514,4 +516,3 @@ class MediaWiki { } }; /* End of class MediaWiki */ -