* Retieves 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];
return $default;
}
- /**
- * Wrapper for getrusage, if it exists
- * getrusage() does not exist on the Window$ platform, catching this
- */
- function getRUsage() {
- if ( function_exists ( 'getrusage' ) ) {
- return getrusage();
- } else {
- return array();
- }
- }
-
- /**
- * CHeck for $GLOBALS vulnerability
- */
- function ckeckGlobalsVulnerability() {
- @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>');
- }
- }
-
- /**
- * 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 <tt>config/LocalSettings.php</tt> to the parent directory.";
- } else {
- $msg = "Please <a href='config/index.php' title='setup'>setup the wiki</a> first.";
- }
- $out = str_replace( "$2", $msg, $out );
- echo $out;
- die();
- }
-
- /**
- * Reads title and action values from request
- */
- function initializeActionTitle () {
- $request = $this->getVal( 'Request' );
- $this->setVal( 'action', $request->getVal( 'action', 'view' ) );
- $this->setVal( 'urltitle', $request->getVal( 'title' ) );
- }
-
/**
* Initialization of ... everything
@return Article either the object to become $wgArticle, or NULL
*/
- function initialize ( &$title, &$output, &$user ) {
+ function initialize ( &$title, &$output, &$user, $request) {
wfProfileIn( 'MediaWiki::initialize' );
- $request = $this->getVal( 'Request' );
- $this->preliminaryChecks ( $title, $output );
+ $this->preliminaryChecks ( $title, $output, $request ) ;
$article = NULL;
- if ( !$this->initializeSpecialCases( $title, $output ) ) {
- $article = $this->initializeArticle( $title );
+ if ( !$this->initializeSpecialCases( $title, $output, $request ) ) {
+ $article = $this->initializeArticle( $title, $request );
if( is_object( $article ) ) {
- $this->performAction( $output, $article, $title, $user );
+ $this->performAction( $output, $article, $title, $user, $request );
} elseif( is_string( $article ) ) {
$output->redirect( $article );
} else {
/**
* Checks some initial queries
+ * Note that $title here is *not* a Title object, but a string!
*/
- function checkInitialQueries( &$output, $lang) {
- wfProfileIn( 'MediaWiki::checkInitialQueries' );
- $request = $this->getVal( 'Request' );
- $action = $this->getVal( 'action' );
- $title = $this->getVal( 'urltitle' );
+ function checkInitialQueries( $title,$action,&$output,$request, $lang) {
if ($request->getVal( 'printable' ) == 'yes') {
$output->setPrintable();
}
- $ret = NULL;
+ $ret = NULL ;
if ( '' == $title && 'delete' != $action ) {
$lang->findVariantLink( $title, $ret );
}
- wfProfileOut( 'MediaWiki::checkInitialQueries' );
- return $ret;
+ return $ret ;
}
/**
* Checks for search query and anon-cannot-read case
*/
- function preliminaryChecks ( &$title, &$output ) {
- $request = $this->getVal( 'Request' );
+ function preliminaryChecks ( &$title, &$output, $request ) {
+
# Debug statement for user levels
// print_r($wgUser);
// 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
/**
* Initialize the object to be known as $wgArticle for special cases
*/
- function initializeSpecialCases ( &$title, &$output ) {
+ function initializeSpecialCases ( &$title, &$output, $request ) {
+
wfProfileIn( 'MediaWiki::initializeSpecialCases' );
- $request = $this->getVal( 'Request' );
$search = $this->getVal('Search');
$action = $this->getVal('Action');
* 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
* @return mixed an Article, or a string to redirect to another URL
*/
- function initializeArticle( $title ) {
+ function initializeArticle( $title, $request ) {
+ global $wgTitle;
wfProfileIn( 'MediaWiki::initializeArticle' );
- $request = $this->getVal( 'Request' );
$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);
+
+ // If we don't check for existance we'll get "Trying to get
+ // property of non-object" E_NOTICE in Article::loadPageData() when
+ // viewing a page that does not exist
+ if ( $article->exists() ) {
+ $article->loadPageData($article->pageDataFromTitle($dbr,$title));
}
- if( is_object( $target ) ) {
- // evil globals hack!
- global $wgTitle;
- $wgTitle = $target;
-
- $article = $this->articleFromTitle( $target );
- $article->setRedirectedFrom( $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 ) ) {
+ /* 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' );
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();
foreach( $updates as $up ) {
$up->doUpdate();
}
- wfProfileOut( 'MediaWiki::doUpdates' );
+ wfProfileOut( 'MediaWiki::doUpdates' );
+ }
+
+ /**
+ * Do a job from the job queue
+ */
+ function doJobs() {
+ global $wgJobLogFile, $wgJobRunRate;
+
+ if ( $wgJobRunRate <= 0 ) {
+ return;
+ }
+ if ( $wgJobRunRate < 1 ) {
+ $max = mt_getrandmax();
+ if ( mt_rand( 0, $max ) > $max * $wgJobRunRate ) {
+ return;
+ }
+ $n = 1;
+ } else {
+ $n = intval( $wgJobRunRate );
+ }
+
+ require_once( 'JobQueue.php' );
+
+ while ( $n-- && false != ($job = Job::pop())) {
+ $output = $job->toString() . "\n";
+ if ( !$job->run() ) {
+ $output .= "Error: " . $job->getLastError() . "\n";
+ }
+ if ( $wgJobLogFile ) {
+ error_log( $output, 3, $wgJobLogFile );
+ }
+ }
}
/**
/**
* Perform one of the "standard" actions
*/
- function performAction( &$output, &$article, &$title, &$user ) {
+ function performAction( &$output, &$article, &$title, &$user, &$request ) {
+
wfProfileIn( 'MediaWiki::performAction' );
-
- $request = $this->getVal( 'Request' );
+
$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 ) {
if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {
$output->errorpage( 'nosuchaction', 'nosuchactiontext' );
}
+ }
wfProfileOut( 'MediaWiki::performAction' );
- }
}
}; /* End of class MediaWiki */
-?>
\ No newline at end of file
+?>
dépôts / lhc / web / wiklou.git / blobdiff