var $mId, $mTable;
var $mForUpdate;
var $mOldId;
+ var $mRevIdFetched;
/**#@-*/
/**
* @private
*/
function clear() {
+ $this->mDataLoaded = false;
$this->mContentLoaded = false;
+
$this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
$this->mRedirectedFrom = $this->mUserText =
$this->mTimestamp = $this->mComment = $this->mFileCache = '';
$this->mCountAdjustment = 0;
$this->mTouched = '19700101000000';
$this->mForUpdate = false;
+ $this->mIsRedirect = false;
+ $this->mRevIdFetched = 0;
}
/**
$t = $this->mTitle->getPrefixedText();
- $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no');
+ $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no')
+ || $wgRequest->getCheck( 'rdfrom' );
$this->mOldId = $oldid;
$this->fetchContent( $oldid, $noredir, true );
}
+
+ /**
+ * Fetch a page record with the given conditions
+ * @param Database $dbr
+ * @param array $conditions
+ * @access private
+ */
+ function pageData( &$dbr, $conditions ) {
+ return $dbr->selectRow( 'page',
+ array(
+ 'page_id',
+ 'page_namespace',
+ 'page_title',
+ 'page_restrictions',
+ 'page_counter',
+ 'page_is_redirect',
+ 'page_is_new',
+ 'page_random',
+ 'page_touched',
+ 'page_latest',
+ 'page_len' ),
+ $conditions,
+ 'Article::pageData' );
+ }
+
+ function pageDataFromTitle( &$dbr, $title ) {
+ return $this->pageData( $dbr, array(
+ 'page_namespace' => $title->getNamespace(),
+ 'page_title' => $title->getDBkey() ) );
+ }
+
+ function pageDataFromId( &$dbr, $id ) {
+ return $this->pageData( $dbr, array(
+ 'page_id' => IntVal( $id ) ) );
+ }
+
+ /**
+ * Set the general counter, title etc data loaded from
+ * some source.
+ *
+ * @param object $data
+ * @access private
+ */
+ function loadPageData( $data ) {
+ $this->mTitle->mRestrictions = explode( ',', trim( $data->page_restrictions ) );
+ $this->mTitle->mRestrictionsLoaded = true;
+
+ $this->mCounter = $data->page_counter;
+ $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
+ $this->mIsRedirect = $data->page_is_redirect;
+ $this->mLatest = $data->page_latest;
+
+ $this->mDataLoaded = true;
+ }
+
/**
* Get text of an article from database
* @param int $oldid 0 for whatever the latest revision is
}
$this->mContent = wfMsg( 'missingarticle', $t );
- if( !$oldid ) {
- # Retrieve current version
- $id = $this->getID();
- if ( 0 == $id ) {
+ if( $oldid ) {
+ $revision = Revision::newFromId( $oldid );
+ if( is_null( $revision ) ) {
+ wfDebug( "$fname failed to retrieve specified revision, id $oldid\n" );
return false;
}
-
- $s = $dbr->selectRow( array( 'text', 'revision', 'page' ),
- $this->getContentFields(),
- "page_id='$id' AND rev_page=page_id AND rev_id=page_latest AND old_id=rev_id",
- $fname, $this->getSelectOptions() );
+ $data = $this->pageDataFromId( $dbr, $revision->getPage() );
+ if( !$data ) {
+ wfDebug( "$fname failed to get page data linked to revision id $oldid\n" );
+ return false;
+ }
+ $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title );
+ $this->loadPageData( $data );
} else {
- # Historical revision
- $s = $dbr->selectRow( array( 'text', 'revision', 'page' ),
- $this->getContentFields(),
- "rev_page=page_id AND rev_id='$oldid' AND old_id=rev_id",
- $fname, $this->getSelectOptions() );
- }
- if ( $s === false ) {
- return false;
+ if( !$this->mDataLoaded ) {
+ $data = $this->pageDataFromTitle( $dbr, $this->mTitle );
+ if( !$data ) {
+ wfDebug( "$fname failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
+ return false;
+ }
+ $this->loadPageData( $data );
+ }
+ $revision = Revision::newFromId( $this->mLatest );
+ if( is_null( $revision ) ) {
+ wfDebug( "$fname failed to retrieve current page, rev_id $data->page_latest\n" );
+ return false;
+ }
}
# 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::getRevisionText( $s ) );
+ $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:
if( $globalTitle ) {
global $wgOut;
if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
- $wgOut->redirect( $rt->getFullURL() ) ;
+ $source = $this->mTitle->getFullURL( 'redirect=no' );
+ $wgOut->redirect( $rt->getFullURL( 'rdfrom=' . urlencode( $source ) ) ) ;
return false;
}
if ( $rt->getNamespace() == NS_SPECIAL ) {
return false;
}
}
- $rid = $rt->getArticleID();
- if ( 0 != $rid ) {
- $redirRow = $dbr->selectRow( array( 'text', 'revision', 'page' ),
- $this->getContentFields(),
- "page_id='$rid' AND rev_page=page_id AND rev_id=page_latest AND old_id=rev_id",
- $fname, $this->getSelectOptions() );
-
- if ( $redirRow !== 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;
- $s = $redirRow;
+ $data = $redirData;
+ $this->loadPageData( $data );
+ $revision = $redirRev;
}
}
}
}
# if the title's different from expected, update...
- if( $globalTitle &&
- ( $this->mTitle->getNamespace() != $s->page_namespace ||
- $this->mTitle->getDBkey() != $s->page_title ) ) {
- $oldTitle = Title::makeTitle( $s->page_namesapce, $s->page_title );
- $this->mTitle = $oldTitle;
+ if( $globalTitle ) {
global $wgTitle;
- $wgTitle = $oldTitle;
+ if( !$this->mTitle->equals( $wgTitle ) ) {
+ $wgTitle = $this->mTitle;
+ }
}
# Back to the business at hand...
- $this->mCounter = $s->page_counter;
- $this->mTitle->mRestrictions = explode( ',', trim( $s->page_restrictions ) );
- $this->mTitle->mRestrictionsLoaded = true;
- $this->mTouched = wfTimestamp( TS_MW, $s->page_touched );
-
- $this->mContent = Revision::getRevisionText( $s );
+ $this->mContent = $revision->getText();
- $this->mUser = $s->rev_user;
- $this->mUserText = $s->rev_user_text;
- $this->mComment = $s->rev_comment;
- $this->mTimestamp = wfTimestamp( TS_MW, $s->rev_timestamp );
+ $this->mUser = $revision->getUser();
+ $this->mUserText = $revision->getUserText();
+ $this->mComment = $revision->getComment();
+ $this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
+ $this->mRevIdFetched = $revision->getID();
$this->mContentLoaded = true;
+
return $this->mContent;
}
function isRedirect( $text = false ) {
if ( $text === false ) {
$this->loadContent();
- $titleObj = Title::newFromRedirect( $this->mText );
+ $titleObj = Title::newFromRedirect( $this->fetchRevisionText() );
} else {
$titleObj = Title::newFromRedirect( $text );
}
*/
function loadLastEdit() {
global $wgOut;
-
+
if ( -1 != $this->mUser )
return;
$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' => $id, 'page_latest=rev_id' ), $fname, $this->getSelectOptions() );
-
- if ( $s !== false ) {
- $this->mUser = $s->rev_user;
- $this->mUserText = $s->rev_user_text;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->rev_timestamp);
- $this->mComment = $s->rev_comment;
- $this->mMinorEdit = $s->rev_minor_edit;
+ $this->mLastRevision = Revision::loadFromPageId( $this->getDB(), $id );
+ if( !is_null( $this->mLastRevision ) ) {
+ $this->mUser = $this->mLastRevision->getUser();
+ $this->mUserText = $this->mLastRevision->getUserText();
+ $this->mTimestamp = $this->mLastRevision->getTimestamp();
+ $this->mComment = $this->mLastRevision->getComment();
+ $this->mMinorEdit = $this->mLastRevision->isMinor();
}
}
$this->loadLastEdit();
return $this->mMinorEdit;
}
+
+ function getRevIdFetched() {
+ $this->loadLastEdit();
+ return $this->mRevIdFetched;
+ }
function getContributors($limit = 0, $offset = 0) {
$fname = 'Article::getContributors';
function view() {
global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
- global $wgEnotif;
+ global $wgEnotif, $wgParser;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
if ( !is_null( $diff ) ) {
require_once( 'DifferenceEngine.php' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+
$de = new DifferenceEngine( $oldid, $diff, $rcid );
+ // DifferenceEngine directly fetched the revision:
+ $this->mRevIdFetched = $de->mNewid;
$de->showDiffPage();
+
if( $diff == 0 ) {
# Run view updates for current revision only
$this->viewUpdates();
# Can't cache redirects
$pcache = false;
} elseif ( !empty( $rdfrom ) ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
+ global $wgRedirectSources;
+ if( $wgRedirectSources && preg_match( $wgRedirectSources, $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->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
'<span class="redirectText">'.$link.'</span>' );
-
+
+ $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
+ $catlinks = $parseout->getCategoryLinks();
+ $wgOut->addCategoryLinks($catlinks);
+ $skin = $wgUser->getSkin();
} else if ( $pcache ) {
# Display content and save to parser cache
$wgOut->addPrimaryWikiText( $text, $this );
$wgOut->addWikiText( $text );
}
}
- $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ /* title may have been set from the cache */
+ $t = $wgOut->getPageTitle();
+ if( empty( $t ) ) {
+ $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->isLoggedIn() &&
$this->viewUpdates();
wfProfileOut( $fname );
-
- $wgUser->clearNotification( $this->mTitle );
}
/**
* Best if all done inside a transaction.
*
* @param Database $dbw
- * @return int The newly created page_id key
+ * @param string $restrictions
+ * @return int The newly created page_id key
* @access private
*/
- function insertOn( &$dbw ) {
+ function insertOn( &$dbw, $restrictions = '' ) {
$fname = 'Article::insertOn';
wfProfileIn( $fname );
'page_namespace' => $this->mTitle->getNamespace(),
'page_title' => $this->mTitle->getDBkey(),
'page_counter' => 0,
- 'page_restrictions' => '',
+ 'page_restrictions' => $restrictions,
'page_is_redirect' => 0, # Will set this shortly...
'page_is_new' => 1,
'page_random' => wfRandom(),
* errors at some point.
* @private
*/
- function insertNewArticle( $text, $summary, $isminor, $watchthis ) {
+ function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false ) {
global $wgOut, $wgUser;
global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
$ttl = $this->mTitle->getDBkey();
$text = $this->preSaveTransform( $text );
$isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+ $now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
$this->updateRevisionOn( $dbw, $revision, 0 );
Article::onArticleCreate( $this->mTitle );
- RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+ if(!$suppressRC) {
+ RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+ }
if ($watchthis) {
if(!$this->mTitle->userIsWatching()) $this->watch();
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
+ $now = wfTimestampNow();
# Update article, but only if changed.
# It's important that we either rollback or complete, otherwise an attacker could
# overwrite cur entries by sending precisely timed user aborts. Random bored users
# could conceivably have the same effect, especially if cur is locked for long periods.
- if( $wgDBtransactions ) {
- $dbw->query( 'BEGIN', $fname );
- } else {
+ if( !$wgDBtransactions ) {
$userAbort = ignore_user_abort( true );
}
$oldtext = $this->getContent( true );
+ $lastRevision = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
$this->mCountAdjustment = $this->isCountable( $text )
} else {
# Update recentchanges and purge cache and whatnot
$bot = (int)($wgUser->isBot() || $forceBot);
- RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
+ RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
$lastRevision, $this->getTimestamp(), $bot );
Article::onArticleEdit( $this->mTitle );
}
}
- if( $wgDBtransactions ) {
- $dbw->query( 'COMMIT', $fname );
- } else {
+ if( !$wgDBtransactions ) {
ignore_user_abort( $userAbort );
}
array_push( $wgPostCommitUpdateList, $u );
}
- $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
+ $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision );
}
return $good;
}
}
}
+ /**
+ * 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
+ $t = $v->validatePageForm ( $this , $revision ) ;
+
+ $wgOut->addHTML ( $t ) ;
+ }
/**
* Add this page to $wgUser's watchlist
<td align='left'>
<input type='text' size='60' name='wpReasonProtect' id='wpReasonProtect' value=\"" . htmlspecialchars( $reason ) . "\" />
</td>
- </tr>
- <tr>
- <td> </td>
</tr>" );
if($moveonly != '') {
$wgOut->AddHTML( "
<td align='right'>
<input type='checkbox' name='wpMoveOnly' value='1' id='wpMoveOnly' />
</td>
- <td>
+ <td align='left'>
<label for='wpMoveOnly'>{$moveonly}</label>
</td>
</tr> " );
</tr>
</table>
<input type='hidden' name='wpEditToken' value=\"{$token}\" />
-</form>\n" );
+</form>" );
$wgOut->returnToMain( false );
}
<input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" />
</td>
</tr>
- <tr>
- <td> </td>
- </tr>
<tr>
<td> </td>
<td>
$this->mTitle->getText() == $wgUser->getName()) {
require_once( 'UserTalkUpdate.php' );
$u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
+ } else {
+ $wgUser->clearNotification( $this->mTitle );
}
+
}
/**
*/
function checkTouched() {
$fname = 'Article::checkTouched';
- $id = $this->getID();
- $dbr =& $this->getDB();
- $s = $dbr->selectRow( 'page', array( 'page_touched', 'page_is_redirect' ),
- array( 'page_id' => $id ), $fname, $this->getSelectOptions() );
- if( $s !== false ) {
- $this->mTouched = wfTimestamp( TS_MW, $s->page_touched );
- return !$s->page_is_redirect;
- } else {
- return false;
+ if( !$this->mDataLoaded ) {
+ $dbr =& $this->getDB();
+ $data = $this->pageDataFromId( $dbr, $this->getId() );
+ if( $data ) {
+ $this->loadPageData( $data );
+ }
}
+ return !$this->mIsRedirect;
}
/**
return array( 'edits' => $edits, 'authors' => $authors );
}
+
+ /**
+ * Return a list of templates used by this article.
+ * Uses the links table to find the templates
+ *
+ * @return array
+ */
+ function getUsedTemplates() {
+ $result = array();
+ $id = $this->mTitle->getArticleID();
+
+ $db =& wfGetDB( DB_SLAVE );
+ $page = $db->tableName( 'page' );
+ $links = $db->tableName( 'links' );
+ $sql = "SELECT page_title ".
+ "FROM $page,$links WHERE l_to=page_id AND l_from={$id} and page_namespace=".NS_TEMPLATE;
+ $res = $db->query( $sql, "Article:getUsedTemplates" );
+ if ( false !== $res ) {
+ if ( $db->numRows( $res ) ) {
+ while ( $row = $db->fetchObject( $res ) ) {
+ $result[] = $row->page_title;
+ }
+ }
+ }
+ $db->freeResult( $res );
+ return $result;
+ }
+
+
}
dépôts / lhc / web / wiklou.git / blobdiff