* The actual database and text munging is still in Article,
* but it should get easier to call those from alternate
* interfaces.
- *
- * EditPage now holds references to two distinct Titles:
- * $uiTitle is the page that forms submit to, links point to,
- * redirects go to, etc. $dbTitle (as well as $mArticle) is the
- * page in the database that is actually being edited. These are
- * usually the same, but they are now allowed to be different.
*/
class EditPage {
const AS_SUCCESS_UPDATE = 200;
const AS_SPAM_ERROR = 232;
var $mArticle;
- var $dbTitle;
- var $uiTitle;
+ var $mTitle;
var $mMetaData = '';
var $isConflict = false;
var $isCssJsSubpage = false;
# extensions should take care to _append_ to the present value
public $editFormPageTop; // Before even the preview
public $editFormTextTop;
- public $editFormTextBeforeContent;
public $editFormTextAfterWarn;
public $editFormTextAfterTools;
public $editFormTextBottom;
-
- /* $didSave should be set to true whenever an article was succesfully altered. */
- public $didSave = false;
-
- public $suppressIntro = false;
/**
* @todo document
function EditPage( $article ) {
$this->mArticle =& $article;
global $wgTitle;
- $this->uiTitle =& $wgTitle;
- $this->dbTitle = $article->getTitle();
+ $this->mTitle =& $wgTitle;
# Placeholders for text injection by hooks (empty per default)
$this->editFormPageTop =
$this->editFormTextTop =
- $this->editFormTextBeforeContent =
$this->editFormTextAfterWarn =
$this->editFormTextAfterTools =
$this->editFormTextBottom = "";
wfProfileIn( __METHOD__ );
$text = '';
- if( !$this->dbTitle->exists() ) {
- if ( $this->dbTitle->getNamespace() == NS_MEDIAWIKI ) {
+ if( !$this->mTitle->exists() ) {
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
# If this is a system message, get the default text.
- $text = wfMsgWeirdKey ( $this->dbTitle->getText() ) ;
+ $text = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
} else {
# If requested, preload some text.
$text = $this->getPreloadedText( $preload );
return;
}
- $permErrors = $this->dbTitle->getUserPermissionsErrors('edit', $wgUser);
- if( !$this->dbTitle->exists() )
- $permErrors += array_diff( $this->dbTitle->getUserPermissionsErrors('create', $wgUser), $permErrors );
+ $permErrors = $this->mTitle->getUserPermissionsErrors('edit', $wgUser);
+ if( !$this->mTitle->exists() )
+ $permErrors += array_diff( $this->mTitle->getUserPermissionsErrors('create', $wgUser), $permErrors );
# Ignore some permissions errors.
$remove = array();
$this->isConflict = false;
// css / js subpages of user pages get a special treatment
- $this->isCssJsSubpage = $this->dbTitle->isCssJsSubpage();
- $this->isValidCssJsSubpage = $this->dbTitle->isValidCssJsSubpage();
+ $this->isCssJsSubpage = $wgTitle->isCssJsSubpage();
+ $this->isValidCssJsSubpage = $wgTitle->isValidCssJsSubpage();
/* Notice that we can't use isDeleted, because it returns true if article is ever deleted
* no matter it's current state
* deletes. This is done on every preview and save request. Move it further down
* to only perform it on saves
*/
- if ( $this->dbTitle->isDeleted() ) {
+ if ( $this->mTitle->isDeleted() ) {
$this->lastDelete = $this->getLastDelete();
if ( !is_null($this->lastDelete) ) {
$deletetime = $this->lastDelete->log_timestamp;
if( $this->formtype == 'initial' || $this->firsttime )
$this->showIntro();
- if( $this->dbTitle->isTalkPage() ) {
+ if( $this->mTitle->isTalkPage() ) {
$wgOut->addWikiText( wfMsg( 'talkpagetext' ) );
}
wfProfileOut( $fname );
return;
}
- if( !$this->dbTitle->getArticleId() )
- wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->dbTitle ) );
+ if( !$this->mTitle->getArticleId() )
+ wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) );
}
$this->showEditForm();
} elseif( $this->section == 'new' ) {
// Nothing *to* preview for new sections
return false;
- } elseif( ( $wgRequest->getVal( 'preload' ) !== '' || $this->dbTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) {
+ } elseif( ( $wgRequest->getVal( 'preload' ) !== '' || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) {
// Standard preference behaviour
return true;
- } elseif( !$this->dbTitle->exists() && $this->dbTitle->getNamespace() == NS_CATEGORY ) {
+ } elseif( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) {
// Categories are special
return true;
} else {
$this->watchthis = $request->getCheck( 'wpWatchthis' );
# Don't force edit summaries when a user is editing their own user or talk page
- if( ( $this->dbTitle->mNamespace == NS_USER || $this->dbTitle->mNamespace == NS_USER_TALK ) && $this->dbTitle->getText() == $wgUser->getName() ) {
+ if( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) {
$this->allowBlankSummary = true;
} else {
$this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' );
*/
private function showIntro() {
global $wgOut, $wgUser;
- if( $this->suppressIntro ) return;
- if( !$this->showCustomIntro() && !$this->dbTitle->exists() ) {
+ if( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
if( $wgUser->isLoggedIn() ) {
$wgOut->addWikiText( wfMsg( 'newarticletext' ) );
} else {
wfProfileOut( $fname );
return self::AS_SPAM_ERROR;
}
- if ( $wgFilterCallback && $wgFilterCallback( $this->dbTitle, $this->textbox1, $this->section ) ) {
+ if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section ) ) {
# Error messages or other handling should be performed by the filter function
wfProfileOut( "$fname-checks" );
wfProfileOut( $fname );
wfProfileOut( $fname );
return self::AS_HOOK_ERROR_EXPECTED;
}
- if ( $wgUser->isBlockedFrom( $this->uiTitle, false ) ) {
+ if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
# Check block state against master, thus 'false'.
wfProfileOut( "$fname-checks" );
wfProfileOut( $fname );
wfProfileOut( "$fname-checks" );
# If article is new, insert it.
- $aid = $this->dbTitle->getArticleID( GAID_FOR_UPDATE );
+ $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
if ( 0 == $aid ) {
// Late check for create permission, just in case *PARANOIA*
- if ( !$this->dbTitle->userCan( 'create' ) ) {
+ if ( !$this->mTitle->userCan( 'create' ) ) {
wfDebug( "$fname: no create permission\n" );
wfProfileOut( $fname );
return self::AS_NO_CREATE_PERMISSION;
$this->textbox1 = $this->getContent(false);
if ($this->textbox1 === false) return false;
- if ( !$this->mArticle->exists() && $this->dbTitle->getNamespace() == NS_MEDIAWIKI )
- $this->textbox1 = wfMsgWeirdKey( $this->dbTitle->getText() );
+ if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI )
+ $this->textbox1 = wfMsgWeirdKey( $this->mArticle->mTitle->getText() );
wfProxyCheck();
return true;
}
}
if ( $this->isConflict ) {
- $s = wfMsg( 'editconflict', $this->uiTitle->getPrefixedText() );
+ $s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
$wgOut->setPageTitle( $s );
$wgOut->addWikiText( wfMsg( 'explainconflict' ) );
if( $this->section != '' ) {
if( $this->section == 'new' ) {
- $s = wfMsg('editingcomment', $this->uiTitle->getPrefixedText() );
+ $s = wfMsg('editingcomment', $this->mTitle->getPrefixedText() );
} else {
- $s = wfMsg('editingsection', $this->uiTitle->getPrefixedText() );
+ $s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
$matches = array();
if( !$this->summary && !$this->preview && !$this->diff ) {
preg_match( "/^(=+)(.+)\\1/mi",
}
}
} else {
- $s = wfMsg( 'editing', $this->uiTitle->getPrefixedText() );
+ $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
}
$wgOut->setPageTitle( $s );
if( $this->isValidCssJsSubpage ) {
$wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ) );
} else {
- $wgOut->addWikiText( wfMsg( 'userinvalidcssjstitle', $this->uiTitle->getSkinFromCssJsSubpage() ) );
+ $wgOut->addWikiText( wfMsg( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) );
}
}
}
- if( $this->dbTitle->getNamespace() == NS_MEDIAWIKI ) {
+ if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
# Show a warning if editing an interface message
$wgOut->addWikiText( wfMsg( 'editinginterface' ) );
- } elseif( $this->dbTitle->isProtected( 'edit' ) ) {
+ } elseif( $this->mTitle->isProtected( 'edit' ) ) {
# Is the title semi-protected?
- if( $this->dbTitle->isSemiProtected() ) {
+ if( $this->mTitle->isSemiProtected() ) {
$notice = wfMsg( 'semiprotectedpagewarning' );
if( wfEmptyMsg( 'semiprotectedpagewarning', $notice ) || $notice == '-' )
$notice = '';
}
$wgOut->addWikiText( $notice );
}
- if ( $this->dbTitle->isCascadeProtected() ) {
+ if ( $this->mTitle->isCascadeProtected() ) {
# Is this page under cascading protection from some source pages?
- list($cascadeSources, /* $restrictions */) = $this->dbTitle->getCascadeProtectionSources();
+ list($cascadeSources, /* $restrictions */) = $this->mTitle->getCascadeProtectionSources();
if ( count($cascadeSources) > 0 ) {
# Explain, and list the titles responsible
$notice = wfMsgExt( 'cascadeprotectedwarning', array('parsemag'), count($cascadeSources) ) . "\n";
$q = 'action=submit';
#if ( "no" == $redirect ) { $q .= "&redirect=no"; }
- $action = $this->uiTitle->escapeLocalURL( $q );
+ $action = $this->mTitle->escapeLocalURL( $q );
$summary = wfMsg('summary');
$subject = wfMsg('subject');
- $cancel = $sk->makeKnownLink( $this->uiTitle->getPrefixedText(),
+ $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
wfMsgExt('cancel', array('parseinline')) );
$edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' ));
$edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
if( $wgUser->getOption( 'watchdefault' ) ) {
# Watch all edits
$this->watchthis = true;
- } elseif( $wgUser->getOption( 'watchcreations' ) && !$this->dbTitle->exists() ) {
+ } elseif( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) {
# Watch creations
$this->watchthis = true;
- } elseif( $this->dbTitle->userIsWatching() ) {
+ } elseif( $this->mTitle->userIsWatching() ) {
# Already watched
$this->watchthis = true;
}
if( $this->section == 'new' ) {
$commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<div class='editOptions'>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
$editsummary = '';
- $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->dbTitle )."</div>\n" : '';
+ $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
$summarypreview = '';
} else {
$commentsubject = '';
$editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<div class='editOptions'>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
- $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->dbTitle )."</div>\n" : '';
+ $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
$subjectpreview = '';
}
$recreate
{$commentsubject}
{$subjectpreview}
-{$this->editFormTextBeforeContent}
<textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}'
cols='{$cols}'{$ew} $hidden>
END
if ( $this->isConflict ) {
$wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
- $de = new DifferenceEngine( $this->dbTitle );
+ $de = new DifferenceEngine( $this->mTitle );
$de->setText( $this->textbox2, $this->textbox1 );
$de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
global $wgOut;
$wgOut->addHTML( '<div id="wikiPreview">' );
- if($this->dbTitle->getNamespace() == NS_CATEGORY) {
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
$this->mArticle->openShowCategory();
}
wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$text ) );
$wgOut->addHTML( $text );
- if($this->dbTitle->getNamespace() == NS_CATEGORY) {
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
$this->mArticle->closeShowCategory();
}
$wgOut->addHTML( '</div>' );
$wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
htmlspecialchars( "$wgStylePath/common/preview.js?$wgStyleVersion" ) .
'"></script>' . "\n" );
- $liveAction = $this->uiTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
+ $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
return "return !lpDoPreview(" .
"editform.wpTextbox1.value," .
'"' . $liveAction . '"' . ")";
'log_comment',
'log_params',
'user_name', ),
- array( 'log_namespace' => $this->dbTitle->getNamespace(),
- 'log_title' => $this->dbTitle->getDBkey(),
+ array( 'log_namespace' => $this->mTitle->getNamespace(),
+ 'log_title' => $this->mTitle->getDBkey(),
'log_type' => 'delete',
'log_action' => 'delete',
'user_id=log_user' ),
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
if ( $this->isCssJsSubpage ) {
- if(preg_match("/\\.css$/", $this->dbTitle->getText() ) ) {
+ if(preg_match("/\\.css$/", $wgTitle->getText() ) ) {
$previewtext = wfMsg('usercsspreview');
- } else if(preg_match("/\\.js$/", $this->dbTitle->getText() ) ) {
+ } else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) {
$previewtext = wfMsg('userjspreview');
}
$parserOptions->setTidy(true);
- $parserOutput = $wgParser->parse( $previewtext , $this->dbTitle, $parserOptions );
+ $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
$wgOut->addHTML( $parserOutput->mText );
wfProfileOut( $fname );
return $previewhead;
if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
$parserOptions->setTidy(true);
$parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
- $this->dbTitle, $parserOptions );
+ $wgTitle, $parserOptions );
$previewHTML = $parserOutput->getText();
$wgOut->addParserOutputNoText( $parserOutput );
# ParserOutput might have altered the page title, so reset it
- $wgOut->setPageTitle( wfMsg( 'editing', $this->uiTitle->getPrefixedText() ) );
+ $wgOut->setPageTitle( wfMsg( 'editing', $this->mTitle->getPrefixedText() ) );
foreach ( $parserOutput->getTemplates() as $ns => $template)
foreach ( array_keys( $template ) as $dbk)
# (This happens when a user is blocked during edit, for instance)
$first = $this->firsttime || ( !$this->save && $this->textbox1 == '' );
if( $first ) {
- $source = $this->dbTitle->exists() ? $this->getContent() : false;
+ $source = $this->mTitle->exists() ? $this->getContent() : false;
} else {
$source = $this->textbox1;
}
$cols = $wgUser->getOption( 'cols' );
$attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' );
$wgOut->addHtml( '<hr />' );
- $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->dbTitle->getPrefixedText() ) );
+ $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ) );
$wgOut->addHtml( wfOpenElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . wfCloseElement( 'textarea' ) );
}
}
$skin = $wgUser->getSkin();
$loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
- $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $this->uiTitle->getPrefixedUrl() );
+ $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $this->mTitle->getPrefixedUrl() );
$wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $this->mTitle );
}
/**
$wgOut->setArticleRelated( false );
$wgOut->addWikiText( wfMsg( 'nosuchsectiontext', $this->section ) );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $this->mTitle );
}
/**
if ( $match )
$wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "<nowiki>{$match}</nowiki>" ) );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $this->mTitle );
}
/**
// This is the revision the editor started from
$baseRevision = Revision::loadFromTimestamp(
- $db, $this->dbTitle, $this->edittime );
+ $db, $this->mArticle->mTitle, $this->edittime );
if( is_null( $baseRevision ) ) {
wfProfileOut( $fname );
return false;
// The current state, we want to merge updates into it
$currentRevision = Revision::loadFromTitle(
- $db, $this->dbTitle );
+ $db, $this->mArticle->mTitle );
if( is_null( $currentRevision ) ) {
wfProfileOut( $fname );
return false;
$oldtitle = wfMsgExt( 'currentrev', array('parseinline') );
$newtitle = wfMsgExt( 'yourtext', array('parseinline') );
if ( $oldtext !== false || $newtext != '' ) {
- $de = new DifferenceEngine( $this->dbTitle );
+ $de = new DifferenceEngine( $this->mTitle );
$de->setText( $oldtext, $newtext );
$difftext = $de->getDiff( $oldtitle, $newtitle );
$de->showDiffStyle();
* @param OutputPage $out
*/
private function showDeletionLog( $out ) {
- $title = $this->dbTitle;
+ $title = $this->mArticle->getTitle();
$reader = new LogReader(
new FauxRequest(
array(
$resultDetails = false;
$value = $this->internalAttemptSave( $resultDetails );
-
- if( $value == self::AS_SUCCESS_UPDATE || $value = self::AS_SUCCESS_NEW_ARTICLE ) {
- $this->didSave = true;
- }
-
switch ($value)
{
case self::AS_HOOK_ERROR_EXPECTED:
return;
case self::AS_BLANK_ARTICLE:
- $wgOut->redirect( $this->uiTitle->getFullURL() );
+ $wgOut->redirect( $this->mTitle->getFullURL() );
return false;
}
}
dépôts / lhc / web / wiklou.git / commitdiff