var $mOldId;
var $mRevIdFetched;
var $mRevision;
+ var $mRedirectUrl;
/**#@-*/
/**
* Constructor and clear the article
- * @param mixed &$title
+ * @param Title &$title
+ * @param integer $oldId Revision ID, null to fetch from request, zero for current
*/
- function Article( &$title ) {
+ function Article( &$title, $oldId = null ) {
$this->mTitle =& $title;
+ $this->mOldId = $oldId;
$this->clear();
}
/**
* get the title object of the article
- * @public
*/
function getTitle() {
return $this->mTitle;
/**
* Clear the object
- * @private
+ * @access private
*/
function clear() {
$this->mDataLoaded = false;
$this->mForUpdate = false;
$this->mIsRedirect = false;
$this->mRevIdFetched = 0;
+ $this->mRedirectUrl = false;
}
/**
if ( 0 == $this->getID() ) {
if ( 'edit' == $action ) {
wfProfileOut( $fname );
- # Should we put something in the textarea?
- # if &preload=Pagename is set, we try to get
- # the revision text and put it in.
- if($preload) {
- $preloadTitle=Title::newFromText($preload);
- if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
- $rev=Revision::newFromTitle($preloadTitle);
- if($rev) {
- return $rev->getText();
- }
- }
- }
- # Don't preload anything.
- # We used to put MediaWiki:Newarticletext here.
+
+ # If requested, preload some text.
+ $text=$this->getPreloadedText($preload);
+
+ # We used to put MediaWiki:Newarticletext here if
+ # $text was empty at this point.
# This is now shown above the edit box instead.
- return '';
+ return $text;
}
wfProfileOut( $fname );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
- return wfMsg( 'noarticletext' );
+
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ $ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
+ } else {
+ $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
+ }
+
+ return "<div class='noarticletext'>$ret</div>";
} else {
$this->loadContent( $noredir );
# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
if($section!='') {
if($section=='new') {
wfProfileOut( $fname );
- return '';
+ $text=$this->getPreloadedText($preload);
+ return $text;
}
# strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
}
}
+ /**
+ * Get the contents of a page from its title and remove includeonly tags
+ *
+ * TODO FIXME: This is only here because of the inputbox extension and
+ * should be moved there
+ *
+ * @deprecated
+ *
+ * @param string The title of the page
+ * @return string The contents of the page
+ */
+ function getPreloadedText($preload) {
+ if ( $preload === '' )
+ return '';
+ else {
+ $preloadTitle = Title::newFromText( $preload );
+ if ( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) {
+ $rev=Revision::newFromTitle($preloadTitle);
+ if ( is_object( $rev ) ) {
+ $text = $rev->getText();
+ // TODO FIXME: AAAAAAAAAAA, this shouldn't be implementing
+ // its own mini-parser! -ævar
+ $text = preg_replace( '~</?includeonly>~', '', $text );
+ return $text;
+ } else
+ return '';
+ }
+ }
+ }
+
/**
* This function returns the text of a section, specified by a number ($section).
* A section is text under a heading like == Heading == or <h1>Heading</h1>, or
$striparray=array();
$parser=new Parser();
$parser->mOutputType=OT_WIKI;
+ $parser->mOptions = new ParserOptions();
$striptext=$parser->strip($text, $striparray, true);
# now that we can be sure that no pseudo-sections are in the source,
# split it up by section
$secs =
preg_split(
- '/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
+ '/(^=+.+?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)(?!\S)/mi',
$striptext, -1,
PREG_SPLIT_DELIM_CAPTURE);
if($section==0) {
$rv=$secs[0];
} else {
$headline=$secs[$section*2-1];
- preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
+ preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$headline,$matches);
$hlevel=$matches[1];
# translate wiki heading into level
while(!empty($secs[$count*2-1]) && !$break) {
$subheadline=$secs[$count*2-1];
- preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
+ preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
$subhlevel=$matches[1];
if(strpos($subhlevel,'=')!==false) {
$subhlevel=strlen($subhlevel);
}
/**
- * Return an array of the columns of the "cur"-table
+ * @return int The oldid of the article that is to be shown, 0 for the
+ * current revision
*/
- function getContentFields() {
- return $wgArticleContentFields = array(
- 'old_text','old_flags',
- 'rev_timestamp','rev_user', 'rev_user_text', 'rev_comment','page_counter',
- 'page_namespace', 'page_title', 'page_restrictions','page_touched','page_is_redirect' );
+ function getOldID() {
+ if ( is_null( $this->mOldId ) ) {
+ $this->mOldId = $this->getOldIDFromRequest();
+ }
+ return $this->mOldId;
}
/**
- * Return the oldid of the article that is to be shown.
- * For requests with a "direction", this is not the oldid of the
- * query
+ * Sets $this->mRedirectUrl to a correct URL if the query parameters are incorrect
+ *
+ * @return int The old id for the request
*/
- function getOldID() {
- global $wgRequest, $wgOut;
- static $lastid;
-
- if ( isset( $lastid ) ) {
- return $lastid;
- }
- # Query variables :P
+ function getOldIDFromRequest() {
+ global $wgRequest;
+ $this->mRedirectUrl = false;
$oldid = $wgRequest->getVal( 'oldid' );
if ( isset( $oldid ) ) {
- $oldid = IntVal( $oldid );
+ $oldid = intval( $oldid );
if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
$nextid = $this->mTitle->getNextRevisionID( $oldid );
if ( $nextid ) {
$oldid = $nextid;
} else {
- $wgOut->redirect( $this->mTitle->getFullURL( 'redirect=no' ) );
+ $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
}
} elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
$previd = $this->mTitle->getPreviousRevisionID( $oldid );
}
$lastid = $oldid;
}
- return @$oldid; # "@" to be able to return "unset" without PHP complaining
+ if ( !$oldid ) {
+ $oldid = 0;
+ }
+ return $oldid;
}
-
/**
- * Load the revision (including cur_text) into this object
+ * Load the revision (including text) into this object
*/
function loadContent( $noredir = false ) {
global $wgOut, $wgRequest;
* @access private
*/
function pageData( &$dbr, $conditions ) {
- return $dbr->selectRow( 'page',
- array(
+ $fields = array(
'page_id',
'page_namespace',
'page_title',
'page_random',
'page_touched',
'page_latest',
- 'page_len' ),
+ 'page_len' ) ;
+ wfRunHooks( 'ArticlePageDataBefore', array( &$this , &$fields ) ) ;
+ $row = $dbr->selectRow( 'page',
+ $fields,
$conditions,
'Article::pageData' );
+ wfRunHooks( 'ArticlePageDataAfter', array( &$this , &$row ) ) ;
+ return $row ;
}
+ /**
+ * @param Database $dbr
+ * @param Title $title
+ */
function pageDataFromTitle( &$dbr, $title ) {
return $this->pageData( $dbr, array(
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey() ) );
}
+ /**
+ * @param Database $dbr
+ * @param int $id
+ */
function pageDataFromId( &$dbr, $id ) {
- return $this->pageData( $dbr, array(
- 'page_id' => IntVal( $id ) ) );
+ return $this->pageData( $dbr, array( 'page_id' => $id ) );
}
/**
$this->mTitle->loadRestrictions( $data->page_restrictions );
$this->mTitle->mRestrictionsLoaded = true;
- $this->mCounter = $data->page_counter;
- $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
- $this->mIsRedirect = $data->page_is_redirect;
- $this->mLatest = $data->page_latest;
+ $this->mCounter = $data->page_counter;
+ $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
+ $this->mIsRedirect = $data->page_is_redirect;
+ $this->mLatest = $data->page_latest;
- $this->mDataLoaded = true;
+ $this->mDataLoaded = true;
}
/**
if ( $this->mContentLoaded ) {
return $this->mContent;
}
+
$dbr =& $this->getDB();
$fname = 'Article::fetchContent';
$redirect = ($redirect == 'no') ? 'no' : 'yes';
$t .= ',redirect='.$redirect;
}
- $this->mContent = wfMsg( 'missingarticle', $t );
+ $this->mContent = wfMsg( 'missingarticle', $t ) ;
if( $oldid ) {
$revision = Revision::newFromId( $oldid );
return false;
}
}
- $redirData = $this->pageDataFromTitle( $dbr, $rt );
- if( $redirData ) {
- $redirRev = Revision::newFromId( $redirData->page_latest );
- if( !is_null( $redirRev ) ) {
- $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
- $this->mTitle = $rt;
- $data = $redirData;
- $this->loadPageData( $data );
- $revision = $redirRev;
+ if( $rt->getInterwiki() == '' ) {
+ $redirData = $this->pageDataFromTitle( $dbr, $rt );
+ if( $redirData ) {
+ $redirRev = Revision::newFromId( $redirData->page_latest );
+ if( !is_null( $redirRev ) ) {
+ $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+ $this->mTitle = $rt;
+ $data = $redirData;
+ $this->loadPageData( $data );
+ $revision = $redirRev;
+ }
}
}
}
$this->mContentLoaded = true;
$this->mRevision =& $revision;
+ wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ) ;
+
return $this->mContent;
}
/**
* Gets the article text without using so many damn globals
- * Returns false on error
*
- * @param integer $oldid
+ * Used by maintenance/importLogs.php
+ *
+ * @param int $oldid
+ * @param bool $noredir Whether to follow redirects
+ * @return mixed the content (string) or false on error
*/
function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
return $this->fetchContent( $oldid, $noredir, false );
/**
* Read/write accessor to select FOR UPDATE
+ *
+ * @param mixed $x
*/
function forUpdate( $x = NULL ) {
return wfSetVar( $this->mForUpdate, $x );
/**
* Get the database which should be used for reads
+ *
+ * @return Database
*/
function &getDB() {
- #if ( $this->mForUpdate ) {
- return wfGetDB( DB_MASTER );
- #} else {
- # return wfGetDB( DB_SLAVE );
- #}
+ $ret =& wfGetDB( DB_MASTER );
+ return $ret;
}
/**
* Get options for all SELECT statements
- * Can pass an option array, to which the class-wide options will be appended
+ *
+ * @param array $options an optional options array which'll be appended to
+ * the default
+ * @return array Options
*/
function getSelectOptions( $options = '' ) {
if ( $this->mForUpdate ) {
}
/**
- * Return the Article ID
+ * @return int Page ID
*/
function getID() {
if( $this->mTitle ) {
}
/**
- * Returns true if this article exists in the database.
- * @return bool
+ * @return bool Whether or not the page exists in the database
*/
function exists() {
return $this->getId() != 0;
}
/**
- * Get the view count for this article
+ * @return int The view count for the page
*/
function getCount() {
if ( -1 == $this->mCounter ) {
$id = $this->getID();
- $dbr =& $this->getDB();
+ $dbr =& wfGetDB( DB_SLAVE );
$this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
'Article::getCount', $this->getSelectOptions() );
}
}
/**
- * Would the given text make this article a "good" article (i.e.,
- * suitable for including in the article count)?
+ * Determine whether a page would be suitable for being counted as an
+ * article in the site_stats table based on the title & its content
+ *
* @param string $text Text to analyze
- * @return integer 1 if it can be counted else 0
+ * @return bool
*/
function isCountable( $text ) {
global $wgUseCommaCount;
- if ( NS_MAIN != $this->mTitle->getNamespace() ) { return 0; }
- if ( $this->isRedirect( $text ) ) { return 0; }
- $token = ($wgUseCommaCount ? ',' : '[[' );
- if ( false === strstr( $text, $token ) ) { return 0; }
- return 1;
+ $token = $wgUseCommaCount ? ',' : '[[';
+ return
+ $this->mTitle->getNamespace() == NS_MAIN
+ && ! $this->isRedirect( $text )
+ && in_string( $token, $text );
}
/**
* Tests if the article text represents a redirect
+ *
+ * @param string $text
+ * @return bool
*/
function isRedirect( $text = false ) {
if ( $text === false ) {
/**
* Loads everything except the text
* This isn't necessary for all uses, so it's only done if needed.
- * @private
+ * @access private
*/
function loadLastEdit() {
global $wgOut;
$this->mTimestamp = $this->mLastRevision->getTimestamp();
$this->mComment = $this->mLastRevision->getComment();
$this->mMinorEdit = $this->mLastRevision->isMinor();
+ $this->mRevIdFetched = $this->mLastRevision->getID();
}
}
function getTimestamp() {
$this->loadLastEdit();
- return $this->mTimestamp;
+ return wfTimestamp(TS_MW, $this->mTimestamp);
}
function getUser() {
$title = $this->mTitle;
$contribs = array();
- $dbr =& $this->getDB();
+ $dbr =& wfGetDB( DB_SLAVE );
$revTable = $dbr->tableName( 'revision' );
$userTable = $dbr->tableName( 'user' );
$encDBkey = $dbr->addQuotes( $title->getDBkey() );
* the given title.
*/
function view() {
- global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
- global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
- global $wgEnotif, $wgParser, $wgParserCache;
+ global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
+ global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
+ global $wgUseTrackbacks;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
wfProfileIn( $fname );
+ $parserCache =& ParserCache::singleton();
# Get variables from query string
$oldid = $this->getOldID();
+
+ # getOldID may want us to redirect somewhere else
+ if ( $this->mRedirectUrl ) {
+ $wgOut->redirect( $this->mRedirectUrl );
+ wfProfileOut( $fname );
+ return;
+ }
+
$diff = $wgRequest->getVal( 'diff' );
$rcid = $wgRequest->getVal( 'rcid' );
$rdfrom = $wgRequest->getVal( 'rdfrom' );
require_once( 'DifferenceEngine.php' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
- $de = new DifferenceEngine( $oldid, $diff, $rcid );
+ $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid );
// DifferenceEngine directly fetched the revision:
$this->mRevIdFetched = $de->mNewid;
$de->showDiffPage();
}
if ( empty( $oldid ) && $this->checkTouched() ) {
- $wgOut->setETag($wgParserCache->getETag($this, $wgUser));
+ $wgOut->setETag($parserCache->getETag($this, $wgUser));
if( $wgOut->checkLastModified( $this->mTouched ) ){
wfProfileOut( $fname );
$this->exists() &&
empty( $oldid );
wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
+ if ( $wgUser->getOption( 'stubthreshold' ) ) {
+ wfIncrStats( 'pcache_miss_stub' );
+ }
$outputDone = false;
if ( $pcache ) {
}
if ( !$outputDone ) {
$text = $this->getContent( false ); # May change mTitle by following a redirect
+ if ( $text === false ) {
+ # Failed to load, replace text with error message
+ $t = $this->mTitle->getPrefixedText();
+ if( $oldid ) {
+ $t .= ',oldid='.$oldid;
+ }
+ if( isset( $redirect ) ) {
+ $redirect = ($redirect == 'no') ? 'no' : 'yes';
+ $t .= ',redirect='.$redirect;
+ }
+ $text = wfMsg( 'missingarticle', $t );
+ }
# Another whitelist check in case oldid or redirects are altering the title
if ( !$this->mTitle->userCanRead() ) {
$this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
$wgOut->setRobotpolicy( 'noindex,follow' );
}
+ $wasRedirected = false;
if ( '' != $this->mRedirectedFrom ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '',
- 'redirect=no' );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
-
- # Can't cache redirects
- $pcache = false;
+ if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '', 'redirect=no' );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
+
+ // Check the parser cache again, for the target page
+ if( $pcache ) {
+ if( $wgOut->tryParserCache( $this, $wgUser ) ) {
+ $outputDone = true;
+ }
+ }
+ $wasRedirected = true;
+ }
} elseif ( !empty( $rdfrom ) ) {
global $wgRedirectSources;
if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
$redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
$s = wfMsg( 'redirectedfrom', $redir );
$wgOut->setSubtitle( $s );
+ $wasRedirected = true;
}
}
-
+ }
+ if( !$outputDone ) {
+ /**
+ * @fixme: this hook doesn't work most of the time, as it doesn't
+ * trigger when the parser cache is used.
+ */
+ wfRunHooks( 'ArticleViewHeader', array( &$this ) ) ;
+ $wgOut->setRevisionId( $this->getRevIdFetched() );
# wrap user css and user js in pre and don't parse
# XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found
if (
$wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" );
} else if ( $rt = Title::newFromRedirect( $text ) ) {
# Display redirect
- $imageUrl = $wgStylePath.'/common/images/redirect.png';
+ $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+ $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
+ if( !$wasRedirected ) {
+ $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+ }
$targetUrl = $rt->escapeLocalURL();
$titleText = htmlspecialchars( $rt->getPrefixedText() );
$link = $sk->makeLinkObj( $rt );
- $wgOut->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
+ $wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT" />' .
'<span class="redirectText">'.$link.'</span>' );
$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
- $catlinks = $parseout->getCategoryLinks();
- $wgOut->addCategoryLinks($catlinks);
- $skin = $wgUser->getSkin();
+ $wgOut->addParserOutputNoText( $parseout );
} else if ( $pcache ) {
# Display content and save to parser cache
$wgOut->addPrimaryWikiText( $text, $this );
);
}
- # Put link titles into the link cache
- $wgOut->transformBuffer();
-
- # Add link titles as META keywords
- $wgOut->addMetaTags() ;
+ # Trackbacks
+ if ($wgUseTrackbacks)
+ $this->addTrackbacks();
$this->viewUpdates();
wfProfileOut( $fname );
}
+ function addTrackbacks() {
+ global $wgOut, $wgUser;
+
+ $dbr =& wfGetDB(DB_SLAVE);
+ $tbs = $dbr->select(
+ /* FROM */ 'trackbacks',
+ /* SELECT */ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
+ /* WHERE */ array('tb_page' => $this->getID())
+ );
+
+ if (!$dbr->numrows($tbs))
+ return;
+
+ $tbtext = "";
+ while ($o = $dbr->fetchObject($tbs)) {
+ $rmvtxt = "";
+ if ($wgUser->isSysop()) {
+ $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
+ . $o->tb_id . "&token=" . $wgUser->editToken());
+ $rmvtxt = wfMsg('trackbackremove', $delurl);
+ }
+ $tbtext .= wfMsg(strlen($o->tb_ex) ? 'trackbackexcerpt' : 'trackback',
+ $o->tb_title,
+ $o->tb_url,
+ $o->tb_ex,
+ $o->tb_name,
+ $rmvtxt);
+ }
+ $wgOut->addWikitext(wfMsg('trackbackbox', $tbtext));
+ }
+
+ function deletetrackback() {
+ global $wgUser, $wgRequest, $wgOut, $wgTitle;
+
+ if (!$wgUser->matchEditToken($wgRequest->getVal('token'))) {
+ $wgOut->addWikitext(wfMsg('sessionfailure'));
+ return;
+ }
+
+ if ((!$wgUser->isAllowed('delete'))) {
+ $wgOut->sysopRequired();
+ return;
+ }
+
+ if (wfReadOnly()) {
+ $wgOut->readOnlyPage();
+ return;
+ }
+
+ $db =& wfGetDB(DB_MASTER);
+ $db->delete('trackbacks', array('tb_id' => $wgRequest->getInt('tbid')));
+ $wgTitle->invalidateCache();
+ $wgOut->addWikiText(wfMsg('trackbackdeleteok'));
+ }
+
function render() {
global $wgOut;
$this->view();
}
+ function purge() {
+ global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
+
+ if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() || ! wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+ // Invalidate the cache
+ $this->mTitle->invalidateCache();
+
+ if ( $wgUseSquid ) {
+ // Commit the transaction before the purge is sent
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->immediateCommit();
+
+ // Send purge
+ $update = SquidUpdate::newSimplePurge( $this->mTitle );
+ $update->doUpdate();
+ }
+ $this->view();
+ } else {
+ $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
+ $action = $this->mTitle->escapeLocalURL( 'action=purge' );
+ $button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
+ $msg = str_replace( '$1',
+ "<form method=\"post\" action=\"$action\">\n" .
+ "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
+ "</form>\n", $msg );
+
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->addHTML( $msg );
+ }
+ }
+
/**
* Insert a new empty page record for this article.
* This *must* be followed up by creating a revision
'page_random' => wfRandom(),
'page_touched' => $dbw->timestamp(),
'page_latest' => 0, # Fill this in shortly...
+ 'page_len' => 0, # Fill this in shortly...
), $fname );
$newid = $dbw->insertId();
* Update the page record to point to a newly saved revision.
*
* @param Database $dbw
- * @param Revision $revision -- for ID number, and text used to set
- length and redirect status fields
- * @param int $lastRevision -- if given, will not overwrite the page field
- * when different from the currently set value.
- * Giving 0 indicates the new page flag should
- * be set on.
+ * @param Revision $revision For ID number, and text used to set
+ length and redirect status fields
+ * @param int $lastRevision If given, will not overwrite the page field
+ * when different from the currently set value.
+ * Giving 0 indicates the new page flag should
+ * be set on.
* @return bool true on success, false on failure
* @access private
*/
# An extra check against threads stepping on each other
$conditions['page_latest'] = $lastRevision;
}
+
$text = $revision->getText();
$dbw->update( 'page',
array( /* SET */
'page_latest' => $revision->getId(),
'page_touched' => $dbw->timestamp(),
'page_is_new' => ($lastRevision === 0) ? 1 : 0,
- 'page_is_redirect' => Article::isRedirect( $text ),
+ 'page_is_redirect' => Article::isRedirect( $text ) ? 1 : 0,
'page_len' => strlen( $text ),
),
$conditions,
'page_latest=rev_id' ),
$fname );
if( $row ) {
- if( $row->rev_timestamp >= $revision->getTimestamp() ) {
+ if( wfTimestamp(TS_MW, $row->rev_timestamp) >= $revision->getTimestamp() ) {
wfProfileOut( $fname );
return false;
}
* functions for after display, but that's taking a big leap
* of faith, and we want to be able to report database
* errors at some point.
- * @private
+ * @access private
*/
- function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false ) {
- global $wgOut, $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+ function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
+ global $wgOut, $wgUser, $wgUseSquid;
$fname = 'Article::insertNewArticle';
+ wfProfileIn( $fname );
+
+ if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text,
+ &$summary, &$isminor, &$watchthis, NULL ) ) ) {
+ wfDebug( "$fname: ArticleSave hook aborted save!\n" );
+ wfProfileOut( $fname );
+ return false;
+ }
- $this->mGoodAdjustment = $this->isCountable( $text );
+ $this->mGoodAdjustment = (int)$this->isCountable( $text );
$this->mTotalAdjustment = 1;
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
+
+ # If this is a comment, add the summary as headline
+ if($comment && $summary!="") {
+ $text="== {$summary} ==\n\n".$text;
+ }
$text = $this->preSaveTransform( $text );
- $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+
+ /* Silently ignore minoredit if not allowed */
+ $isminor = $isminor && $wgUser->isAllowed('minoredit');
$now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
$fname );
# standard deferred updates
- $this->editUpdates( $text, $summary, $isminor, $now );
+ $this->editUpdates( $text, $summary, $isminor, $now, $revisionId );
$oldid = 0; # new article
$this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
+
+ wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text,
+ $summary, $isminor,
+ $watchthis, NULL ) );
+ wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text,
+ $summary, $isminor,
+ $watchthis, NULL ) );
+ wfProfileOut( $fname );
}
function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = '', $edittime = NULL) {
- $fname = 'Article::getTextOfLastEditWithSectionReplacedOrAdded';
+ $this->replaceSection( $section, $text, $summary, $edittime );
+ }
+
+ /**
+ * @return string Complete article text, or null if error
+ */
+ function replaceSection($section, $text, $summary = '', $edittime = NULL) {
+ $fname = 'Article::replaceSection';
+ wfProfileIn( $fname );
+
if ($section != '') {
if( is_null( $edittime ) ) {
$rev = Revision::newFromTitle( $this->mTitle );
$dbw =& wfGetDB( DB_MASTER );
$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
}
+ if( is_null( $rev ) ) {
+ wfDebug( "Article::replaceSection asked for bogus section (page: " .
+ $this->getId() . "; section: $section; edittime: $edittime)\n" );
+ return null;
+ }
$oldtext = $rev->getText();
if($section=='new') {
$striparray=array();
$parser=new Parser();
$parser->mOutputType=OT_WIKI;
+ $parser->mOptions = new ParserOptions();
$oldtext=$parser->strip($oldtext, $striparray, true);
# now that we can be sure that no pseudo-sections are in the source,
# split it up
# Unfortunately we can't simply do a preg_replace because that might
# replace the wrong section, so we have to use the section counter instead
- $secs=preg_split('/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
+ $secs=preg_split('/(^=+.+?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)(?!\S)/mi',
$oldtext,-1,PREG_SPLIT_DELIM_CAPTURE);
$secs[$section*2]=$text."\n\n"; // replace with edited
# be erased, as the mother section has been replaced with
# the text of all subsections.
$headline=$secs[$section*2-1];
- preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
+ preg_match( '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$headline,$matches);
$hlevel=$matches[1];
# determine headline level for wikimarkup headings
$subheadline=$secs[$count*2-1];
preg_match(
- '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
+ '/^(=+).+?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
$subhlevel=$matches[1];
if(strpos($subhlevel,'=')!==false) {
$subhlevel=strlen($subhlevel);
}
}
+ wfProfileOut( $fname );
return $text;
}
* first set $wgUser, and clean up $wgDeferredUpdates after each edit.
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
- global $wgOut, $wgUser;
- global $wgDBtransactions, $wgMwRedir;
- global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList;
+ global $wgOut, $wgUser, $wgDBtransactions, $wgMwRedir, $wgUseSquid;
+ global $wgPostCommitUpdateList, $wgUseFileCache;
$fname = 'Article::updateArticle';
+ wfProfileIn( $fname );
$good = true;
- $isminor = ( $minor && $wgUser->isLoggedIn() );
- if ( $this->isRedirect( $text ) ) {
- # Remove all content but redirect
- # This could be done by reconstructing the redirect from a title given by
- # Title::newFromRedirect(), but then we wouldn't know which synonym the user
- # wants to see
- if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
- $redir = 1;
- $text = $m[1] . "\n";
- }
+ if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text,
+ &$summary, &$minor,
+ &$watchthis, &$sectionanchor ) ) ) {
+ wfDebug( "$fname: ArticleSave hook aborted save!\n" );
+ wfProfileOut( $fname );
+ return false;
}
- else { $redir = 0; }
+
+ $isminor = $minor && $wgUser->isAllowed('minoredit');
+ $redir = (int)$this->isRedirect( $text );
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
$oldsize = strlen( $oldtext );
$newsize = strlen( $text );
$lastRevision = 0;
+ $revisionId = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
- $this->mGoodAdjustment = $this->isCountable( $text )
- - $this->isCountable( $oldtext );
+ $this->mGoodAdjustment = (int)$this->isCountable( $text )
+ - (int)$this->isCountable( $oldtext );
$this->mTotalAdjustment = 0;
$now = wfTimestampNow();
'minor_edit' => $isminor,
'text' => $text
) );
+
+ $dbw->immediateCommit();
+ $dbw->begin();
$revisionId = $revision->insertOn( $dbw );
# Update page
if( !$ok ) {
/* Belated edit conflict! Run away!! */
$good = false;
+ $dbw->rollback();
} else {
# Update recentchanges and purge cache and whatnot
$bot = (int)($wgUser->isBot() || $forceBot);
RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
$lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
$revisionId );
+ $dbw->commit();
+
+ // Update caches outside the main transaction
Article::onArticleEdit( $this->mTitle );
}
+ } else {
+ // Keep the same revision ID, but do some updates on it
+ $revisionId = $this->getRevIdFetched();
}
if( !$wgDBtransactions ) {
if ( $good ) {
if ($watchthis) {
- if (!$this->mTitle->userIsWatching()) $this->watch();
+ if (!$this->mTitle->userIsWatching()) {
+ $dbw->immediateCommit();
+ $dbw->begin();
+ $this->watch();
+ $dbw->commit();
+ }
} else {
if ( $this->mTitle->userIsWatching() ) {
+ $dbw->immediateCommit();
+ $dbw->begin();
$this->unwatch();
+ $dbw->commit();
}
}
# standard deferred updates
- $this->editUpdates( $text, $summary, $minor, $now );
+ $this->editUpdates( $text, $summary, $minor, $now, $revisionId );
$urls = array();
+ # Invalidate caches of all articles using this article as a template
+
# Template namespace
# Purge all articles linking here
- if ( $this->mTitle->getNamespace() == NS_TEMPLATE) {
- $titles = $this->mTitle->getLinksTo();
- Title::touchArray( $titles );
- if ( $wgUseSquid ) {
- foreach ( $titles as $title ) {
- $urls[] = $title->getInternalURL();
- }
- }
+ $titles = $this->mTitle->getTemplateLinksTo();
+ Title::touchArray( $titles );
+ if ( $wgUseSquid ) {
+ foreach ( $titles as $title ) {
+ $urls[] = $title->getInternalURL();
+ }
}
# Squid updates
array_push( $wgPostCommitUpdateList, $u );
}
+ # File cache
+ if ( $wgUseFileCache ) {
+ $cm = new CacheManager($this->mTitle);
+ @unlink($cm->fileCacheName());
+ }
+
$this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision );
}
+ wfRunHooks( 'ArticleSaveComplete',
+ array( &$this, &$wgUser, $text,
+ $summary, $minor,
+ $watchthis, $sectionanchor ) );
+ wfProfileOut( $fname );
return $good;
}
* the link tables and redirect to the new page.
*/
function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
- global $wgUseDumbLinkUpdate, $wgAntiLockFlags, $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
+ global $wgOut, $wgUser;
global $wgUseEnotif;
- $wgLinkCache = new LinkCache();
-
- if ( !$wgUseDumbLinkUpdate ) {
- # Preload links to reduce lock time
- if ( $wgAntiLockFlags & ALF_PRELOAD_LINKS ) {
- $wgLinkCache->preFill( $this->mTitle );
- $wgLinkCache->clear();
- }
- }
-
- # Parse the text and replace links with placeholders
- $wgOut = new OutputPage();
-
- # Pass the current title along in case we're creating a wiki page
- # which is different than the currently displayed one (e.g. image
- # pages created on file uploads); otherwise, link updates will
- # go wrong.
- $wgOut->addWikiTextWithTitle( $text, $this->mTitle );
-
- if ( !$wgUseDumbLinkUpdate ) {
- # Move the current links back to the second register
- $wgLinkCache->swapRegisters();
-
- # Get old version of link table to allow incremental link updates
- # Lock this data now since it is needed for an update
- $wgLinkCache->forUpdate( true );
- $wgLinkCache->preFill( $this->mTitle );
-
- # Swap this old version back into its rightful place
- $wgLinkCache->swapRegisters();
- }
+ $fname = 'Article::showArticle';
+ wfProfileIn( $fname );
+ # Output the redirect
if( $this->isRedirect( $text ) )
$r = 'redirect=no';
else
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
- if ( $wgUseEnotif ) {
- # this would be better as an extension hook
- include_once( "UserMailer.php" );
- $wgEnotif = new EmailNotification ();
- $wgEnotif->notifyOnPageChange( $this->mTitle, $now, $summary, $me2, $oldid );
- }
+ wfProfileOut( $fname );
}
/**
$rcid = $wgRequest->getVal( 'rcid' );
if ( !is_null ( $rcid ) )
{
- RecentChange::markPatrolled( $rcid );
- $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
- $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
-
+ if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+ RecentChange::markPatrolled( $rcid );
+ wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
+ $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
+ $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
+ }
$rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
$wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
}
}
}
- /**
- * Validate function
- */
- function validate() {
- global $wgOut, $wgUser, $wgRequest, $wgUseValidation;
-
- if ( !$wgUseValidation ) # Are we using article validation at all?
- {
- $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
- return ;
- }
-
- $wgOut->setRobotpolicy( 'noindex,follow' );
- $revision = $wgRequest->getVal( 'revision' );
-
- include_once ( "SpecialValidate.php" ) ; # The "Validation" class
-
- $v = new Validation ;
- if ( $wgRequest->getVal ( "mode" , "" ) == "list" )
- $t = $v->showList ( $this ) ;
- else if ( $wgRequest->getVal ( "mode" , "" ) == "details" )
- $t = $v->showDetails ( $this , $wgRequest->getVal( 'revision' ) ) ;
- else
- $t = $v->validatePageForm ( $this , $revision ) ;
-
- $wgOut->addHTML ( $t ) ;
- }
-
/**
* Add this page to $wgUser's watchlist
*/
}
/**
- * protect a page
+ * action=protect handler
+ */
+ function protect() {
+ require_once 'ProtectionForm.php';
+ $form = new ProtectionForm( $this );
+ $form->show();
+ }
+
+ /**
+ * action=unprotect handler (alias)
+ */
+ function unprotect() {
+ $this->protect();
+ }
+
+ /**
+ * Update the article's restriction field, and leave a log entry.
+ *
+ * @param array $limit set of restriction keys
+ * @param string $reason
+ * @return bool true on success
*/
- function protect( $limit = 'sysop' ) {
+ function updateRestrictions( $limit = array(), $reason = '' ) {
global $wgUser, $wgOut, $wgRequest;
- if ( ! $wgUser->isAllowed('protect') ) {
- $wgOut->sysopRequired();
- return;
+ if ( !$wgUser->isAllowed( 'protect' ) ) {
+ return false;
}
- if ( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- return;
+
+ if( wfReadOnly() ) {
+ return false;
}
+
$id = $this->mTitle->getArticleID();
if ( 0 == $id ) {
- $wgOut->fatalError( wfMsg( 'badarticleerror' ) );
- return;
+ return false;
}
- $confirm = $wgRequest->wasPosted() &&
- $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
- $moveonly = $wgRequest->getBool( 'wpMoveOnly' );
- $reason = $wgRequest->getText( 'wpReasonProtect' );
+ $flat = Article::flattenRestrictions( $limit );
+ $protecting = ($flat != '');
+
+ if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
+ $limit, $reason ) ) ) {
- if ( $confirm ) {
$dbw =& wfGetDB( DB_MASTER );
$dbw->update( 'page',
array( /* SET */
'page_touched' => $dbw->timestamp(),
- 'page_restrictions' => (string)$limit
+ 'page_restrictions' => $flat
), array( /* WHERE */
'page_id' => $id
), 'Article::protect'
);
- $restrictions = "move=" . $limit;
- if( !$moveonly ) {
- $restrictions .= ":edit=" . $limit;
- }
- if (wfRunHooks('ArticleProtect', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly))) {
+ wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser,
+ $limit, $reason ) );
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->update( 'page',
- array( /* SET */
- 'page_touched' => $dbw->timestamp(),
- 'page_restrictions' => $restrictions
- ), array( /* WHERE */
- 'page_id' => $id
- ), 'Article::protect'
- );
-
- wfRunHooks('ArticleProtectComplete', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly));
-
- $log = new LogPage( 'protect' );
- if ( $limit === '' ) {
- $log->addEntry( 'unprotect', $this->mTitle, $reason );
- } else {
- $log->addEntry( 'protect', $this->mTitle, $reason );
- }
- $wgOut->redirect( $this->mTitle->getFullURL() );
+ $log = new LogPage( 'protect' );
+ if( $protecting ) {
+ $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$flat]" ) );
+ } else {
+ $log->addEntry( 'unprotect', $this->mTitle, $reason );
}
- return;
- } else {
- $reason = htmlspecialchars( wfMsg( 'protectreason' ) );
- return $this->confirmProtect( '', $reason, $limit );
}
+ return true;
}
/**
- * Output protection confirmation dialog
+ * Take an array of page restrictions and flatten it to a string
+ * suitable for insertion into the page_restrictions field.
+ * @param array $limit
+ * @return string
+ * @access private
*/
- function confirmProtect( $par, $reason, $limit = 'sysop' ) {
- global $wgOut, $wgUser;
-
- wfDebug( "Article::confirmProtect\n" );
-
- $sub = $this->mTitle->getPrefixedText();
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
- $check = '';
- $protcom = '';
- $moveonly = '';
-
- if ( $limit === '' ) {
- $wgOut->setPageTitle( wfMsg( 'confirmunprotect' ) );
- $wgOut->setSubtitle( wfMsg( 'unprotectsub', $sub ) );
- $wgOut->addWikiText( wfMsg( 'confirmunprotecttext' ) );
- $protcom = htmlspecialchars( wfMsg( 'unprotectcomment' ) );
- $formaction = $this->mTitle->escapeLocalURL( 'action=unprotect' . $par );
- } else {
- $wgOut->setPageTitle( wfMsg( 'confirmprotect' ) );
- $wgOut->setSubtitle( wfMsg( 'protectsub', $sub ) );
- $wgOut->addWikiText( wfMsg( 'confirmprotecttext' ) );
- $moveonly = htmlspecialchars( wfMsg( 'protectmoveonly' ) );
- $protcom = htmlspecialchars( wfMsg( 'protectcomment' ) );
- $formaction = $this->mTitle->escapeLocalURL( 'action=protect' . $par );
- }
-
- $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
- $token = htmlspecialchars( $wgUser->editToken() );
-
- $wgOut->addHTML( "
-<form id='protectconfirm' method='post' action=\"{$formaction}\">
- <table border='0'>
- <tr>
- <td align='right'>
- <label for='wpReasonProtect'>{$protcom}:</label>
- </td>
- <td align='left'>
- <input type='text' size='60' name='wpReasonProtect' id='wpReasonProtect' value=\"" . htmlspecialchars( $reason ) . "\" />
- </td>
- </tr>" );
- if($moveonly != '') {
- $wgOut->AddHTML( "
- <tr>
- <td align='right'>
- <input type='checkbox' name='wpMoveOnly' value='1' id='wpMoveOnly' />
- </td>
- <td align='left'>
- <label for='wpMoveOnly'>{$moveonly}</label>
- </td>
- </tr> " );
+ function flattenRestrictions( $limit ) {
+ if( !is_array( $limit ) ) {
+ wfDebugDieBacktrace( 'Article::flattenRestrictions given non-array restriction set' );
+ }
+ $bits = array();
+ foreach( $limit as $action => $restrictions ) {
+ if( $restrictions != '' ) {
+ $bits[] = "$action=$restrictions";
+ }
}
- $wgOut->addHTML( "
- <tr>
- <td> </td>
- <td>
- <input type='submit' name='wpConfirmProtectB' value=\"{$confirm}\" />
- </td>
- </tr>
- </table>
- <input type='hidden' name='wpEditToken' value=\"{$token}\" />
-</form>" );
-
- $wgOut->returnToMain( false );
- }
-
- /**
- * Unprotect the pages
- */
- function unprotect() {
- return $this->protect( '' );
+ return implode( ':', $bits );
}
/*
* UI entry point for page deletion
*/
function delete() {
- global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest;
$fname = 'Article::delete';
$confirm = $wgRequest->wasPosted() &&
$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
# This code desperately needs to be totally rewritten
# Check permissions
- if( ( !$wgUser->isAllowed( 'delete' ) ) ) {
+ if( $wgUser->isAllowed( 'delete' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
$wgOut->sysopRequired();
return;
}
+
if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
- # Better double-check that it hasn't been deleted yet!
$wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
- if( !$this->mTitle->exists() ) {
+
+ # Better double-check that it hasn't been deleted yet!
+ $dbw =& wfGetDB( DB_MASTER );
+ $conds = $this->mTitle->pageCond();
+ $latest = $dbw->selectField( 'page', 'page_latest', $conds, $fname );
+ if ( $latest === false ) {
$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
return;
}
# determine whether this page has earlier revisions
# and insert a warning if it does
- # we select the text because it might be useful below
- $dbr =& $this->getDB();
- $ns = $this->mTitle->getNamespace();
- $title = $this->mTitle->getDBkey();
- $revisions = $dbr->select( array( 'page', 'revision' ),
- array( 'rev_id', 'rev_user_text' ),
- array(
- 'page_namespace' => $ns,
- 'page_title' => $title,
- 'rev_page = page_id'
- ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
- );
-
- if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
+ $maxRevisions = 20;
+ $authors = $this->getLastNAuthors( $maxRevisions, $latest );
+
+ if( count( $authors ) > 1 && !$confirm ) {
$skin=$wgUser->getSkin();
$wgOut->addHTML('<b>'.wfMsg('historywarning'));
$wgOut->addHTML( $skin->historyLink() .'</b>');
}
- # Fetch cur_text
- $rev =& Revision::newFromTitle( $this->mTitle );
-
- # Fetch name(s) of contributors
- $rev_name = '';
- $all_same_user = true;
- while( $row = $dbr->fetchObject( $revisions ) ) {
- if( $rev_name != '' && $rev_name != $row->rev_user_text ) {
- $all_same_user = false;
- } else {
- $rev_name = $row->rev_user_text;
+ # If a single user is responsible for all revisions, find out who they are
+ if ( count( $authors ) == $maxRevisions ) {
+ // Query bailed out, too many revisions to find out if they're all the same
+ $authorOfAll = false;
+ } else {
+ $authorOfAll = reset( $authors );
+ foreach ( $authors as $author ) {
+ if ( $authorOfAll != $author ) {
+ $authorOfAll = false;
+ break;
+ }
}
}
+ # Fetch article text
+ $rev = Revision::newFromTitle( $this->mTitle );
if( !is_null( $rev ) ) {
# if this is a mini-text, we can paste part of it into the deletion reason
# this should not happen, since it is not possible to store an empty, new
# page. Let's insert a standard text in case it does, though
if( $length == 0 && $reason === '' ) {
- $reason = wfMsg( 'exblank' );
+ $reason = wfMsgForContent( 'exblank' );
}
if( $length < 500 && $reason === '' ) {
$text = preg_replace( "/[\n\r]/", '', $text );
if( !$blanked ) {
- if( !$all_same_user ) {
- $reason = wfMsg( 'excontent', $text );
+ if( $authorOfAll === false ) {
+ $reason = wfMsgForContent( 'excontent', $text );
} else {
- $reason = wfMsg( 'excontentauthor', $text, $rev_name );
+ $reason = wfMsgForContent( 'excontentauthor', $text, $authorOfAll );
}
} else {
- $reason = wfMsg( 'exbeforeblank', $text );
+ $reason = wfMsgForContent( 'exbeforeblank', $text );
}
}
}
return $this->confirmDelete( '', $reason );
}
+ /**
+ * Get the last N authors
+ * @param int $num Number of revisions to get
+ * @param string $revLatest The latest rev_id, selected from the master (optional)
+ * @return array Array of authors, duplicates not removed
+ */
+ function getLastNAuthors( $num, $revLatest = 0 ) {
+ $fname = 'Article::getLastNAuthors';
+ wfProfileIn( $fname );
+
+ // First try the slave
+ // If that doesn't have the latest revision, try the master
+ $continue = 2;
+ $db =& wfGetDB( DB_SLAVE );
+ do {
+ $res = $db->select( array( 'page', 'revision' ),
+ array( 'rev_id', 'rev_user_text' ),
+ array(
+ 'page_namespace' => $this->mTitle->getNamespace(),
+ 'page_title' => $this->mTitle->getDBkey(),
+ 'rev_page = page_id'
+ ), $fname, $this->getSelectOptions( array(
+ 'ORDER BY' => 'rev_timestamp DESC',
+ 'LIMIT' => $num
+ ) )
+ );
+ if ( !$res ) {
+ wfProfileOut( $fname );
+ return array();
+ }
+ $row = $db->fetchObject( $res );
+ if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
+ $db =& wfGetDB( DB_MASTER );
+ $continue--;
+ } else {
+ $continue = 0;
+ }
+ } while ( $continue );
+
+ $authors = array( $row->rev_user_text );
+ while ( $row = $db->fetchObject( $res ) ) {
+ $authors[] = $row->rev_user_text;
+ }
+ wfProfileOut( $fname );
+ return $authors;
+ }
+
/**
* Output deletion confirmation dialog
*/
$formaction = $this->mTitle->escapeLocalURL( 'action=delete' . $par );
- $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
+ $confirm = htmlspecialchars( wfMsg( 'deletepage' ) );
$delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
$token = htmlspecialchars( $wgUser->editToken() );
* Returns success
*/
function doDeleteArticle( $reason ) {
- global $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer, $wgPostCommitUpdateList;
+ global $wgUser, $wgUseSquid, $wgDeferredUpdateList;
+ global $wgPostCommitUpdateList, $wgUseTrackbacks;
$fname = 'Article::doDeleteArticle';
wfDebug( $fname."\n" );
return false;
}
- $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ), -1 );
+ $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent( true ) ), -1 );
array_push( $wgDeferredUpdateList, $u );
$linksTo = $this->mTitle->getLinksTo();
$dbw->delete( 'revision', array( 'rev_page' => $id ), $fname );
$dbw->delete( 'page', array( 'page_id' => $id ), $fname);
+ if ($wgUseTrackbacks)
+ $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), $fname );
+
# Clean up recentchanges entries...
$dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname );
* Revert a modification
*/
function rollback() {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$fname = 'Article::rollback';
- if ( ! $wgUser->isAllowed('rollback') ) {
+ if( $wgUser->isAllowed( 'rollback' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
$wgOut->sysopRequired();
return;
}
+
if ( wfReadOnly() ) {
$wgOut->readOnlyPage( $this->getContent( true ) );
return;
$from = str_replace( '_', ' ', $wgRequest->getVal( 'from' ) );
if( $from != $current->getUserText() ) {
- $wgOut->setPageTitle(wfmsg('rollbackfailed'));
+ $wgOut->setPageTitle( wfMsg('rollbackfailed') );
$wgOut->addWikiText( wfMsg( 'alreadyrolled',
htmlspecialchars( $this->mTitle->getPrefixedText()),
htmlspecialchars( $from ),
}
# Get the last edit not by this guy
- $user = IntVal( $current->getUser() );
+ $user = intval( $current->getUser() );
$user_text = $dbw->addQuotes( $current->getUserText() );
$s = $dbw->selectRow( 'revision',
array( 'rev_id', 'rev_timestamp' ),
return;
}
+ $set = array();
if ( $bot ) {
# Mark all reverted edits as bot
- $dbw->update( 'recentchanges',
- array( /* SET */
- 'rc_bot' => 1
- ), array( /* WHERE */
+ $set['rc_bot'] = 1;
+ }
+ if ( $wgUseRCPatrol ) {
+ # Mark all reverted edits as patrolled
+ $set['rc_patrolled'] = 1;
+ }
+
+ if ( $set ) {
+ $dbw->update( 'recentchanges', $set,
+ array( /* WHERE */
'rc_cur_id' => $current->getPage(),
'rc_user_text' => $current->getUserText(),
"rc_timestamp > '{$s->rev_timestamp}'",
);
}
- # Save it!
+ # Get the edit summary
$target = Revision::newFromId( $s->rev_id );
- $newcomment = wfMsg( 'revertpage', $target->getUserText(), $from );
+ $newComment = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
+ $newComment = $wgRequest->getText( 'summary', $newComment );
+ # Save it!
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
- $wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
+ $wgOut->addHTML( '<h2>' . htmlspecialchars( $newComment ) . "</h2>\n<hr />\n" );
- $this->updateArticle( $target->getText(), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
+ $this->updateArticle( $target->getText(), $newComment, 1, $this->mTitle->userIsWatching(), $bot );
Article::onArticleEdit( $this->mTitle );
$dbw->commit();
/**
* Do standard deferred updates after page view
- * @private
+ * @access private
*/
function viewUpdates() {
- global $wgDeferredUpdateList, $wgUseEnotif;
+ global $wgDeferredUpdateList;
if ( 0 != $this->getID() ) {
global $wgDisableCounters;
}
}
- # Update newtalk status if user is reading their own
- # talk page
-
+ # Update newtalk / watchlist notification status
global $wgUser;
- if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $this->mTitle->getText() == $wgUser->getName())
- {
- if ( $wgUseEnotif ) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
- } else {
- $wgUser->setNewtalk(0);
- $wgUser->saveNewtalk();
- }
- } elseif ( $wgUseEnotif ) {
- $wgUser->clearNotification( $this->mTitle );
- }
-
+ $wgUser->clearNotification( $this->mTitle );
}
/**
* Do standard deferred updates after page edit.
* Every 1000th edit, prune the recent changes table.
- * @private
+ * @access private
* @param string $text
*/
- function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange) {
- global $wgDeferredUpdateList, $wgDBname, $wgMemc;
- global $wgMessageCache, $wgUser, $wgUseEnotif;
-
- wfSeedRandom();
- if ( 0 == mt_rand( 0, 999 ) ) {
- # Periodically flush old entries from the recentchanges table.
- global $wgRCMaxAge;
- $dbw =& wfGetDB( DB_MASTER );
- $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
- $recentchanges = $dbw->tableName( 'recentchanges' );
- $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
- $dbw->query( $sql );
+ function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid) {
+ global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser;
+
+ $fname = 'Article::editUpdates';
+ wfProfileIn( $fname );
+
+ # Parse the text
+ $options = new ParserOptions;
+ $poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
+
+ # Save it to the parser cache
+ $parserCache =& ParserCache::singleton();
+ $parserCache->save( $poutput, $this, $wgUser );
+
+ # Update the links tables
+ $u = new LinksUpdate( $this->mTitle, $poutput );
+ $u->doUpdate();
+
+ if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
+ wfSeedRandom();
+ if ( 0 == mt_rand( 0, 999 ) ) {
+ # Periodically flush old entries from the recentchanges table.
+ global $wgRCMaxAge;
+
+ $dbw =& wfGetDB( DB_MASTER );
+ $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
+ $recentchanges = $dbw->tableName( 'recentchanges' );
+ $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
+ $dbw->query( $sql );
+ }
}
+
$id = $this->getID();
$title = $this->mTitle->getPrefixedDBkey();
$shortTitle = $this->mTitle->getDBkey();
- if ( 0 != $id ) {
- $u = new LinksUpdate( $id, $title );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SearchUpdate( $id, $title, $text );
- array_push( $wgDeferredUpdateList, $u );
-
- # If this is another user's talk page, update newtalk
-
- if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
- if ( $wgUseEnotif ) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary,
- $minoredit, $timestamp_of_pagechange);
- } else {
- $other = User::newFromName( $shortTitle );
- if( is_null( $other ) && User::isIP( $shortTitle ) ) {
- // An anonymous user
- $other = new User();
- $other->setName( $shortTitle );
- }
- if( $other ) {
- $other->setNewtalk(1);
- $other->saveNewtalk();
- }
- }
- }
+ if ( 0 == $id ) {
+ wfProfileOut( $fname );
+ return;
+ }
- if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
- $wgMessageCache->replace( $shortTitle, $text );
+ $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SearchUpdate( $id, $title, $text );
+ array_push( $wgDeferredUpdateList, $u );
+
+ # If this is another user's talk page, update newtalk
+
+ if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
+ $other = User::newFromName( $shortTitle );
+ if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+ // An anonymous user
+ $other = new User();
+ $other->setName( $shortTitle );
+ }
+ if( $other ) {
+ $other->setNewtalk( true );
}
}
+
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ $wgMessageCache->replace( $shortTitle, $text );
+ }
+
+ wfProfileOut( $fname );
}
/**
* @todo document this function
- * @private
+ * @access private
* @param string $oldid Revision ID of this article revision
*/
function setOldSubtitle( $oldid=0 ) {
}
/**
- * Loads cur_touched and returns a value indicating if it should be used
+ * Loads page_touched and returns a value indicating if it should be used
*
*/
function checkTouched() {
return !$this->mIsRedirect;
}
+ /**
+ * Get the page_touched field
+ */
+ function getTouched() {
+ # Ensure that page data has been loaded
+ if( !$this->mDataLoaded ) {
+ $dbr =& $this->getDB();
+ $data = $this->pageDataFromId( $dbr, $this->getId() );
+ if( $data ) {
+ $this->loadPageData( $data );
+ }
+ }
+ return $this->mTouched;
+ }
+
/**
* Edit an article without doing all that other stuff
* The article must already exist; link tables etc
}
}
- function onArticleDelete($title_obj) {
- $title_obj->touchLinks();
+ function onArticleDelete( $title ) {
+ global $wgMessageCache;
+
+ $title->touchLinks();
+
+ if( $title->getNamespace() == NS_MEDIAWIKI) {
+ $wgMessageCache->replace( $title->getDBkey(), false );
+ }
}
- function onArticleEdit($title_obj) {
- // This would be an appropriate place to purge caches.
- // Why's this not in here now?
+ /**
+ * Purge caches on page update etc
+ */
+ function onArticleEdit( $title ) {
+ global $wgUseSquid, $wgPostCommitUpdateList, $wgUseFileCache;
+
+ $urls = array();
+
+ // Template namespace? Purge all articles linking here.
+ // FIXME: When a templatelinks table arrives, use it for all includes.
+ if ( $title->getNamespace() == NS_TEMPLATE) {
+ $titles = $title->getLinksTo();
+ Title::touchArray( $titles );
+ if ( $wgUseSquid ) {
+ foreach ( $titles as $link ) {
+ $urls[] = $link->getInternalURL();
+ }
+ }
+ }
+
+ # Squid updates
+ if ( $wgUseSquid ) {
+ $urls = array_merge( $urls, $title->getSquidURLs() );
+ $u = new SquidUpdate( $urls );
+ array_push( $wgPostCommitUpdateList, $u );
+ }
+
+ # File cache
+ if ( $wgUseFileCache ) {
+ $cm = new CacheManager( $title );
+ @unlink( $cm->fileCacheName() );
+ }
}
/**#@-*/
* @access public
*/
function info() {
- global $wgLang, $wgOut, $wgAllowPageInfo;
+ global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser;
$fname = 'Article::info';
if ( !$wgAllowPageInfo ) {
# first, see if the page exists at all.
$exists = $page->getArticleId() != 0;
if( !$exists ) {
- $wgOut->addHTML( wfMsg('noarticletext') );
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ $wgOut->addHTML(wfMsgWeirdKey ( $this->mTitle->getText() ) );
+ } else {
+ $wgOut->addHTML(wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) );
+ }
} else {
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& wfGetDB( DB_SLAVE );
$wl_clause = array(
'wl_title' => $page->getDBkey(),
'wl_namespace' => $page->getNamespace() );
return false;
}
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& wfGetDB( DB_SLAVE );
$rev_clause = array( 'rev_page' => $id );
$fname = 'Article::pageCountInfo';
/**
* Return a list of templates used by this article.
- * Uses the links table to find the templates
+ * Uses the templatelinks table
*
- * @return array
+ * @return array Array of Title objects
*/
function getUsedTemplates() {
$result = array();
$id = $this->mTitle->getArticleID();
- $db =& wfGetDB( DB_SLAVE );
- $res = $db->select( array( 'pagelinks' ),
- array( 'pl_title' ),
- array(
- 'pl_from' => $id,
- 'pl_namespace' => NS_TEMPLATE ),
+ $dbr =& wfGetDB( DB_SLAVE );
+ $res = $dbr->select( array( 'templatelinks' ),
+ array( 'tl_namespace', 'tl_title' ),
+ array( 'tl_from' => $id ),
'Article:getUsedTemplates' );
if ( false !== $res ) {
- if ( $db->numRows( $res ) ) {
- while ( $row = $db->fetchObject( $res ) ) {
- $result[] = $row->pl_title;
+ if ( $dbr->numRows( $res ) ) {
+ while ( $row = $dbr->fetchObject( $res ) ) {
+ $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
}
}
}
- $db->freeResult( $res );
+ $dbr->freeResult( $res );
return $result;
}
-
-
}
-
?>
dépôts / lhc / web / wiklou.git / blobdiff