}
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
/**
This function accepts a title string as parameter
($preload). If this string is non-empty, it attempts
- to fetch the current revision text.
+ to fetch the current revision text. It respects
+ <includeonly>.
*/
function getPreloadedText($preload) {
if($preload) {
if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
$rev=Revision::newFromTitle($preloadTitle);
if($rev) {
- return $rev->getText();
+ $text=$rev->getText();
+ $text=preg_replace('/<\/?includeonly>/i','',$text);
+ return $text;
}
}
}
$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,
}
- /**
- * Return an array of the columns of the "cur"-table
- */
- 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' );
- }
-
/**
* Return the oldid of the article that is to be shown.
* For requests with a "direction", this is not the oldid of the
# Query variables :P
$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 ) {
* @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 ;
}
function pageDataFromTitle( &$dbr, $title ) {
function pageDataFromId( &$dbr, $id ) {
return $this->pageData( $dbr, array(
- 'page_id' => IntVal( $id ) ) );
+ 'page_id' => intval( $id ) ) );
}
/**
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;
}
* Get the database which should be used for reads
*/
function &getDB() {
+ $ret =& wfGetDB( DB_MASTER );
+ return $ret;
#if ( $this->mForUpdate ) {
$ret =& wfGetDB( DB_MASTER );
#} else {
function getTimestamp() {
$this->loadLastEdit();
- return $this->mTimestamp;
+ return wfTimestamp(TS_MW, $this->mTimestamp);
}
function getUser() {
* the given title.
*/
function view() {
- global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
- global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
- global $wgEnotif, $wgParser, $wgParserCache, $wgUseTrackbacks;
+ global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
+ global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
+ global $wgParserCache, $wgUseTrackbacks;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
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();
$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 ) {
$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 ) ) ;
# 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 (
$this->mTitle->getNamespace() == NS_USER &&
preg_match('/\\/[\\w]+\\.(css|js)$/', $this->mTitle->getDBkey())
) {
+ $wgOut->setRevisionId( $this->getRevIdFetched() );
$wgOut->addWikiText( wfMsg('clearyourcache'));
$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));
$skin = $wgUser->getSkin();
} else if ( $pcache ) {
# Display content and save to parser cache
+ $wgOut->setRevisionId( $this->getRevIdFetched() );
$wgOut->addPrimaryWikiText( $text, $this );
} else {
# Display content, don't attempt to save to parser cache
if( !$this->isCurrent() ) {
$oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
}
+ $wgOut->setRevisionId( $this->getRevIdFetched() );
$wgOut->addWikiText( $text );
if( !$this->isCurrent() ) {
if ($wgUseTrackbacks)
$this->addTrackbacks();
- # Put link titles into the link cache
- $wgOut->transformBuffer();
-
# Add link titles as META keywords
$wgOut->addMetaTags() ;
function addTrackbacks() {
global $wgOut, $wgUser;
- $dbr = wfGetDB(DB_SLAVE);
+ $dbr =& wfGetDB(DB_SLAVE);
$tbs = $dbr->select(
/* FROM */ 'trackbacks',
/* SELECT */ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
$tbtext = "";
while ($o = $dbr->fetchObject($tbs)) {
- $rmvtext = "";
+ $rmvtxt = "";
if ($wgUser->isSysop()) {
$delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
. $o->tb_id . "&token=" . $wgUser->editToken());
return;
}
- $db = wfGetDB(DB_MASTER);
+ $db =& wfGetDB(DB_MASTER);
$db->delete('trackbacks', array('tb_id' => $wgRequest->getInt('tbid')));
$wgTitle->invalidateCache();
$wgOut->addWikiText(wfMsg('trackbackdeleteok'));
$wgOut->setArticleBodyOnly(true);
$this->view();
}
+
+ function purge() {
+ global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
+
+ if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+ // 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.
'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();
# 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;
}
* @private
*/
function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
- global $wgOut, $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+ 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->mTotalAdjustment = 1;
$this->editUpdates( $text, $summary, $isminor, $now );
$oldid = 0; # new article
- $this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
+ $this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid, $revisionId );
+
+ 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,
}
}
+ 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, $wgUseFileCache;
+ global $wgOut, $wgUser, $wgDBtransactions, $wgMwRedir, $wgUseSquid;
+ global $wgPostCommitUpdateList, $wgUseFileCache;
$fname = 'Article::updateArticle';
+ wfProfileIn( $fname );
$good = true;
+ if( !wfRunHooks( 'ArticleSave', array( &$this, &$wgUser, &$text,
+ &$summary, &$minor,
+ &$watchthis, &$sectionanchor ) ) ) {
+ wfDebug( "$fname: ArticleSave hook aborted save!\n" );
+ wfProfileOut( $fname );
+ return false;
+ }
+
$isminor = ( $minor && $wgUser->isLoggedIn() );
if ( $this->isRedirect( $text ) ) {
# Remove all content but redirect
$oldsize = strlen( $oldtext );
$newsize = strlen( $text );
$lastRevision = 0;
+ $revisionId = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
$this->mGoodAdjustment = $this->isCountable( $text )
'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 );
}
}
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 );
- $urls = array();
- # 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();
- }
- }
- }
-
- # Squid updates
- if ( $wgUseSquid ) {
- $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
- $u = new SquidUpdate( $urls );
- 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 );
+ $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision, $revisionId );
}
+ wfRunHooks( 'ArticleSaveComplete',
+ array( &$this, &$wgUser, $text,
+ $summary, $minor,
+ $watchthis, $sectionanchor ) );
+ wfProfileOut( $fname );
return $good;
}
* After we've either updated or inserted the article, update
* 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;
+ function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid, $newid ) {
+ global $wgUseDumbLinkUpdate, $wgAntiLockFlags, $wgOut, $wgUser, $wgLinkCache;
global $wgUseEnotif;
+ $fname = 'Article::showArticle';
+ wfProfileIn( $fname );
+
$wgLinkCache = new LinkCache();
if ( !$wgUseDumbLinkUpdate ) {
}
}
- # Parse the text and replace links with placeholders
+ # Parse the text and save it to the parser cache
$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 );
+ $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
+ $wgOut->setRevisionId( $newid );
+ $wgOut->addPrimaryWikiText( $text, $this );
if ( !$wgUseDumbLinkUpdate ) {
# Move the current links back to the second register
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 );
}
/**
}
}
- /**
- * 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 protect( $limit = 'sysop' ) {
+ 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 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' ) );
}
# Fetch cur_text
- $rev =& Revision::newFromTitle( $this->mTitle );
+ $rev = Revision::newFromTitle( $this->mTitle );
# Fetch name(s) of contributors
$rev_name = '';
# 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 === '' ) {
if( !$blanked ) {
if( !$all_same_user ) {
- $reason = wfMsg( 'excontent', $text );
+ $reason = wfMsgForContent( 'excontent', $text );
} else {
- $reason = wfMsg( 'excontentauthor', $text, $rev_name );
+ $reason = wfMsgForContent( 'excontentauthor', $text, $rev_name );
}
} else {
- $reason = wfMsg( 'exbeforeblank', $text );
+ $reason = wfMsgForContent( 'exbeforeblank', $text );
}
}
}
$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 $wgUseTrackbacks;
+ global $wgUser, $wgUseSquid, $wgDeferredUpdateList;
+ global $wgPostCommitUpdateList, $wgUseTrackbacks;
$fname = 'Article::doDeleteArticle';
wfDebug( $fname."\n" );
* Revert a modification
*/
function rollback() {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$fname = 'Article::rollback';
if ( ! $wgUser->isAllowed('rollback') ) {
$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();
* @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 );
}
/**
* @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 );
+ global $wgDeferredUpdateList, $wgMessageCache, $wgUser;
+
+ 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 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();
- }
+ $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 );
}
}
}
}
- 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 );
$wl_clause = array(
dépôts / lhc / web / wiklou.git / blobdiff