var $mArticle;
var $mTitle;
var $mMetaData = '';
-
+ var $isConflict = false;
+ var $isCssJsSubpage = false;
+ var $deletedSinceEdit = false;
+ var $formtype;
+ var $firsttime;
+ var $lastDelete;
+ var $mTokenOk = true;
+
# Form values
var $save = false, $preview = false, $diff = false;
- var $minoredit = false, $watchthis = false;
+ var $minoredit = false, $watchthis = false, $recreate = false;
var $textbox1 = '', $textbox2 = '', $summary = '';
- var $edittime = '', $section = '';
- var $oldid = 0;
-
+ var $edittime = '', $section = '', $starttime = '';
+ var $oldid = 0, $editintro = '', $scrolltop = null;
+
/**
* @todo document
* @param $article
{
$sat[] = strtolower ( $x ) ;
}
-
+
}
# Templates, but only some
$this->mMetaData = $s ;
}
+ function submit() {
+ $this->edit();
+ }
+
/**
- * This is the function that gets called for "action=edit".
+ * This is the function that gets called for "action=edit". It
+ * sets up various member variables, then passes execution to
+ * another function, usually showEditForm()
+ *
+ * The edit form is self-submitting, so that when things like
+ * preview and edit conflicts occur, we get the same form back
+ * with the extra stuff added. Only when the final submission
+ * is made and all is well do we actually save and redirect to
+ * the newly-edited page.
*/
function edit() {
- global $wgOut, $wgUser, $wgRequest;
+ global $wgOut, $wgUser, $wgRequest, $wgTitle;
+
+ if ( ! wfRunHooks( 'AlternateEdit', array( &$this ) ) )
+ return;
+
+ $fname = 'EditPage::edit';
+ wfProfileIn( $fname );
+ wfDebug( "$fname: enter\n" );
+
// this is not an article
$wgOut->setArticleFlag(false);
$this->importFormData( $wgRequest );
-
+ $this->firsttime = false;
+
if( $this->live ) {
$this->livePreview();
+ wfProfileOut( $fname );
return;
}
if ( ! $this->mTitle->userCanEdit() ) {
+ wfDebug( "$fname: user can't edit\n" );
$wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+ wfProfileOut( $fname );
return;
}
+ wfDebug( "$fname: Checking blocks\n" );
if ( !$this->preview && !$this->diff && $wgUser->isBlockedFrom( $this->mTitle, !$this->save ) ) {
# When previewing, don't check blocked state - will get caught at save time.
# Also, check when starting edition is done against slave to improve performance.
+ wfDebug( "$fname: user is blocked\n" );
$this->blockedIPpage();
+ wfProfileOut( $fname );
return;
}
if ( !$wgUser->isAllowed('edit') ) {
if ( $wgUser->isAnon() ) {
+ wfDebug( "$fname: user must log in\n" );
$this->userNotLoggedInPage();
+ wfProfileOut( $fname );
return;
} else {
+ wfDebug( "$fname: read-only page\n" );
$wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+ wfProfileOut( $fname );
return;
}
}
if ( wfReadOnly() ) {
+ wfDebug( "$fname: read-only mode is engaged\n" );
if( $this->save || $this->preview ) {
- $this->editForm( 'preview' );
+ $this->formtype = 'preview';
} else if ( $this->diff ) {
- $this->editForm( 'diff' );
+ $this->formtype = 'diff';
} else {
$wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
+ wfProfileOut( $fname );
+ return;
+ }
+ } else {
+ if ( $this->save ) {
+ $this->formtype = 'save';
+ } else if ( $this->preview ) {
+ $this->formtype = 'preview';
+ } else if ( $this->diff ) {
+ $this->formtype = 'diff';
+ } else { # First time through
+ $this->firsttime = true;
+ if( $this->previewOnOpen() ) {
+ $this->formtype = 'preview';
+ } else {
+ $this->extractMetaDataFromArticle () ;
+ $this->formtype = 'initial';
+ }
}
- return;
}
- if ( $this->save ) {
- $this->editForm( 'save' );
- } else if ( $this->preview ) {
- $this->editForm( 'preview' );
- } else if ( $this->diff ) {
- $this->editForm( 'diff' );
- } else { # First time through
- if( $this->previewOnOpen() ) {
- $this->editForm( 'preview', true );
- } else {
- $this->extractMetaDataFromArticle () ;
- $this->editForm( 'initial', true );
+
+ wfProfileIn( "$fname-business-end" );
+
+ $this->isConflict = false;
+ // css / js subpages of user pages get a special treatment
+ $this->isCssJsSubpage = $wgTitle->isCssJsSubpage();
+
+ /* Notice that we can't use isDeleted, because it returns true if article is ever deleted
+ * no matter it's current state
+ */
+ $this->deletedSinceEdit = false;
+ if ( $this->edittime != '' ) {
+ /* Note that we rely on logging table, which hasn't been always there,
+ * but that doesn't matter, because this only applies to brand new
+ * deletes. This is done on every preview and save request. Move it further down
+ * to only perform it on saves
+ */
+ if ( $this->mTitle->isDeleted() ) {
+ $this->lastDelete = $this->getLastDelete();
+ if ( !is_null($this->lastDelete) ) {
+ $deletetime = $this->lastDelete->log_timestamp;
+ if ( ($deletetime - $this->starttime) > 0 ) {
+ $this->deletedSinceEdit = true;
+ }
+ }
}
}
+
+ if(!$this->mTitle->getArticleID() && ('initial' == $this->formtype || $this->firsttime )) { # new article
+ $this->showIntro();
+ }
+ if( $this->mTitle->isTalkPage() ) {
+ $wgOut->addWikiText( wfMsg( 'talkpagetext' ) );
+ }
+
+ # Attempt submission here. This will check for edit conflicts,
+ # and redundantly check for locked database, blocked IPs, etc.
+ # that edit() already checked just in case someone tries to sneak
+ # in the back door with a hand-edited submission URL.
+
+ if ( 'save' == $this->formtype ) {
+ if ( !$this->attemptSave() ) {
+ wfProfileOut( "$fname-business-end" );
+ wfProfileOut( $fname );
+ return;
+ }
+ }
+
+ # First time through: get contents, set time for conflict
+ # checking, etc.
+ if ( 'initial' == $this->formtype || $this->firsttime ) {
+ $this->initialiseForm();
+ }
+
+ $this->showEditForm();
+ wfProfileOut( "$fname-business-end" );
+ wfProfileOut( $fname );
}
-
+
/**
* Return true if this page should be previewed when the edit form
* is initially opened.
* @todo document
*/
function importFormData( &$request ) {
+ global $wgLang ;
+ $fname = 'EditPage::importFormData';
+ wfProfileIn( $fname );
+
if( $request->wasPosted() ) {
# These fields need to be checked for encoding.
# Also remove trailing whitespace, but don't remove _initial_
$this->textbox1 = $this->safeUnicodeInput( $request, 'wpTextbox1' );
$this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' );
$this->mMetaData = rtrim( $request->getText( 'metadata' ) );
- $this->summary = $request->getText( 'wpSummary' );
-
+ # Truncate for whole multibyte characters. +5 bytes for ellipsis
+ $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 );
+
$this->edittime = $request->getVal( 'wpEdittime' );
+ $this->starttime = $request->getVal( 'wpStarttime' );
+
+ $this->scrolltop = $request->getIntOrNull( 'wpScrolltop' );
+
if( is_null( $this->edittime ) ) {
# If the form is incomplete, force to preview.
+ wfDebug( "$fname: Form data appears to be incomplete\n" );
+ wfDebug( "POST DATA: " . var_export( $_POST, true ) . "\n" );
$this->preview = true;
} else {
- if( $this->tokenOk( $request ) ) {
- # Some browsers will not report any submit button
- # if the user hits enter in the comment box.
- # The unmarked state will be assumed to be a save,
- # if the form seems otherwise complete.
- $this->preview = $request->getCheck( 'wpPreview' );
- $this->diff = $request->getCheck( 'wpDiff' );
- } else {
- # Page might be a hack attempt posted from
- # an external site. Preview instead of saving.
- $this->preview = true;
+ $this->preview = $request->getCheck( 'wpPreview' );
+ $this->diff = $request->getCheck( 'wpDiff' );
+
+ if( !$this->preview ) {
+ if ( $this->tokenOk( $request ) ) {
+ # Some browsers will not report any submit button
+ # if the user hits enter in the comment box.
+ # The unmarked state will be assumed to be a save,
+ # if the form seems otherwise complete.
+ wfDebug( "$fname: Passed token check.\n" );
+ } else {
+ # Page might be a hack attempt posted from
+ # an external site. Preview instead of saving.
+ wfDebug( "$fname: Failed token check; forcing preview\n" );
+ $this->preview = true;
+ }
}
}
$this->save = ! ( $this->preview OR $this->diff );
if( !preg_match( '/^\d{14}$/', $this->edittime )) {
$this->edittime = null;
}
+
+ if( !preg_match( '/^\d{14}$/', $this->starttime )) {
+ $this->starttime = null;
+ }
+ $this->recreate = $request->getCheck( 'wpRecreate' );
+
$this->minoredit = $request->getCheck( 'wpMinoredit' );
$this->watchthis = $request->getCheck( 'wpWatchthis' );
} else {
# Not a posted form? Start with nothing.
+ wfDebug( "$fname: Not a posted form.\n" );
$this->textbox1 = '';
$this->textbox2 = '';
$this->mMetaData = '';
$this->summary = '';
$this->edittime = '';
+ $this->starttime = wfTimestampNow();
$this->preview = false;
$this->save = false;
$this->diff = false;
$this->minoredit = false;
$this->watchthis = false;
+ $this->recreate = false;
}
$this->oldid = $request->getInt( 'oldid' );
# Section edit can come from either the form or a link
$this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) );
-
+
$this->live = $request->getCheck( 'live' );
+ $this->editintro = $request->getText( 'editintro' );
+
+ wfProfileOut( $fname );
}
/**
if( $wgUser->isAnon() ) {
# Anonymous users may not have a session
# open. Don't tokenize.
- return true;
+ $this->mTokenOk = true;
} else {
- return $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+ $this->mTokenOk = $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
}
- }
-
- function submit() {
- $this->edit();
+ return $this->mTokenOk;
}
- /**
- * The edit form is self-submitting, so that when things like
- * preview and edit conflicts occur, we get the same form back
- * with the extra stuff added. Only when the final submission
- * is made and all is well do we actually save and redirect to
- * the newly-edited page.
- *
- * @param string $formtype Type of form either : save, initial, diff or preview
- * @param bool $firsttime True to load form data from db
- */
- function editForm( $formtype, $firsttime = false ) {
+ function showIntro() {
global $wgOut, $wgUser;
- global $wgLang, $wgContLang, $wgParser, $wgTitle;
- global $wgAllowAnonymousMinor, $wgRequest;
- global $wgSpamRegex, $wgFilterCallback;
-
- $sk = $wgUser->getSkin();
- $isConflict = false;
- // css / js subpages of user pages get a special treatment
- $isCssJsSubpage = $wgTitle->isCssJsSubpage();
-
- if(!$this->mTitle->getArticleID()) { # new article
- $editintro = $wgRequest->getText( 'editintro' );
- $addstandardintro=true;
- if($editintro) {
- $introtitle=Title::newFromText($editintro);
- if(isset($introtitle) && $introtitle->userCanRead()) {
- $rev=Revision::newFromTitle($introtitle);
- if($rev) {
- $wgOut->addWikiText($rev->getText());
- $addstandardintro=false;
- }
+ $addstandardintro=true;
+ if($this->editintro) {
+ $introtitle=Title::newFromText($this->editintro);
+ if(isset($introtitle) && $introtitle->userCanRead()) {
+ $rev=Revision::newFromTitle($introtitle);
+ if($rev) {
+ $wgOut->addWikiText($rev->getText());
+ $addstandardintro=false;
}
}
- if($addstandardintro) {
- $wgOut->addWikiText(wfmsg('newarticletext'));
- }
}
-
- if( $this->mTitle->isTalkPage() ) {
- $wgOut->addWikiText(wfmsg('talkpagetext'));
+ if($addstandardintro) {
+ if ( $wgUser->isLoggedIn() )
+ $wgOut->addWikiText( wfMsg( 'newarticletext' ) );
+ else
+ $wgOut->addWikiText( wfMsg( 'newarticletextanon' ) );
}
+ }
- # Attempt submission here. This will check for edit conflicts,
- # and redundantly check for locked database, blocked IPs, etc.
- # that edit() already checked just in case someone tries to sneak
- # in the back door with a hand-edited submission URL.
+ /**
+ * Attempt submission
+ * @return bool false if output is done, true if the rest of the form should be displayed
+ */
+ function attemptSave() {
+ global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgOut;
+
+ $fname = 'EditPage::attemptSave';
+ wfProfileIn( $fname );
+ wfProfileIn( "$fname-checks" );
- if ( 'save' == $formtype ) {
- # Reintegrate metadata
- if ( $this->mMetaData != '' ) $this->textbox1 .= "\n" . $this->mMetaData ;
- $this->mMetaData = '' ;
+ # Reintegrate metadata
+ if ( $this->mMetaData != '' ) $this->textbox1 .= "\n" . $this->mMetaData ;
+ $this->mMetaData = '' ;
- # Check for spam
- if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
- $this->spamPage ( $matches[0] );
- return;
- }
- if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section ) ) {
- # Error messages or other handling should be performed by the filter function
- return;
- }
- if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
- # Check block state against master, thus 'false'.
- $this->blockedIPpage();
- return;
- }
+ # Check for spam
+ if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
+ $this->spamPage ( $matches[0] );
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
+ }
+ if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section ) ) {
+ # Error messages or other handling should be performed by the filter function
+ wfProfileOut( $fname );
+ wfProfileOut( "$fname-checks" );
+ return false;
+ }
+ if ( !wfRunHooks( 'EditFilter', array( &$this, $this->textbox1, $this->section ) ) ) {
+ # Error messages or other handling should be performed by the filter function
+ wfProfileOut( $fname );
+ wfProfileOut( "$fname-checks" );
+ return false;
+ }
+ if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
+ # Check block state against master, thus 'false'.
+ $this->blockedIPpage();
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
+ }
- if ( !$wgUser->isAllowed('edit') ) {
- if ( $wgUser->isAnon() ) {
+ if ( !$wgUser->isAllowed('edit') ) {
+ if ( $wgUser->isAnon() ) {
$this->userNotLoggedInPage();
- return;
- }
- else {
- $wgOut->readOnlyPage();
- return;
- }
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
}
-
- if ( wfReadOnly() ) {
+ else {
$wgOut->readOnlyPage();
- return;
- }
- if ( $wgUser->pingLimiter() ) {
- $wgOut->rateLimited();
- return;
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
}
+ }
- # If article is new, insert it.
- $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
- if ( 0 == $aid ) {
- # Don't save a new article if it's blank.
- if ( ( '' == $this->textbox1 ) ||
- ( wfMsg( 'newarticletext' ) == $this->textbox1 ) ) {
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
+ }
+ if ( $wgUser->pingLimiter() ) {
+ $wgOut->rateLimited();
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return false;
+ }
+
+ # If the article has been deleted while editing, don't save it without
+ # confirmation
+ if ( $this->deletedSinceEdit && !$this->recreate ) {
+ wfProfileOut( "$fname-checks" );
+ wfProfileOut( $fname );
+ return true;
+ }
+
+ wfProfileOut( "$fname-checks" );
+
+ # If article is new, insert it.
+ $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
+ if ( 0 == $aid ) {
+ # Don't save a new article if it's blank.
+ if ( ( '' == $this->textbox1 ) ) {
$wgOut->redirect( $this->mTitle->getFullURL() );
- return;
- }
- if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$this->textbox1,
- &$this->summary, &$this->minoredit, &$this->watchthis, NULL)))
- {
-
- $isComment=($this->section=='new');
- $this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
- $this->minoredit, $this->watchthis, false, $isComment);
- wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $this->textbox1,
- $this->summary, $this->minoredit,
- $this->watchthis, NULL));
- }
- return;
+ wfProfileOut( $fname );
+ return false;
}
- # Article exists. Check for edit conflict.
+ $isComment=($this->section=='new');
+ $this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
+ $this->minoredit, $this->watchthis, false, $isComment);
+
+ wfProfileOut( $fname );
+ return false;
+ }
- $this->mArticle->clear(); # Force reload of dates, etc.
- $this->mArticle->forUpdate( true ); # Lock the article
+ # Article exists. Check for edit conflict.
- if( ( $this->section != 'new' ) &&
- ($this->mArticle->getTimestamp() != $this->edittime ) ) {
- $isConflict = true;
- }
- $userid = $wgUser->getID();
+ $this->mArticle->clear(); # Force reload of dates, etc.
+ $this->mArticle->forUpdate( true ); # Lock the article
- if ( $isConflict) {
- wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" .
- $this->mArticle->getTimestamp() . "'\n" );
- $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
- $this->section, $this->textbox1, $this->summary, $this->edittime);
- }
- else {
- wfDebug( "EditPage::editForm getting section '$this->section'\n" );
- $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
- $this->section, $this->textbox1, $this->summary);
- }
- # Suppress edit conflict with self
+ if( ( $this->section != 'new' ) &&
+ ($this->mArticle->getTimestamp() != $this->edittime ) )
+ {
+ $this->isConflict = true;
+ }
+ $userid = $wgUser->getID();
- if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
- wfDebug( "Suppressing edit conflict, same user.\n" );
- $isConflict = false;
- } else {
- # switch from section editing to normal editing in edit conflict
- if($isConflict) {
- # Attempt merge
- if( $this->mergeChangesInto( $text ) ){
- // Successful merge! Maybe we should tell the user the good news?
- $isConflict = false;
- wfDebug( "Suppressing edit conflict, successful merge.\n" );
- } else {
- $this->section = '';
- $this->textbox1 = $text;
- wfDebug( "Keeping edit conflict, failed merge.\n" );
- }
+ if ( $this->isConflict) {
+ wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" .
+ $this->mArticle->getTimestamp() . "'\n" );
+ $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime);
+ }
+ else {
+ wfDebug( "EditPage::editForm getting section '$this->section'\n" );
+ $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary);
+ }
+ if( is_null( $text ) ) {
+ wfDebug( "EditPage::editForm activating conflict; section replace failed.\n" );
+ $this->isConflict = true;
+ $text = $this->textbox1;
+ }
+
+ # Suppress edit conflict with self, except for section edits where merging is required.
+ if ( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
+ wfDebug( "Suppressing edit conflict, same user.\n" );
+ $this->isConflict = false;
+ } else {
+ # switch from section editing to normal editing in edit conflict
+ if($this->isConflict) {
+ # Attempt merge
+ if( $this->mergeChangesInto( $text ) ){
+ // Successful merge! Maybe we should tell the user the good news?
+ $this->isConflict = false;
+ wfDebug( "Suppressing edit conflict, successful merge.\n" );
+ } else {
+ $this->section = '';
+ $this->textbox1 = $text;
+ wfDebug( "Keeping edit conflict, failed merge.\n" );
}
}
- if ( ! $isConflict ) {
- # All's well
- $sectionanchor = '';
- if( $this->section == 'new' ) {
- if( $this->summary != '' ) {
- $sectionanchor = $this->sectionAnchor( $this->summary );
- }
- } elseif( $this->section != '' ) {
- # Try to get a section anchor from the section source, redirect to edited section if header found
- # XXX: might be better to integrate this into Article::getTextOfLastEditWithSectionReplacedOrAdded
- # for duplicate heading checking and maybe parsing
- $hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches );
- # we can't deal with anchors, includes, html etc in the header for now,
- # headline would need to be parsed to improve this
- #if($hasmatch and strlen($matches[2]) > 0 and !preg_match( "/[\\['{<>]/", $matches[2])) {
- if($hasmatch and strlen($matches[2]) > 0) {
- $sectionanchor = $this->sectionAnchor( $matches[2] );
- }
- }
-
- // Save errors may fall down to the edit form, but we've now
- // merged the section into full text. Clear the section field
- // so that later submission of conflict forms won't try to
- // replace that into a duplicated mess.
- $this->textbox1 = $text;
- $this->section = '';
-
- if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$text,
- &$this->summary, &$this->minoredit,
- &$this->watchthis, &$sectionanchor)))
- {
- # update the article here
- if($this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
- $this->watchthis, '', $sectionanchor ))
- {
- wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $text,
- $this->summary, $this->minoredit,
- $this->watchthis, $sectionanchor));
- return;
- } else {
- $isConflict = true;
- }
- }
+ }
+
+ if ( $this->isConflict ) {
+ wfProfileOut( $fname );
+ return true;
+ }
+
+ # All's well
+ wfProfileIn( "$fname-sectionanchor" );
+ $sectionanchor = '';
+ if( $this->section == 'new' ) {
+ if( $this->summary != '' ) {
+ $sectionanchor = $this->sectionAnchor( $this->summary );
+ }
+ } elseif( $this->section != '' ) {
+ # Try to get a section anchor from the section source, redirect to edited section if header found
+ # XXX: might be better to integrate this into Article::replaceSection
+ # for duplicate heading checking and maybe parsing
+ $hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches );
+ # we can't deal with anchors, includes, html etc in the header for now,
+ # headline would need to be parsed to improve this
+ if($hasmatch and strlen($matches[2]) > 0) {
+ $sectionanchor = $this->sectionAnchor( $matches[2] );
}
}
- # First time through: get contents, set time for conflict
- # checking, etc.
-
- if ( 'initial' == $formtype || $firsttime ) {
- $this->edittime = $this->mArticle->getTimestamp();
- $this->textbox1 = $this->mArticle->getContent( true );
- $this->summary = '';
- $this->proxyCheck();
+ wfProfileOut( "$fname-sectionanchor" );
+
+ // Save errors may fall down to the edit form, but we've now
+ // merged the section into full text. Clear the section field
+ // so that later submission of conflict forms won't try to
+ // replace that into a duplicated mess.
+ $this->textbox1 = $text;
+ $this->section = '';
+
+ # update the article here
+ if( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
+ $this->watchthis, '', $sectionanchor ) ) {
+ wfProfileOut( $fname );
+ return false;
+ } else {
+ $this->isConflict = true;
}
+ wfProfileOut( $fname );
+ return true;
+ }
+
+ /**
+ * Initialise form fields in the object
+ * Called on the first invocation, e.g. when a user clicks an edit link
+ */
+ function initialiseForm() {
+ $this->edittime = $this->mArticle->getTimestamp();
+ $this->textbox1 = $this->mArticle->getContent( true );
+ $this->summary = '';
+ wfProxyCheck();
+ }
+
+ /**
+ * Send the edit form and related headers to $wgOut
+ * @param $formCallback Optional callable that takes an OutputPage
+ * parameter; will be called during form output
+ * near the top, for captchas and the like.
+ */
+ function showEditForm( $formCallback=null ) {
+ global $wgOut, $wgUser, $wgAllowAnonymousMinor, $wgLang, $wgContLang;
+
+ $fname = 'EditPage::showEditForm';
+ wfProfileIn( $fname );
+
+ $sk =& $wgUser->getSkin();
+
$wgOut->setRobotpolicy( 'noindex,nofollow' );
# Enabled article-related sidebar, toplinks, etc.
$wgOut->setArticleRelated( true );
- if ( $isConflict ) {
+ if ( $this->isConflict ) {
$s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
$wgOut->setPageTitle( $s );
$wgOut->addWikiText( wfMsg( 'explainconflict' ) );
}
$wgOut->setPageTitle( $s );
if ( !$this->checkUnicodeCompliantBrowser() ) {
- $this->mArticle->setOldSubtitle();
$wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
}
if ( isset( $this->mArticle )
&& isset( $this->mArticle->mRevision )
&& !$this->mArticle->mRevision->isCurrent() ) {
- $this->mArticle->setOldSubtitle();
+ $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() );
$wgOut->addWikiText( wfMsg( 'editingold' ) );
}
}
if( wfReadOnly() ) {
$wgOut->addWikiText( wfMsg( 'readonlywarning' ) );
- } else if ( $isCssJsSubpage and 'preview' != $formtype) {
+ } else if ( $this->isCssJsSubpage and 'preview' != $this->formtype) {
$wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ));
}
if( $this->mTitle->isProtected('edit') ) {
'[[' . wfMsgForContent( 'copyrightpage' ) . ']]',
$wgRightsText ) . "\n</div>";
- if( $wgUser->getOption('showtoolbar') and !$isCssJsSubpage ) {
+ if( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) {
# prepare toolbar for edit buttons
$toolbar = $this->getEditToolbar();
} else {
$watchhtml = '';
if ( $wgUser->isLoggedIn() ) {
- $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
- " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis' />".
- "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
+ $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".
+ ($this->watchthis?" checked='checked'":"").
+ " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />".
+ "<label for='wpWatchthis' title=\"" .
+ htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>";
}
- $checkboxhtml = $minoredithtml . $watchhtml . '<br />';
+ $checkboxhtml = $minoredithtml . $watchhtml;
- $wgOut->addHTML( '<div id="wikiPreview">' );
- if ( 'preview' == $formtype) {
- $previewOutput = $this->getPreviewText( $isConflict, $isCssJsSubpage );
- if ( $wgUser->getOption('previewontop' ) ) {
- $wgOut->addHTML( $previewOutput );
- if($this->mTitle->getNamespace() == NS_CATEGORY) {
- $this->mArticle->closeShowCategory();
- }
- $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
- }
+ if ( 'preview' == $this->formtype && $wgUser->getOption( 'previewontop' ) ) {
+ $this->showPreview();
}
- $wgOut->addHTML( '</div>' );
- if ( 'diff' == $formtype ) {
+ if ( 'diff' == $this->formtype ) {
if ( $wgUser->getOption('previewontop' ) ) {
$wgOut->addHTML( $this->getDiff() );
}
# if this is a comment, show a subject line at the top, which is also the edit summary.
# Otherwise, show a summary field at the bottom
$summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME
- if( $this->section == 'new' ) {
- $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
- $editsummary = '';
- } else {
- $commentsubject = '';
- $editsummary="{$summary}: <input tabindex='2' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
- }
+ if( $this->section == 'new' ) {
+ $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span> <div class='editOptions'><input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
+ $editsummary = '';
+ } else {
+ $commentsubject = '';
+ $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span> <div class='editOptions'><input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
+ }
+ # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display
if( !$this->preview && !$this->diff ) {
- # Don't select the edit box on preview; this interferes with seeing what's going on.
$wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
}
- # Prepare a list of templates used by this page
- $templates = '';
- $articleTemplates = $this->mArticle->getUsedTemplates();
- if ( count( $articleTemplates ) > 0 ) {
- $templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
- foreach ( $articleTemplates as $tpl ) {
- if ( $titleObj = Title::makeTitle( NS_TEMPLATE, $tpl ) ) {
- $templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
- }
- }
- $templates .= '</ul>';
- }
-
- global $wgLivePreview, $wgStylePath;
- /**
- * Live Preview lets us fetch rendered preview page content and
- * add it to the page without refreshing the whole page.
- * Set up the button for it; if not supported by the browser
- * it will fall through to the normal form submission method.
- */
- if( $wgLivePreview ) {
- global $wgJsMimeType;
- $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
- htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
- '"></script>' . "\n" );
- $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
- $liveOnclick = 'onclick="return !livePreview('.
- 'getElementById(\'wikiPreview\'),' .
- 'editform.wpTextbox1.value,' .
- htmlspecialchars( '"' . $liveAction . '"' ) . ')"';
+ $templates = $this->getTemplatesUsed();
+
+ global $wgLivePreview;
+ if ( $wgLivePreview ) {
+ $liveOnclick = $this->doLivePreviewScript();
} else {
$liveOnclick = '';
}
-
+
global $wgUseMetadataEdit ;
- if ( $wgUseMetadataEdit )
- {
+ if ( $wgUseMetadataEdit ) {
$metadata = $this->mMetaData ;
$metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
- $helppage = Title::newFromText ( wfmsg("metadata_page") ) ;
- $top = str_replace ( "$1" , $helppage->getInternalURL() , wfmsg("metadata") ) ;
+ $helppage = Title::newFromText( wfMsg( "metadata_page" ) ) ;
+ $top = wfMsg( 'metadata', $helppage->getInternalURL() );
$metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
}
else $metadata = "" ;
+ $hidden = '';
+ $recreate = '';
+ if ($this->deletedSinceEdit) {
+ if ( 'save' != $this->formtype ) {
+ $wgOut->addWikiText( wfMsg('deletedwhileediting'));
+ } else {
+ // Hide the toolbar and edit area, use can click preview to get it back
+ // Add an confirmation checkbox and explanation.
+ $toolbar = '';
+ $hidden = 'type="hidden" style="display:none;"';
+ $recreate = $wgOut->parse( wfMsg( 'confirmrecreate', $this->lastDelete->user_name , $this->lastDelete->log_comment ));
+ $recreate .=
+ "<br /><input tabindex='1' type='checkbox' value='1' name='wpRecreate' id='wpRecreate' />".
+ "<label for='wpRecreate' title='".wfMsg('tooltip-recreate')."'>". wfMsg('recreate')."</label>";
+ }
+ }
+
$safemodehtml = $this->checkUnicodeCompliantBrowser()
? ""
: "<input type='hidden' name=\"safemode\" value='1' />\n";
{$toolbar}
<form id="editform" name="editform" method="post" action="$action"
enctype="multipart/form-data">
+END
+);
+ if( is_callable( $formCallback ) ) {
+ call_user_func_array( $formCallback, array( &$wgOut ) );
+ }
+ $wgOut->addHTML( <<<END
+$recreate
{$commentsubject}
-<textarea tabindex='1' accesskey="," name="wpTextbox1" rows='{$rows}'
-cols='{$cols}'{$ew}>
+<textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}'
+cols='{$cols}'{$ew} $hidden>
END
. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) .
"
-</textarea>
+</textarea><br />
{$metadata}
-<br />{$editsummary}
+{$editsummary}
{$checkboxhtml}
{$safemodehtml}
+<div class='editButtons'>
<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
" title=\"".wfMsg('tooltip-save')."\"/>
<input tabindex='6' id='wpPreview' type='submit' $liveOnclick value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
" title=\"".wfMsg('tooltip-preview')."\"/>
<input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
-" title=\"".wfMsg('tooltip-diff')."\"/>
-<em>{$cancel}</em> | <em>{$edithelp}</em>{$templates}" );
+" title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div>
+</div>
+<div class='templatesUsed'>
+{$templates}
+</div>
+" );
$wgOut->addWikiText( $copywarn );
$wgOut->addHTML( "
<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
-<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
+<input type='hidden' value=\"{$this->starttime}\" name=\"wpStarttime\" />\n
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
+<input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
if ( $wgUser->isLoggedIn() ) {
/**
* CSS previews.
*/
$token = htmlspecialchars( $wgUser->editToken() );
- $wgOut->addHTML( "
-<input type='hidden' value=\"$token\" name=\"wpEditToken\" />\n" );
+ $wgOut->addHTML( "\n<input type='hidden' value=\"$token\" name=\"wpEditToken\" />\n" );
}
-
-
- if ( $isConflict ) {
+
+
+ if ( $this->isConflict ) {
require_once( "DifferenceEngine.php" );
$wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
- DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
- wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
+
+ $de = new DifferenceEngine( $this->mTitle );
+ $de->setText( $this->textbox2, $this->textbox1 );
+ $de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
$wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' );
$wgOut->addHTML( "<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
-. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) .
-"
-</textarea>" );
+ . htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) . "\n</textarea>" );
}
$wgOut->addHTML( "</form>\n" );
- if ( $formtype == 'preview' && !$wgUser->getOption( 'previewontop' ) ) {
- $wgOut->addHTML( '<div id="wikiPreview">' . $previewOutput . '</div>' );
+ if ( $this->formtype == 'preview' && !$wgUser->getOption( 'previewontop' ) ) {
+ $this->showPreview();
}
- if ( $formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
+ if ( $this->formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
#$wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
$wgOut->addHTML( $this->getDiff() );
}
+
+ wfProfileOut( $fname );
+ }
+
+ /**
+ * Append preview output to $wgOut.
+ * Includes category rendering if this is a category page.
+ * @access private
+ */
+ function showPreview() {
+ global $wgOut;
+ $wgOut->addHTML( '<div id="wikiPreview">' );
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
+ $this->mArticle->openShowCategory();
+ }
+ $previewOutput = $this->getPreviewText();
+ $wgOut->addHTML( $previewOutput );
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
+ $this->mArticle->closeShowCategory();
+ }
+ $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
+ $wgOut->addHTML( '</div>' );
+ }
+
+ /**
+ * Prepare a list of templates used by this page. Returns HTML.
+ */
+ function getTemplatesUsed() {
+ global $wgUser;
+
+ $fname = 'EditPage::getTemplatesUsed';
+ wfProfileIn( $fname );
+
+ $sk =& $wgUser->getSkin();
+
+ $templates = '';
+ $articleTemplates = $this->mArticle->getUsedTemplates();
+ if ( count( $articleTemplates ) > 0 ) {
+ $templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
+ foreach ( $articleTemplates as $tpl ) {
+ if ( $titleObj = Title::makeTitle( NS_TEMPLATE, $tpl ) ) {
+ $templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
+ }
+ }
+ $templates .= '</ul>';
+ }
+ wfProfileOut( $fname );
+ return $templates;
+ }
+
+ /**
+ * Live Preview lets us fetch rendered preview page content and
+ * add it to the page without refreshing the whole page.
+ * If not supported by the browser it will fall through to the normal form
+ * submission method.
+ *
+ * This function outputs a script tag to support live preview, and
+ * returns an onclick handler which should be added to the attributes
+ * of the preview button
+ */
+ function doLivePreviewScript() {
+ global $wgStylePath, $wgJsMimeType, $wgOut;
+ $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
+ htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
+ '"></script>' . "\n" );
+ $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
+ return 'onclick="return !livePreview('.
+ 'getElementById(\'wikiPreview\'),' .
+ 'editform.wpTextbox1.value,' .
+ htmlspecialchars( '"' . $liveAction . '"' ) . ')"';
+ }
+
+ function getLastDelete() {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $fname = 'EditPage::getLastDelete';
+ $res = $dbr->select(
+ array( 'logging', 'user' ),
+ array( 'log_type',
+ 'log_action',
+ 'log_timestamp',
+ 'log_user',
+ 'log_namespace',
+ 'log_title',
+ 'log_comment',
+ 'log_params',
+ 'user_name', ),
+ array( 'log_namespace' => $this->mTitle->getNamespace(),
+ 'log_title' => $this->mTitle->getDBkey(),
+ 'log_type' => 'delete',
+ 'log_action' => 'delete',
+ 'user_id=log_user' ),
+ $fname,
+ array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ) );
+
+ if($dbr->numRows($res) == 1) {
+ while ( $x = $dbr->fetchObject ( $res ) )
+ $data = $x;
+ $dbr->freeResult ( $res ) ;
+ } else {
+ $data = null;
+ }
+ return $data;
}
/**
* @todo document
*/
- function getPreviewText( $isConflict, $isCssJsSubpage ) {
+ function getPreviewText() {
global $wgOut, $wgUser, $wgTitle, $wgParser, $wgAllowDiffPreview, $wgEnableDiffPreviewPreference;
+
+ $fname = 'EditPage::getPreviewText';
+ wfProfileIn( $fname );
+
+ if ( $this->mTokenOk ) {
+ $msg = 'previewnote';
+ } else {
+ $msg = 'session_fail_preview';
+ }
$previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
- "<p class='previewnote'>" . htmlspecialchars( wfMsg( 'previewnote' ) ) . "</p>\n";
- if ( $isConflict ) {
- $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) .
- "</h2>\n";
+ "<div class='previewnote'>" . $wgOut->parse( wfMsg( $msg ) ) . "</div>\n";
+ if ( $this->isConflict ) {
+ $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
}
$parserOptions = ParserOptions::newFromUser( $wgUser );
# don't parse user css/js, show message about preview
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
- if ( $isCssJsSubpage ) {
+ if ( $this->isCssJsSubpage ) {
if(preg_match("/\\.css$/", $wgTitle->getText() ) ) {
$previewtext = wfMsg('usercsspreview');
} else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) {
}
$parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
$wgOut->addHTML( $parserOutput->mText );
+ wfProfileOut( $fname );
return $previewhead;
} else {
# if user want to see preview when he edit an article
}
if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
-
+
$parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
- $wgTitle, $parserOptions );
-
+ $wgTitle, $parserOptions );
+
$previewHTML = $parserOutput->mText;
-
+
$wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
$wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
+
+ wfProfileOut( $fname );
return $previewhead . $previewHTML;
}
}
-
+
/**
* @todo document
*/
function blockedIPpage() {
- global $wgOut, $wgUser, $wgContLang, $wgIP;
+ global $wgOut, $wgUser, $wgContLang;
$wgOut->setPageTitle( wfMsg( 'blockedtitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$id = $wgUser->blockedBy();
$reason = $wgUser->blockedFor();
- $ip = $wgIP;
-
+ $ip = wfGetIP();
+
if ( is_numeric( $id ) ) {
$name = User::whoIs( $id );
} else {
$wgOut->returnToMain( false );
}
- /**
- * Forks processes to scan the originating IP for an open proxy server
- * MemCached can be used to skip IPs that have already been scanned
- */
- function proxyCheck() {
- global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
- global $wgIP, $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry;
-
- if ( !$wgBlockOpenProxies ) {
- return;
- }
-
- # Get MemCached key
- $skip = false;
- if ( $wgUseMemCached ) {
- $mcKey = $wgDBname.':proxy:ip:'.$wgIP;
- $mcValue = $wgMemc->get( $mcKey );
- if ( $mcValue ) {
- $skip = true;
- }
- }
-
- # Fork the processes
- if ( !$skip ) {
- $title = Title::makeTitle( NS_SPECIAL, 'Blockme' );
- $iphash = md5( $wgIP . $wgProxyKey );
- $url = $title->getFullURL( 'ip='.$iphash );
-
- foreach ( $wgProxyPorts as $port ) {
- $params = implode( ' ', array(
- escapeshellarg( $wgProxyScriptPath ),
- escapeshellarg( $wgIP ),
- escapeshellarg( $port ),
- escapeshellarg( $url )
- ));
- exec( "php $params &>/dev/null &" );
- }
- # Set MemCached key
- if ( $wgUseMemCached ) {
- $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
- }
- }
- }
-
/**
* @access private
* @todo document
wfProfileIn( $fname );
$db =& wfGetDB( DB_MASTER );
-
+
// This is the revision the editor started from
$baseRevision = Revision::loadFromTimestamp(
$db, $this->mArticle->mTitle, $this->edittime );
return false;
}
$currentText = $currentRevision->getText();
-
+
if( wfMerge( $baseText, $editText, $currentText, $result ) ){
$editText = $result;
wfProfileOut( $fname );
}
}
-
+ /**
+ * Check if the browser is on a blacklist of user-agents known to
+ * mangle UTF-8 data on form submission. Returns true if Unicode
+ * should make it through, false if it's known to be a problem.
+ * @return bool
+ * @access private
+ */
function checkUnicodeCompliantBrowser() {
global $wgBrowserBlackList;
+ if( empty( $_SERVER["HTTP_USER_AGENT"] ) ) {
+ // No User-Agent header sent? Trust it by default...
+ return true;
+ }
$currentbrowser = $_SERVER["HTTP_USER_AGENT"];
foreach ( $wgBrowserBlackList as $browser ) {
if ( preg_match($browser, $currentbrowser) ) {
*/
function sectionAnchor( $text ) {
$headline = Sanitizer::decodeCharReferences( $text );
- # strip out HTML
+ # strip out HTML
$headline = preg_replace( '/<.*?' . '>/', '', $headline );
$headline = trim( $headline );
$sectionanchor = '#' . urlencode( str_replace( ' ', '_', $headline ) );
$toolbar.="addButton('$image','$tip','$open','$close','$sample');\n";
}
- $toolbar.="addInfobox('" . wfEscapeJsString( wfMsg( "infobox" ) ) .
- "','" . wfEscapeJsString( wfMsg( "infobox_alert" ) ) . "');\n";
$toolbar.="document.writeln(\"</div>\");\n";
-
$toolbar.="/*]]>*/\n</script>";
return $toolbar;
}
-
+
/**
* Output preview text only. This can be sucked into the edit page
* via JavaScript, and saves the server time rendering the skin as
* @return string HTML
*/
function getDiff() {
+ global $wgUser;
+
require_once( 'DifferenceEngine.php' );
$oldtext = $this->mArticle->fetchContent();
- $newtext = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+ $newtext = $this->mArticle->replaceSection(
$this->section, $this->textbox1, $this->summary, $this->edittime );
$oldtitle = wfMsg( 'currentrev' );
$newtitle = wfMsg( 'yourtext' );
- if ( $oldtext != wfMsg( 'noarticletext' ) || $newtext != '' ) {
- $difftext = DifferenceEngine::getDiff( $oldtext, $newtext, $oldtitle, $newtitle );
+ if ( $oldtext !== false || $newtext != '' ) {
+ $de = new DifferenceEngine( $this->mTitle );
+ $de->setText( $oldtext, $newtext );
+ $difftext = $de->getDiff( $oldtitle, $newtitle );
+ } else {
+ $difftext = '';
}
-
+
return '<div id="wikiDiff">' . $difftext . '</div>';
}
dépôts / lhc / web / wiklou.git / blobdiff