X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=2166f7cc54693dc43917b786a3a2946e15c3bf00;hb=741360fb3df2ad2b62f523ddced2eb75ee5b94ce;hp=3551d487e3691dd47fbcbfc455d70c7fb4499581;hpb=3ccace42c0b0900ae720ad5a73d0512e2131c3ff;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 3551d487e3..2166f7cc54 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -25,10 +25,10 @@ class MediaWiki {
}
/**
- * Retieves key/value pairs to circumvent global variables
+ * Retrieves key/value pairs to circumvent global variables
* Note that keys are case-insensitive!
*/
- function getVal( $key, $default = "" ) {
+ function getVal( $key, $default = '' ) {
$key = strtolower( $key );
if( isset( $this->params[$key] ) ) {
return $this->params[$key];
@@ -36,30 +36,6 @@ class MediaWiki {
return $default;
}
- /**
- * Checks if the wiki is set up at all, or configured but not activated
- */
- function checkSetup() {
- if ( file_exists( './LocalSettings.php' ) ) {
- /* LocalSettings exists, commerce normally */
- return;
- }
-
- /* LocalSettings is not in the right place, do something */
- $IP = ".";
- require_once( 'includes/DefaultSettings.php' ); # used for printing the version
- $out = file_get_contents( "./setup_message.html" );
- $out = str_replace( "$1", $wgVersion, $out );
- if ( file_exists( 'config/LocalSettings.php' ) ) {
- $msg = "To complete the installation, move config/LocalSettings.php to the parent directory.";
- } else {
- $msg = "Please setup the wiki first.";
- }
- $out = str_replace( "$2", $msg, $out );
- echo $out ;
- die();
- }
-
/**
* Initialization of ... everything
@return Article either the object to become $wgArticle, or NULL
@@ -75,7 +51,7 @@ class MediaWiki {
} elseif( is_string( $article ) ) {
$output->redirect( $article );
} else {
- wfDebugDieBacktrace( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
+ throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
}
}
wfProfileOut( 'MediaWiki::initialize' );
@@ -87,7 +63,6 @@ class MediaWiki {
* Note that $title here is *not* a Title object, but a string!
*/
function checkInitialQueries( $title,$action,&$output,$request, $lang) {
- wfProfileIn( 'MediaWiki::checkInitialQueries' );
if ($request->getVal( 'printable' ) == 'yes') {
$output->setPrintable();
}
@@ -109,7 +84,6 @@ class MediaWiki {
$lang->findVariantLink( $title, $ret );
}
- wfProfileOut( 'MediaWiki::checkInitialQueries' );
return $ret ;
}
@@ -127,7 +101,7 @@ class MediaWiki {
// Do this above the read whitelist check for security...
$title = Title::makeTitle( NS_SPECIAL, 'Search' );
}
- $this->setVal( "Search", $search );
+ $this->setVal( 'Search', $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
@@ -154,8 +128,9 @@ class MediaWiki {
$title = Title::makeTitle( NS_SPECIAL, 'Search' );
wfSpecialSearch();
} else if( !$title or $title->getDBkey() == '' ) {
- $title = Title::newFromText( wfMsgForContent( 'badtitle' ) );
- $output->errorpage( 'badtitle', 'badtitletext' );
+ $title = Title::makeTitle( NS_SPECIAL, 'Badtitle' );
+ # Die now before we mess up $wgArticle and the skin stops working
+ throw new ErrorPageError( 'badtitle', 'badtitletext' );
} else if ( $title->getInterwiki() != '' ) {
if( $rdfrom = $request->getVal( 'rdfrom' ) ) {
$url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
@@ -166,8 +141,8 @@ class MediaWiki {
if ( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) {
$output->redirect( $url );
} else {
- $title = Title::newFromText( wfMsgForContent( 'badtitle' ) );
- $output->errorpage( 'badtitle', 'badtitletext' );
+ $title = Title::makeTitle( NS_SPECIAL, 'Badtitle' );
+ throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
} else if ( ( $action == 'view' ) &&
(!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) &&
@@ -202,10 +177,8 @@ class MediaWiki {
switch( $title->getNamespace() ) {
case NS_IMAGE:
- require_once( 'includes/ImagePage.php' );
return new ImagePage( $title );
case NS_CATEGORY:
- require_once( 'includes/CategoryPage.php' );
return new CategoryPage( $title );
default:
return new Article( $title );
@@ -221,28 +194,43 @@ class MediaWiki {
* @return mixed an Article, or a string to redirect to another URL
*/
function initializeArticle( $title, $request ) {
+ global $wgTitle;
wfProfileIn( 'MediaWiki::initializeArticle' );
$action = $this->getVal('Action');
$article = $this->articleFromTitle( $title );
// Namespace might change when using redirects
- if( $action == 'view' && !$request->getVal( 'oldid' ) && $request->getVal( 'redirect' ) != 'no' ) {
- $target = $article->followRedirect();
- if( is_string( $target ) ) {
- global $wgDisableHardRedirects;
- if( !$wgDisableHardRedirects ) {
- // we'll need to redirect
- return $target;
+ if( $action == 'view' && !$request->getVal( 'oldid' ) &&
+ $request->getVal( 'redirect' ) != 'no' ) {
+
+ $dbr =& wfGetDB(DB_SLAVE);
+ $article->loadPageData($article->pageDataFromTitle($dbr, $title));
+
+ /* Follow redirects only for... redirects */
+ if ($article->mIsRedirect) {
+ $target = $article->followRedirect();
+ if( is_string( $target ) ) {
+ global $wgDisableHardRedirects;
+ if( !$wgDisableHardRedirects ) {
+ // we'll need to redirect
+ return $target;
+ }
}
- }
- if( is_object( $target ) ) {
- // evil globals hack!
- global $wgTitle;
- $wgTitle = $target;
-
- $article = $this->articleFromTitle( $target );
- $article->setRedirectedFrom( $title );
+ if( is_object( $target ) ) {
+ /* Rewrite environment to redirected article */
+ $rarticle = $this->articleFromTitle($target);
+ $rarticle->loadPageData($rarticle->pageDataFromTitle($dbr,$target));
+ if ($rarticle->mTitle->mArticleID) {
+ $article = $rarticle;
+ $wgTitle = $target;
+ $article->setRedirectedFrom( $title );
+ } else {
+ $wgTitle = $title;
+ }
+ }
+ } else {
+ $wgTitle = $article->mTitle;
}
}
wfProfileOut( 'MediaWiki::initializeArticle' );
@@ -255,6 +243,7 @@ class MediaWiki {
function finalCleanup ( &$deferredUpdates, &$loadBalancer, &$output ) {
wfProfileIn( 'MediaWiki::finalCleanup' );
$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->commitAll();
@@ -272,15 +261,48 @@ class MediaWiki {
foreach( $updates as $up ) {
$up->doUpdate();
}
- wfProfileOut( 'MediaWiki::doUpdates' );
+ wfProfileOut( 'MediaWiki::doUpdates' );
+ }
+
+ /**
+ * Do a job from the job queue
+ */
+ function doJobs() {
+ global $wgJobRunRate;
+
+ if ( $wgJobRunRate <= 0 || wfReadOnly() ) {
+ return;
+ }
+ if ( $wgJobRunRate < 1 ) {
+ $max = mt_getrandmax();
+ if ( mt_rand( 0, $max ) > $max * $wgJobRunRate ) {
+ return;
+ }
+ $n = 1;
+ } else {
+ $n = intval( $wgJobRunRate );
+ }
+
+ while ( $n-- && false != ($job = Job::pop())) {
+ $output = $job->toString() . "\n";
+ $t = -wfTime();
+ $success = $job->run();
+ $t += wfTime();
+ $t = round( $t*1000 );
+ if ( !$success ) {
+ $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
+ } else {
+ $output .= "Success, Time: $t ms\n";
+ }
+ wfDebugLog( 'jobqueue', $output );
+ }
}
/**
* Ends this task peacefully
*/
function restInPeace ( &$loadBalancer ) {
- wfProfileClose();
- logProfilingData();
+ wfLogProfilingData();
$loadBalancer->closeAll();
wfDebug( "Request ended normally\n" );
}
@@ -295,7 +317,7 @@ class MediaWiki {
$action = $this->getVal('Action');
if( in_array( $action, $this->getVal('DisabledActions',array()) ) ) {
/* No such action; this will switch to the default case */
- $action = "nosuchaction";
+ $action = 'nosuchaction';
}
switch( $action ) {
@@ -312,7 +334,6 @@ class MediaWiki {
case 'unprotect':
case 'info':
case 'markpatrolled':
- case 'validate':
case 'render':
case 'deletetrackback':
case 'purge':
@@ -354,11 +375,9 @@ class MediaWiki {
$oldid = $request->getVal( 'oldid' );
if( !$this->getVal( 'UseExternalEditor' ) || $action=='submit' || $internal ||
$section || $oldid || ( !$user->getOption( 'externaleditor' ) && !$external ) ) {
- require_once( 'includes/EditPage.php' );
$editor = new EditPage( $article );
$editor->submit();
} elseif( $this->getVal( 'UseExternalEditor' ) && ( $external || $user->getOption( 'externaleditor' ) ) ) {
- require_once( 'includes/ExternalEdit.php' );
$mode = $request->getVal( 'mode' );
$extedit = new ExternalEdit( $article, $mode );
$extedit->edit();
@@ -368,25 +387,23 @@ class MediaWiki {
if( $_SERVER['REQUEST_URI'] == $title->getInternalURL( 'action=history' ) ) {
$output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) );
}
- require_once( 'includes/PageHistory.php' );
$history = new PageHistory( $article );
$history->history();
break;
case 'raw':
- require_once( 'includes/RawPage.php' );
$raw = new RawPage( $article );
$raw->view();
break;
default:
if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
- $output->errorpage( 'nosuchaction', 'nosuchactiontext' );
+ $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
}
+ }
wfProfileOut( 'MediaWiki::performAction' );
- }
}
}; /* End of class MediaWiki */
-?>
\ No newline at end of file
+?>