$this->mOldId = $oldId;
$this->clear();
}
+
+ /**
+ * Tell the page view functions that this view was redirected
+ * from another page on the wiki.
+ * @param Title $from
+ */
+ function setRedirectedFrom( $from ) {
+ $this->mRedirectedFrom = $from;
+ }
+
+ /**
+ * @return mixed false, Title of in-wiki target, or string with URL
+ */
+ function followRedirect() {
+ $text = $this->getContent();
+ $rt = Title::newFromRedirect( $text );
+
+ # process if title object is valid and not special:userlogout
+ if( $rt ) {
+ if( $rt->getInterwiki() != '' ) {
+ if( $rt->isLocal() ) {
+ // Offsite wikis need an HTTP redirect.
+ //
+ // This can be hard to reverse and may produce loops,
+ // so they may be disabled in the site configuration.
+
+ $source = $this->mTitle->getFullURL( 'redirect=no' );
+ return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
+ }
+ } else {
+ if( $rt->getNamespace() == NS_SPECIAL ) {
+ // Gotta hand redirects to special pages differently:
+ // Fill the HTTP response "Location" header and ignore
+ // the rest of the page we're on.
+ //
+ // This can be hard to reverse, so they may be disabled.
+
+ if( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) {
+ // rolleyes
+ } else {
+ return $rt->getFullURL();
+ }
+ }
+ return $rt;
+ }
+ }
+
+ // No or invalid redirect
+ return false;
+ }
/**
* 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->mContentLoaded = false;
$this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
- $this->mRedirectedFrom = $this->mUserText =
+ $this->mRedirectedFrom = null; # Title object if set
+ $this->mUserText =
$this->mTimestamp = $this->mComment = $this->mFileCache = '';
$this->mGoodAdjustment = $this->mTotalAdjustment = 0;
$this->mTouched = '19700101000000';
}
/**
- * Note that getContent/loadContent may follow redirects if
- * not told otherwise, and so may cause a change to mTitle.
+ * Note that getContent/loadContent do not follow redirects anymore.
+ * If you need to fetch redirectable content easily, try
+ * the shortcut in Article::followContent()
+ *
+ * @fixme There are still side-effects in this!
+ * In general, you should use the Revision class, not Article,
+ * to fetch text for purposes other than page views.
*
- * @param $noredir
* @return Return the text of this revision
*/
- function getContent( $noredir ) {
+ function getContent() {
global $wgRequest, $wgUser, $wgOut;
# Get variables from query string :P
}
wfProfileOut( $fname );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
+
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 );
+ $this->loadContent();
# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
if ( $this->mTitle->getNamespace() == NS_USER_TALK &&
$wgUser->isIP($this->mTitle->getText()) &&
}
/**
- This function accepts a title string as parameter
- ($preload). If this string is non-empty, it attempts
- to fetch the current revision text. It respects
- <includeonly>.
- */
+ * 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) {
- $preloadTitle=Title::newFromText($preload);
- if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
- $rev=Revision::newFromTitle($preloadTitle);
- if($rev) {
- $text=$rev->getText();
- $text=preg_replace('/<\/?includeonly>/i','',$text);
- return $text;
- }
+ 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 '';
}
}
- return '';
}
/**
# 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 the oldid of the article that is to be shown, 0 for the current revision
+ * @return int The oldid of the article that is to be shown, 0 for the
+ * current revision
*/
function getOldID() {
if ( is_null( $this->mOldId ) ) {
}
/**
- * Get the old ID from the request, return it.
* Sets $this->mRedirectUrl to a correct URL if the query parameters are incorrect
+ *
+ * @return int The old id for the request
*/
function getOldIDFromRequest() {
global $wgRequest;
/**
* Load the revision (including text) into this object
*/
- function loadContent( $noredir = false ) {
+ function loadContent() {
global $wgOut, $wgRequest;
if ( $this->mContentLoaded ) return;
# Query variables :P
$oldid = $this->getOldID();
- $redirect = $wgRequest->getVal( 'redirect' );
$fname = 'Article::loadContent';
$t = $this->mTitle->getPrefixedText();
- $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no')
- || $wgRequest->getCheck( 'rdfrom' );
$this->mOldId = $oldid;
- $this->fetchContent( $oldid, $noredir, true );
+ $this->fetchContent( $oldid );
}
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 ) );
}
/**
* @access private
*/
function loadPageData( $data ) {
+ $this->mTitle->mArticleID = $data->page_id;
$this->mTitle->loadRestrictions( $data->page_restrictions );
$this->mTitle->mRestrictionsLoaded = true;
/**
* Get text of an article from database
+ * Does *NOT* follow redirects.
* @param int $oldid 0 for whatever the latest revision is
- * @param bool $noredir Set to false to follow redirects
- * @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
* @return string
*/
- function fetchContent( $oldid = 0, $noredir = true, $globalTitle = false ) {
+ function fetchContent( $oldid = 0 ) {
if ( $this->mContentLoaded ) {
return $this->mContent;
}
-
+
$dbr =& $this->getDB();
$fname = 'Article::fetchContent';
if( $oldid ) {
$t .= ',oldid='.$oldid;
}
- if( isset( $redirect ) ) {
- $redirect = ($redirect == 'no') ? 'no' : 'yes';
- $t .= ',redirect='.$redirect;
- }
$this->mContent = wfMsg( 'missingarticle', $t ) ;
if( $oldid ) {
}
}
- # If we got a redirect, follow it (unless we've been told
- # not to by either the function parameter or the query
- if ( !$oldid && !$noredir ) {
- $rt = Title::newFromRedirect( $revision->getText() );
- # process if title object is valid and not special:userlogout
- if ( $rt && ! ( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) ) {
- # Gotta hand redirects to special pages differently:
- # Fill the HTTP response "Location" header and ignore
- # the rest of the page we're on.
- global $wgDisableHardRedirects;
- if( $globalTitle && !$wgDisableHardRedirects ) {
- global $wgOut;
- if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
- $source = $this->mTitle->getFullURL( 'redirect=no' );
- $wgOut->redirect( $rt->getFullURL( 'rdfrom=' . urlencode( $source ) ) ) ;
- return false;
- }
- if ( $rt->getNamespace() == NS_SPECIAL ) {
- $wgOut->redirect( $rt->getFullURL() );
- return false;
- }
- }
- 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;
- }
- }
- }
- }
- }
-
- # if the title's different from expected, update...
- if( $globalTitle ) {
- global $wgTitle;
- if( !$this->mTitle->equals( $wgTitle ) ) {
- $wgTitle = $this->mTitle;
- }
- }
-
- # Back to the business at hand...
$this->mContent = $revision->getText();
$this->mUser = $revision->getUser();
return $this->mContent;
}
- /**
- * Gets the article text without using so many damn globals
- * Returns false on error
- *
- * @param integer $oldid
- */
- 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() {
$ret =& wfGetDB( DB_MASTER );
return $ret;
- #if ( $this->mForUpdate ) {
- $ret =& wfGetDB( DB_MASTER );
- #} else {
- # $ret =& wfGetDB( DB_SLAVE );
- #}
- 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;
$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() );
wfIncrStats( 'pcache_miss_stub' );
}
+ $wasRedirected = false;
+ if ( isset( $this->mRedirectedFrom ) ) {
+ // This is an internally redirected page view.
+ // We'll need a backlink to the source page for navigation.
+ if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
+ $wasRedirected = true;
+ }
+ } elseif ( !empty( $rdfrom ) ) {
+ // This is an externally redirected view, from some other wiki.
+ // If it was reported from a trusted site, supply a backlink.
+ global $wgRedirectSources;
+ if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
+ $wasRedirected = true;
+ }
+ }
+
$outputDone = false;
if ( $pcache ) {
if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
}
}
if ( !$outputDone ) {
- $text = $this->getContent( false ); # May change mTitle by following a redirect
+ $text = $this->getContent();
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
+ # Another whitelist check in case oldid is altering the title
if ( !$this->mTitle->userCanRead() ) {
$wgOut->loginToUse();
$wgOut->output();
$this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
$wgOut->setRobotpolicy( 'noindex,follow' );
}
- $wasRedirected = false;
- if ( '' != $this->mRedirectedFrom ) {
- 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 ) ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
- $wasRedirected = true;
- }
- }
}
if( !$outputDone ) {
/**
if( !$this->isCurrent() ) {
$oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
}
- $wgOut->addWikiText( $text );
+ # Display content and don't save to parser cache
+ $wgOut->addPrimaryWikiText( $text, $this, false );
if( !$this->isCurrent() ) {
$wgOut->mParserOptions->setEditSection( $oldEditSectionSetting );
$wgOut->setArticleBodyOnly(true);
$this->view();
}
-
+
function purge() {
global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
$msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
$action = $this->mTitle->escapeLocalURL( 'action=purge' );
$button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
- $msg = str_replace( '$1',
+ $msg = str_replace( '$1',
"<form method=\"post\" action=\"$action\">\n" .
"<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
"</form>\n", $msg );
* 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
*/
* 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, $comment=false ) {
global $wgOut, $wgUser, $wgUseSquid;
wfProfileOut( $fname );
return false;
}
-
- $this->mGoodAdjustment = $this->isCountable( $text );
+
+ $this->mGoodAdjustment = (int)$this->isCountable( $text );
$this->mTotalAdjustment = 1;
$ns = $this->mTitle->getNamespace();
Article::onArticleCreate( $this->mTitle );
if(!$suppressRC) {
+ require_once( 'RecentChange.php' );
RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
'', strlen( $text ), $revisionId );
}
# 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);
}
$isminor = $minor && $wgUser->isAllowed('minoredit');
- if ( $this->isRedirect( $text ) ) {
- $redir = 1;
- } else {
- $redir = 0;
- }
+ $redir = (int)$this->isRedirect( $text );
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
$userAbort = ignore_user_abort( true );
}
- $oldtext = $this->getContent( true );
+ $oldtext = $this->getContent();
$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 );
$dbw->rollback();
} else {
# Update recentchanges and purge cache and whatnot
+ require_once( 'RecentChange.php' );
$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 );
}
$urls = array();
# Invalidate caches of all articles using this article as a template
-
+
# Template namespace
# Purge all articles linking here
$titles = $this->mTitle->getTemplateLinksTo();
$fname = 'Article::showArticle';
wfProfileIn( $fname );
-
+
# Output the redirect
if( $this->isRedirect( $text ) )
$r = 'redirect=no';
else
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
-
+
wfProfileOut( $fname );
}
global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
$wgOut->setRobotpolicy( 'noindex,follow' );
- if ( !$wgUseRCPatrol )
- {
- $wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+ # Check RC patrol config. option
+ if( !$wgUseRCPatrol ) {
+ $wgOut->errorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( $wgUser->isAnon() )
- {
+
+ # Check permissions
+ if( $wgUser->isLoggedIn() ) {
+ if( !$wgUser->isAllowed( 'patrol' ) ) {
+ $wgOut->permissionRequired( 'patrol' );
+ return;
+ }
+ } else {
$wgOut->loginToUse();
return;
}
- if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
- {
- $wgOut->sysopRequired();
- return;
- }
+
$rcid = $wgRequest->getVal( 'rcid' );
if ( !is_null ( $rcid ) )
{
if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+ require_once( 'RecentChange.php' );
RecentChange::markPatrolled( $rcid );
wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
$wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
$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.
*
$flat = Article::flattenRestrictions( $limit );
$protecting = ($flat != '');
-
+
if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
$limit, $reason ) ) ) {
}
return true;
}
-
+
/**
* Take an array of page restrictions and flatten it to a string
* suitable for insertion into the page_restrictions field.
# This code desperately needs to be totally rewritten
# Check permissions
- if( ( !$wgUser->isAllowed( 'delete' ) ) ) {
- $wgOut->sysopRequired();
+ if( $wgUser->isAllowed( 'delete' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
+ $wgOut->permissionRequired( 'delete' );
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 article 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
$text = preg_replace( "/[\n\r]/", '', $text );
if( !$blanked ) {
- if( !$all_same_user ) {
+ if( $authorOfAll === false ) {
$reason = wfMsgForContent( 'excontent', $text );
} else {
- $reason = wfMsgForContent( 'excontentauthor', $text, $rev_name );
+ $reason = wfMsgForContent( 'excontentauthor', $text, $authorOfAll );
}
} else {
$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
*/
return false;
}
- $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ), -1 );
+ $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent() ), -1 );
array_push( $wgDeferredUpdateList, $u );
$linksTo = $this->mTitle->getLinksTo();
global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$fname = 'Article::rollback';
- if ( ! $wgUser->isAllowed('rollback') ) {
- $wgOut->sysopRequired();
+ if( $wgUser->isAllowed( 'rollback' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
+ $wgOut->permissionRequired( 'rollback' );
return;
}
+
if ( wfReadOnly() ) {
- $wgOut->readOnlyPage( $this->getContent( true ) );
+ $wgOut->readOnlyPage( $this->getContent() );
return;
}
if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
/**
* Do standard deferred updates after page view
- * @private
+ * @access private
*/
function viewUpdates() {
global $wgDeferredUpdateList;
/**
* 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, $newid) {
$fname = 'Article::editUpdates';
wfProfileIn( $fname );
-
+
# Parse the text
$options = new ParserOptions;
$poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
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' );
/**
* @todo document this function
- * @private
+ * @access private
* @param string $oldid Revision ID of this article revision
*/
function setOldSubtitle( $oldid=0 ) {
function onArticleDelete( $title ) {
global $wgMessageCache;
-
+
$title->touchLinks();
-
+
if( $title->getNamespace() == NS_MEDIAWIKI) {
$wgMessageCache->replace( $title->getDBkey(), false );
}
*/
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) {
$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';
dépôts / lhc / web / wiklou.git / blobdiff