# Query variables :P
$oldid = $wgRequest->getVal( 'oldid' );
if ( isset( $oldid ) ) {
- $dbr =& $this->getDB();
$oldid = IntVal( $oldid );
if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
$nextid = $this->mTitle->getNextRevisionID( $oldid );
if ( $this->mContentLoaded ) return;
- $dbr =& $this->getDB();
# Query variables :P
$oldid = $this->getOldID();
$redirect = $wgRequest->getVal( 'redirect' );
# the rest of the page we're on.
if( $globalTitle ) {
global $wgOut;
- if ( $rt->getInterwiki() != '' ) {
+ if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
$wgOut->redirect( $rt->getFullURL() ) ;
return false;
}
* Get the database which should be used for reads
*/
function &getDB() {
- if ( $this->mForUpdate ) {
+ #if ( $this->mForUpdate ) {
return wfGetDB( DB_MASTER );
- } else {
- return wfGetDB( DB_SLAVE );
- }
+ #} else {
+ # return wfGetDB( DB_SLAVE );
+ #}
}
/**
if ( -1 != $this->mUser )
return;
+ # New or non-existent articles have no user information
+ $id = $this->getID();
+ if ( 0 == $id ) return;
+
$fname = 'Article::loadLastEdit';
$dbr =& $this->getDB();
$s = $dbr->selectRow( array( 'revision', 'page') ,
array( 'rev_user','rev_user_text','rev_timestamp', 'rev_comment','rev_minor_edit' ),
- array( 'page_id' => $this->getID(), 'page_latest=rev_id' ), $fname, $this->getSelectOptions() );
+ array( 'page_id' => $id, 'page_latest=rev_id' ), $fname, $this->getSelectOptions() );
if ( $s !== false ) {
$this->mUser = $s->rev_user;
$oldid = $this->getOldID();
$diff = $wgRequest->getVal( 'diff' );
$rcid = $wgRequest->getVal( 'rcid' );
+ $rdfrom = $wgRequest->getVal( 'rdfrom' );
$wgOut->setArticleFlag( true );
$wgOut->setRobotpolicy( 'index,follow' );
# Can't cache redirects
$pcache = false;
+ } elseif ( !empty( $rdfrom ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
}
# wrap user css and user js in pre and don't parse
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
# If we have been passed an &rcid= parameter, we want to give the user a
# chance to mark this new article as patrolled.
- if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->getID() != 0 &&
+ if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
{
$wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
$wgUser->clearNotification( $this->mTitle );
}
+ /**
+ * Insert a new empty page record for this article.
+ * This *must* be followed up by creating a revision
+ * and running $this->updateToLatest( $rev_id );
+ * or else the record will be left in a funky state.
+ * Best if all done inside a transaction.
+ *
+ * @param Database $dbw
+ * @return int The newly created page_id key
+ * @access private
+ */
+ function insertOn( &$dbw ) {
+ $fname = 'Article::insertOn';
+ wfProfileIn( $fname );
+
+ $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
+ $dbw->insert( 'page', array(
+ 'page_id' => $page_id,
+ 'page_namespace' => $this->mTitle->getNamespace(),
+ 'page_title' => $this->mTitle->getDBkey(),
+ 'page_counter' => 0,
+ 'page_restrictions' => '',
+ 'page_is_redirect' => 0, # Will set this shortly...
+ 'page_is_new' => 1,
+ 'page_random' => wfRandom(),
+ 'page_touched' => $dbw->timestamp(),
+ 'page_latest' => 0, # Fill this in shortly...
+ ), $fname );
+ $newid = $dbw->insertId();
+
+ $this->mTitle->resetArticleId( $newid );
+
+ wfProfileOut( $fname );
+ return $newid;
+ }
+
+ /**
+ * Update the page record to point to a newly saved revision.
+ *
+ * @param Database $dbw
+ * @param int $revId
+ * @param string $text -- used to set length and redirect status if given
+ * @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
+ */
+ function updateRevisionOn( &$dbw, $revId, $text = '', $lastRevision = null ) {
+ $fname = 'Article::updateToRevision';
+ wfProfileIn( $fname );
+
+ $conditions = array( 'page_id' => $this->getId() );
+ if( !is_null( $lastRevision ) ) {
+ # An extra check against threads stepping on each other
+ $conditions['page_latest'] = $lastRevision;
+ }
+ $dbw->update( 'page',
+ array( /* SET */
+ 'page_latest' => $revId,
+ 'page_touched' => $dbw->timestamp(),
+ 'page_is_new' => ($lastRevision === 0) ? 0 : 1,
+ 'page_is_redirect' => Article::isRedirect( $text ),
+ 'page_len' => strlen( $text ),
+ ),
+ $conditions,
+ $fname );
+
+ wfProfileOut( $fname );
+ return ( $dbw->affectedRows() != 0 );
+ }
+
/**
* Theoretically we could defer these whole insert and update
* functions for after display, but that's taking a big leap
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
$text = $this->preSaveTransform( $text );
- if ( $this->isRedirect( $text ) ) { $redir = 1; }
- else { $redir = 0; }
-
- $now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
- wfSeedRandom();
- $rand = wfRandom();
- $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
-
- $mungedText = $text;
- $flags = Revision::compressRevisionText( $mungedText );
+ $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
$dbw =& wfGetDB( DB_MASTER );
- $old_id = $dbw->nextSequenceValue( 'text_old_id_seq' );
- $dbw->insert( 'text', array(
- 'old_id' => $old_id,
- 'old_text' => $mungedText,
- 'old_flags' => $flags,
- ), $fname );
- $revisionId = $dbw->insertId();
+ # Add the page record; stake our claim on this title!
+ $newid = $this->insertOn( $dbw );
- $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
- $dbw->insert( 'page', array(
- 'page_id' => $page_id,
- 'page_namespace' => $ns,
- 'page_title' => $ttl,
- 'page_counter' => 0,
- 'page_restrictions' => '',
- 'page_is_redirect' => $redir,
- 'page_is_new' => 1,
- 'page_random' => $rand,
- 'page_touched' => $dbw->timestamp($now),
- 'page_latest' => $revisionId,
- ), $fname );
- $newid = $dbw->insertId();
-
- $dbw->insert( 'revision', array(
- 'rev_page' => $newid,
- 'rev_id' => $revisionId,
- 'rev_comment' => $summary,
- 'rev_user' => $wgUser->getID(),
- 'rev_timestamp' => $dbw->timestamp($now),
- 'rev_minor_edit' => $isminor,
- 'rev_user_text' => $wgUser->getName(),
- 'inverse_timestamp' => $won,
- ), $fname );
+ # Save the revision text...
+ $revision = new Revision( array(
+ 'page' => $newid,
+ 'comment' => $summary,
+ 'minor_edit' => $isminor,
+ 'text' => $text
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
$this->mTitle->resetArticleID( $newid );
+
+ # Update the page record with revision data
+ $this->updateRevisionOn( $dbw, $revisionId, $text, 0 );
Article::onArticleCreate( $this->mTitle );
RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
global $wgOut, $wgUser;
global $wgDBtransactions, $wgMwRedir;
- global $wgUseSquid, $wgInternalServer;
+ global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList;
$fname = 'Article::updateArticle';
$good = true;
- if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
- if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }
+ $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
$this->mCountAdjustment = $this->isCountable( $text )
- $this->isCountable( $oldtext );
$now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
- $mungedText = $text;
- $flags = Revision::compressRevisionText( $newtext );
-
$lastRevision = $dbw->selectField(
'page', 'page_latest', array( 'page_id' => $this->getId() ) );
- # Record the text to the text table
- $old_id = $dbw->nextSequenceValue( 'text_old_id_val' );
- $dbw->insert( 'text',
- array(
- 'old_id' => $old_id,
- 'old_text' => $mungedText,
- 'old_flags' => $flags,
- ), $fname
- );
- $revisionId = $dbw->insertId();
-
- # Record the edit in revisions
- $dbw->insert( 'revision',
- array(
- 'rev_id' => $revisionId,
- 'rev_page' => $this->getID(),
- 'rev_comment' => $summary,
- 'rev_minor_edit' => $me2,
- 'rev_user' => $wgUser->getID(),
- 'rev_user_text' => $wgUser->getName(),
- 'rev_timestamp' => $dbw->timestamp( $now ),
- 'inverse_timestamp' => $won
- ), $fname
- );
+ $revision = new Revision( array(
+ 'page' => $this->getId(),
+ 'comment' => $summary,
+ 'minor_edit' => $isminor,
+ 'text' => $text
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
# Update page
- $dbw->update( 'page',
- array( /* SET */
- 'page_latest' => $revisionId,
- 'page_touched' => $dbw->timestamp( $now ),
- 'page_is_new' => 0,
- 'page_is_redirect' => $redir,
- ), array( /* WHERE */
- 'page_id' => $this->getID(),
- 'page_latest' => $lastRevision, # Paranoia
- ), $fname
- );
+ $ok = $this->updateRevisionOn( $dbw, $revisionId, $text, $lastRevision );
- if( $dbw->affectedRows() == 0 ) {
+ if( !$ok ) {
/* Belated edit conflict! Run away!! */
$good = false;
} else {
}
if ( $good ) {
- if ($watchthis) {
- if (!$this->mTitle->userIsWatching()) $this->watch();
- } else {
- if ( $this->mTitle->userIsWatching() ) {
- $this->unwatch();
+ if ($watchthis) {
+ if (!$this->mTitle->userIsWatching()) $this->watch();
+ } else {
+ if ( $this->mTitle->userIsWatching() ) {
+ $this->unwatch();
+ }
}
- }
- # 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 );
+ # 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 ) {
- foreach ( $titles as $title ) {
- $urls[] = $title->getInternalURL();
- }
+ $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
+ $u = new SquidUpdate( $urls );
+ array_push( $wgPostCommitUpdateList, $u );
}
- }
-
- # Squid updates
- if ( $wgUseSquid ) {
- $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
- $u = new SquidUpdate( $urls );
- $u->doUpdate();
- }
-
- $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
+
+ $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
}
return $good;
}
$wgEnotif->NotifyOnPageChange( $wgUser->getID(), $this->mTitle->getDBkey(), $this->mTitle->getNamespace(),$now, $summary, $me2, $oldid );
}
- /**
- * Validate article
- * @todo document this function a bit more
- */
- function validate () {
- global $wgOut, $wgUseValidation;
- if( $wgUseValidation ) {
- require_once ( 'SpecialValidate.php' ) ;
- $wgOut->setPagetitle( wfMsg( 'validate' ) . ': ' . $this->mTitle->getPrefixedText() );
- $wgOut->setRobotpolicy( 'noindex,follow' );
- if( $this->mTitle->getNamespace() != 0 ) {
- $wgOut->addHTML( wfMsg( 'val_validate_article_namespace_only' ) );
- return;
- }
- $v = new Validation;
- $v->validate_form( $this->mTitle->getDBkey() );
- } else {
- $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
- }
- }
-
/**
* Mark this particular edit as patrolled
*/
$wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( $wgUser->getID() == 0 )
+ if ( $wgUser->isAnon() )
{
$wgOut->loginToUse();
return;
global $wgUser, $wgOut;
- if ( 0 == $wgUser->getID() ) {
+ if ( $wgUser->isAnon() ) {
$wgOut->errorpage( 'watchnologin', 'watchnologintext' );
return;
}
global $wgUser, $wgOut;
- if ( 0 == $wgUser->getID() ) {
+ if ( $wgUser->isAnon() ) {
$wgOut->errorpage( 'watchnologin', 'watchnologintext' );
return;
}
return;
}
- $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+ $confirm = $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
$moveonly = $wgRequest->getBool( 'wpMoveOnly' );
$reason = $wgRequest->getText( 'wpReasonProtect' );
* Output protection confirmation dialog
*/
function confirmProtect( $par, $reason, $limit = 'sysop' ) {
- global $wgOut;
+ global $wgOut, $wgUser;
wfDebug( "Article::confirmProtect\n" );
$wgOut->setPageTitle( wfMsg( 'confirmunprotect' ) );
$wgOut->setSubtitle( wfMsg( 'unprotectsub', $sub ) );
$wgOut->addWikiText( wfMsg( 'confirmunprotecttext' ) );
- $check = htmlspecialchars( wfMsg( 'confirmunprotect' ) );
$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' ) );
- $check = htmlspecialchars( wfMsg( 'confirmprotect' ) );
$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}\">
</tr>
<tr>
<td> </td>
- </tr>
- <tr>
- <td align='right'>
- <input type='checkbox' name='wpConfirmProtect' value='1' id='wpConfirmProtect' />
- </td>
- <td>
- <label for='wpConfirmProtect'>{$check}</label>
- </td>
- </tr> " );
+ </tr>" );
if($moveonly != '') {
$wgOut->AddHTML( "
<tr>
</td>
</tr>
</table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
$wgOut->returnToMain( false );
function delete() {
global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
$fname = 'Article::delete';
- $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
+ $confirm = $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
$reason = $wgRequest->getText( 'wpReason' );
# This code desperately needs to be totally rewritten
$dbr =& $this->getDB();
$ns = $this->mTitle->getNamespace();
$title = $this->mTitle->getDBkey();
- $old = $dbr->selectRow( 'old',
- array( 'old_text', 'old_flags' ),
+ $revisions = $dbr->select( array( 'page', 'revision' ),
+ array( 'rev_id' ),
array(
- 'old_namespace' => $ns,
- 'old_title' => $title,
- ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'inverse_timestamp' ) )
+ 'page_namespace' => $ns,
+ 'page_title' => $title,
+ 'rev_page = page_id'
+ ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
);
- if( $old !== false && !$confirm ) {
+ if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
$skin=$wgUser->getSkin();
$wgOut->addHTML('<b>'.wfMsg('historywarning'));
$wgOut->addHTML( $skin->historyLink() .'</b>');
}
# Fetch cur_text
- $s = $dbr->selectRow( 'cur',
- array( 'cur_text' ),
+ $s = $dbr->selectRow( array( 'page', 'text' ),
+ array( 'old_text' ),
array(
- 'cur_namespace' => $ns,
- 'cur_title' => $title,
+ 'page_namespace' => $ns,
+ 'page_title' => $title,
+ 'page_latest = old_id'
), $fname, $this->getSelectOptions()
);
#if this is empty, an earlier revision may contain "useful" text
$blanked = false;
- if($s->cur_text != '') {
- $text=$s->cur_text;
+ if($s->old_text != '') {
+ $text=$s->old_text;
} else {
- if($old) {
+ if($old) { # TODO
$text = Revision::getRevisionText( $old );
$blanked = true;
}
* Output deletion confirmation dialog
*/
function confirmDelete( $par, $reason ) {
- global $wgOut;
+ global $wgOut, $wgUser;
wfDebug( "Article::confirmDelete\n" );
$formaction = $this->mTitle->escapeLocalURL( 'action=delete' . $par );
$confirm = htmlspecialchars( wfMsg( 'confirm' ) );
- $check = htmlspecialchars( wfMsg( 'confirmcheck' ) );
$delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
+ $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML( "
<form id='deleteconfirm' method='post' action=\"{$formaction}\">
<tr>
<td> </td>
</tr>
- <tr>
- <td align='right'>
- <input type='checkbox' name='wpConfirm' value='1' id='wpConfirm' />
- </td>
- <td>
- <label for='wpConfirm'>{$check}</label>
- </td>
- </tr>
<tr>
<td> </td>
<td>
</td>
</tr>
</table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
$wgOut->returnToMain( false );
*/
function doDeleteArticle( $reason ) {
global $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+ global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer, $wgPostCommitUpdateList;
$fname = 'Article::doDeleteArticle';
wfDebug( $fname."\n" );
}
$u = new SquidUpdate( $urls );
- array_push( $wgDeferredUpdateList, $u );
+ array_push( $wgPostCommitUpdateList, $u );
}
Title::touchArray( $linksTo );
# Move article and history to the "archive" table
- $archiveTable = $dbw->tableName( 'archive' );
- $oldTable = $dbw->tableName( 'old' );
- $curTable = $dbw->tableName( 'cur' );
- $recentchangesTable = $dbw->tableName( 'recentchanges' );
- $linksTable = $dbw->tableName( 'links' );
- $brokenlinksTable = $dbw->tableName( 'brokenlinks' );
-
- $dbw->insertSelect( 'archive', 'cur',
- array(
- 'ar_namespace' => 'cur_namespace',
- 'ar_title' => 'cur_title',
- 'ar_text' => 'cur_text',
- 'ar_comment' => 'cur_comment',
- 'ar_user' => 'cur_user',
- 'ar_user_text' => 'cur_user_text',
- 'ar_timestamp' => 'cur_timestamp',
- 'ar_minor_edit' => 'cur_minor_edit',
- 'ar_flags' => 0,
- ), array(
- 'cur_namespace' => $ns,
- 'cur_title' => $t,
- ), $fname
- );
- $dbw->insertSelect( 'archive', 'old',
+ $dbw->insertSelect( 'archive', array( 'page','revision', 'text' ),
array(
- 'ar_namespace' => 'old_namespace',
- 'ar_title' => 'old_title',
- 'ar_text' => 'old_text',
- 'ar_comment' => 'old_comment',
- 'ar_user' => 'old_user',
- 'ar_user_text' => 'old_user_text',
- 'ar_timestamp' => 'old_timestamp',
- 'ar_minor_edit' => 'old_minor_edit',
- 'ar_flags' => 'old_flags'
+ 'ar_namespace' => 'page_namespace',
+ 'ar_title' => 'page_title',
+ 'ar_text' => 'old_text',
+ 'ar_comment' => 'rev_comment',
+ 'ar_user' => 'rev_user',
+ 'ar_user_text' => 'rev_user_text',
+ 'ar_timestamp' => 'rev_timestamp',
+ 'ar_minor_edit' => 'rev_minor_edit',
+ 'ar_flags' => 'old_flags',
+ 'ar_rev_id' => 'rev_id',
), array(
- 'old_namespace' => $ns,
- 'old_title' => $t,
+ 'page_namespace' => $ns,
+ 'page_title' => $t,
+ 'page_id = rev_page AND old_id = rev_id'
), $fname
);
# Now that it's safely backed up, delete it
- $dbw->delete( 'cur', array( 'cur_namespace' => $ns, 'cur_title' => $t ), $fname );
- $dbw->delete( 'old', array( 'old_namespace' => $ns, 'old_title' => $t ), $fname );
+ $dbw->deleteJoin( 'text', 'revision', 'old_id', 'rev_id', array( "rev_page = {$id}" ), $fname );
+ $dbw->delete( 'revision', array( 'rev_page' => $id ), $fname );
+ $dbw->delete( 'page', array( 'page_id' => $id ), $fname);
+
$dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname );
# Finally, clean up the link tables
$wgOut->readOnlyPage( $this->getContent( true ) );
return;
}
+ if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
+ array( $this->mTitle->getPrefixedText(),
+ $wgRequest->getVal( 'from' ) ) ) ) {
+ $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
+ $wgOut->addWikiText( wfMsg( 'sessionfailure' ) );
+ return;
+ }
$dbw =& wfGetDB( DB_MASTER );
# Enhanced rollback, marks edits rc_bot=1
$n = $this->mTitle->getNamespace();
# Get the last editor, lock table exclusively
- $s = $dbw->selectRow( 'cur',
- array( 'cur_id','cur_user','cur_user_text','cur_comment' ),
- array( 'cur_title' => $tt, 'cur_namespace' => $n ),
- $fname, 'FOR UPDATE'
- );
- if( $s === false ) {
- # Something wrong
+ $dbw->begin();
+ $current = Revision::newFromTitle( $this->mTitle );
+ if( is_null( $current ) ) {
+ # Something wrong... no page?
+ $dbw->rollback();
$wgOut->addHTML( wfMsg( 'notanarticle' ) );
return;
}
- $ut = $dbw->strencode( $s->cur_user_text );
- $uid = $s->cur_user;
- $pid = $s->cur_id;
$from = str_replace( '_', ' ', $wgRequest->getVal( 'from' ) );
- if( $from != $s->cur_user_text ) {
+ if( $from != $current->getUserText() ) {
$wgOut->setPageTitle(wfmsg('rollbackfailed'));
$wgOut->addWikiText( wfMsg( 'alreadyrolled',
htmlspecialchars( $this->mTitle->getPrefixedText()),
htmlspecialchars( $from ),
- htmlspecialchars( $s->cur_user_text ) ) );
- if($s->cur_comment != '') {
+ htmlspecialchars( $current->getUserText() ) ) );
+ if( $current->getComment() != '') {
$wgOut->addHTML(
- wfMsg('editcomment',
- htmlspecialchars( $s->cur_comment ) ) );
+ wfMsg( 'editcomment',
+ htmlspecialchars( $current->getComment() ) ) );
}
return;
}
# Get the last edit not by this guy
- $s = $dbw->selectRow( 'old',
- array( 'old_text','old_user','old_user_text','old_timestamp','old_flags' ),
+ $user = IntVal( $current->getUser() );
+ $user_text = $dbw->addQuotes( $current->getUserText() );
+ $s = $dbw->selectRow( 'revision',
+ array( 'rev_id', 'rev_timestamp' ),
array(
- 'old_namespace' => $n,
- 'old_title' => $tt,
- "old_user <> {$uid} OR old_user_text <> '{$ut}'"
- ), $fname, array( 'FOR UPDATE', 'USE INDEX' => 'name_title_timestamp' )
- );
+ 'rev_page' => $current->getPage(),
+ "rev_user <> {$user} OR rev_user_text <> {$user_text}"
+ ), $fname,
+ array(
+ 'USE INDEX' => 'page_timestamp',
+ 'ORDER BY' => 'rev_timestamp DESC' )
+ );
if( $s === false ) {
# Something wrong
+ $dbw->rollback();
$wgOut->setPageTitle(wfMsg('rollbackfailed'));
$wgOut->addHTML( wfMsg( 'cantrollback' ) );
return;
}
-
+
if ( $bot ) {
# Mark all reverted edits as bot
$dbw->update( 'recentchanges',
array( /* SET */
'rc_bot' => 1
), array( /* WHERE */
- 'rc_user' => $uid,
- "rc_timestamp > '{$s->old_timestamp}'",
+ 'rc_cur_id' => $current->getPage(),
+ 'rc_user_text' => $current->getUserText(),
+ "rc_timestamp > '{$s->rev_timestamp}'",
), $fname
);
}
# Save it!
- $newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
+ $target = Revision::newFromId( $s->rev_id );
+ $newcomment = wfMsg( 'revertpage', $target->getUserText(), $from );
+
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
- $this->updateArticle( Revision::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
+
+ $this->updateArticle( $target->getText(), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
Article::onArticleEdit( $this->mTitle );
+
+ $dbw->commit();
$wgOut->returnToMain( false );
}
global $wgRCMaxAge;
$dbw =& wfGetDB( DB_MASTER );
$cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
- $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
+ $recentchanges = $dbw->tableName( 'recentchanges' );
+ $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
$dbw->query( $sql );
}
$id = $this->getID();
return $wgUseFileCache
and (!$wgShowIPinHeader)
and ($this->getID() != 0)
- and ($wgUser->getId() == 0)
+ and ($wgUser->isAnon())
and (!$wgUser->getNewtalk())
and ($this->mTitle->getNamespace() != NS_SPECIAL )
and (empty( $action ) || $action == 'view')
/**
* Edit an article without doing all that other stuff
+ * The article must already exist; link tables etc
+ * are not updated, caches are not flushed.
*
* @param string $text text submitted
* @param string $comment comment submitted
- * @param integer $minor whereas it's a minor modification
+ * @param bool $minor whereas it's a minor modification
*/
function quickEdit( $text, $comment = '', $minor = 0 ) {
- global $wgUser;
$fname = 'Article::quickEdit';
-
- #wfDebugDieBacktrace( "$fname called." );
-
wfProfileIn( $fname );
$dbw =& wfGetDB( DB_MASTER );
- $ns = $this->mTitle->getNamespace();
- $dbkey = $this->mTitle->getDBkey();
- $encDbKey = $dbw->strencode( $dbkey );
- $timestamp = wfTimestampNow();
- # insert new text
- $dbw->insert( 'text', array(
- 'old_text' => $text,
- 'old_flags' => "" ), $fname );
- $text_id = $dbw->insertID();
-
- # update page
- $dbw->update( 'page', array(
- 'page_is_new' => 0,
- 'page_touched' => $timestamp,
- 'page_is_redirect' => $this->isRedirect( $text ) ? 1 : 0,
- 'page_latest' => $text_id ),
- array( 'page_namespace' => $ns, 'page_title' => $dbkey ), $fname );
- # Retrieve page ID
- $page_id = $dbw->selectField( 'page', 'page_id', array( 'page_namespace' => $ns, 'page_title' => $dbkey ), $fname );
-
- # update revision
- $dbw->insert( 'revision', array(
- 'rev_id' => $text_id,
- 'rev_page' => $page_id,
- 'rev_comment' => $comment,
- 'rev_user' => $wgUser->getID(),
- 'rev_user_text' => $wgUser->getName(),
- 'rev_timestamp' => $timestamp,
- 'inverse_timestamp' => wfInvertTimestamp( $timestamp ),
- 'rev_minor_edit' => intval($minor) ),
- $fname );
-/*
- # Save to history
- $dbw->insertSelect( 'old', 'cur',
- array(
- 'old_namespace' => 'cur_namespace',
- 'old_title' => 'cur_title',
- 'old_text' => 'cur_text',
- 'old_comment' => 'cur_comment',
- 'old_user' => 'cur_user',
- 'old_user_text' => 'cur_user_text',
- 'old_timestamp' => 'cur_timestamp',
- 'inverse_timestamp' => '99999999999999-cur_timestamp',
- ), array(
- 'cur_namespace' => $ns,
- 'cur_title' => $dbkey,
- ), $fname
- );
-
- # Use the affected row count to determine if the article is new
- $numRows = $dbw->affectedRows();
-
- # Make an array of fields to be inserted
- $fields = array(
- 'cur_text' => $text,
- 'cur_timestamp' => $timestamp,
- 'cur_user' => $wgUser->getID(),
- 'cur_user_text' => $wgUser->getName(),
- 'inverse_timestamp' => wfInvertTimestamp( $timestamp ),
- 'cur_comment' => $comment,
- 'cur_is_redirect' => $this->isRedirect( $text ) ? 1 : 0,
- 'cur_minor_edit' => intval($minor),
- 'cur_touched' => $dbw->timestamp($timestamp),
- );
-
- if ( $numRows ) {
- # Update article
- $fields['cur_is_new'] = 0;
- $dbw->update( 'cur', $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
- } else {
- # Insert new article
- $fields['cur_is_new'] = 1;
- $fields['cur_namespace'] = $ns;
- $fields['cur_title'] = $dbkey;
- $fields['cur_random'] = $rand = wfRandom();
- $dbw->insert( 'cur', $fields, $fname );
- }
-*/
+ $dbw->begin();
+ $revision = new Revision( array(
+ 'page' => $this->getId(),
+ 'text' => $text,
+ 'comment' => $comment,
+ 'minor_edit' => $minor ? 1 : 0,
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
+ $this->updateRevisionOn( $dbw, $revisionId, $text );
+ $dbw->commit();
+
wfProfileOut( $fname );
}
*/
function onArticleCreate($title_obj) {
- global $wgUseSquid, $wgDeferredUpdateList;
+ global $wgUseSquid, $wgPostCommitUpdateList;
$titles = $title_obj->getBrokenLinksTo();
$urls[] = $linkTitle->getInternalURL();
}
$u = new SquidUpdate( $urls );
- array_push( $wgDeferredUpdateList, $u );
+ array_push( $wgPostCommitUpdateList, $u );
}
# Clear persistent link cache
/**
* Info about this page
+ * Called for ?action=info when $wgAllowPageInfo is on.
+ *
+ * @access public
*/
function info() {
- global $wgUser, $wgTitle, $wgOut, $wgAllowPageInfo;
+ global $wgLang, $wgOut, $wgAllowPageInfo;
$fname = 'Article::info';
if ( !$wgAllowPageInfo ) {
return;
}
- $dbr =& $this->getDB();
-
- $basenamespace = $wgTitle->getNamespace() & (~1);
- $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace );
- $old_clause = array( 'old_title' => $wgTitle->getDBkey(), 'old_namespace' => $basenamespace );
- $wl_clause = array( 'wl_title' => $wgTitle->getDBkey(), 'wl_namespace' => $basenamespace );
- $fullTitle = $wgTitle->makeName($basenamespace, $wgTitle->getDBKey());
- $wgOut->setPagetitle( $fullTitle );
+ $page = $this->mTitle->getSubjectPage();
+
+ $wgOut->setPagetitle( $page->getPrefixedText() );
$wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
# first, see if the page exists at all.
- $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
- if ($exists < 1) {
+ $exists = $page->getArticleId() != 0;
+ if( !$exists ) {
$wgOut->addHTML( wfMsg('noarticletext') );
} else {
- $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname,
+ $dbr =& $this->getDB( DB_SLAVE );
+ $wl_clause = array(
+ 'wl_title' => $page->getDBkey(),
+ 'wl_namespace' => $page->getNamespace() );
+ $numwatchers = $dbr->selectField(
+ 'watchlist',
+ 'COUNT(*)',
+ $wl_clause,
+ $fname,
$this->getSelectOptions() );
- $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $numwatchers) . '</li>' );
- $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
- $wgOut->addHTML( "<li>" . wfMsg('numedits', $old + 1) . '</li>');
- # to find number of distinct authors, we need to do some
- # funny stuff because of the cur/old table split:
- # - first, find the name of the 'cur' author
- # - then, find the number of *other* authors in 'old'
-
- # find 'cur' author
- $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
- $this->getSelectOptions() );
-
- # find number of 'old' authors excluding 'cur' author
- $authors = $dbr->selectField( 'old', 'COUNT(DISTINCT old_user_text)',
- $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ), $fname,
- $this->getSelectOptions() ) + 1;
-
- # now for the Talk page ...
- $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace+1 );
- $old_clause = array( 'old_title' => $wgTitle->getDBkey(), 'old_namespace' => $basenamespace+1 );
-
- # does it exist?
- $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
-
- # number of edits
- if ($exists > 0) {
- $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
- $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $old + 1) . '</li>');
+ $pageInfo = $this->pageCountInfo( $page );
+ $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
+
+ $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
+ $wgOut->addHTML( "<li>" . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>');
+ if( $talkInfo ) {
+ $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>');
}
- $wgOut->addHTML( '<li>' . wfMsg("numauthors", $authors) . '</li>' );
-
- # number of authors
- if ($exists > 0) {
- $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
- $this->getSelectOptions() );
- $authors = $dbr->selectField( 'cur', 'COUNT(DISTINCT old_user_text)',
- $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ),
- $fname, $this->getSelectOptions() );
-
- $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $authors) . '</li></ul>' );
+ $wgOut->addHTML( '<li>' . wfMsg("numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
+ if( $talkInfo ) {
+ $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
}
+ $wgOut->addHTML( '</ul>' );
+
}
}
-}
-
-/**
- * Check whether an article is a stub
- *
- * @public
- * @param integer $articleID ID of the article that is to be checked
- */
-function wfArticleIsStub( $articleID ) {
- global $wgUser;
- $fname = 'wfArticleIsStub';
-
- $threshold = $wgUser->getOption('stubthreshold') ;
- if ( $threshold > 0 ) {
- $dbr =& wfGetDB( DB_SLAVE );
- $s = $dbr->selectRow( array('page', 'text'),
- array( 'LENGTH(old_text) AS len', 'page_namespace', 'page_is_redirect' ),
- array( 'page_id' => $articleID, "page.page_latest=text.old_id" ),
- $fname ) ;
- if ( $s == false OR $s->page_is_redirect OR $s->page_namespace != NS_MAIN ) {
+
+ /**
+ * Return the total number of edits and number of unique editors
+ * on a given page. If page does not exist, returns false.
+ *
+ * @param Title $title
+ * @return array
+ * @access private
+ */
+ function pageCountInfo( $title ) {
+ $id = $title->getArticleId();
+ if( $id == 0 ) {
return false;
}
- $size = $s->len;
- return ( $size < $threshold );
+
+ $dbr =& $this->getDB( DB_SLAVE );
+
+ $rev_clause = array( 'rev_page' => $id );
+ $fname = 'Article::pageCountInfo';
+
+ $edits = $dbr->selectField(
+ 'revision',
+ 'COUNT(rev_page)',
+ $rev_clause,
+ $fname,
+ $this->getSelectOptions() );
+
+ $authors = $dbr->selectField(
+ 'revision',
+ 'COUNT(DISTINCT rev_user_text)',
+ $rev_clause,
+ $fname,
+ $this->getSelectOptions() );
+
+ return array( 'edits' => $edits, 'authors' => $authors );
}
- return false;
}
+
?>
dépôts / lhc / web / wiklou.git / blobdiff