if ( !$wgUseMetadataEdit ) return ;
if ( $wgMetadataWhitelist == '' ) return ;
$s = '' ;
- $t = $this->mArticle->getContent ( true ) ;
+ $t = $this->mArticle->getContent();
# MISSING : <nowiki> filtering
$sat = array () ; # stand-alone-templates; must be lowercase
$wl_title = Title::newFromText ( $wgMetadataWhitelist ) ;
$wl_article = new Article ( $wl_title ) ;
- $wl = explode ( "\n" , $wl_article->getContent(true) ) ;
+ $wl = explode ( "\n" , $wl_article->getContent() ) ;
foreach ( $wl AS $x )
{
$isentry = false ;
}
/**
- * This is the function that gets called for "action=edit". It
- * sets up various member variables, then passes execution to
+ * 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
*/
function edit() {
global $wgOut, $wgUser, $wgRequest, $wgTitle;
-
+
if ( ! wfRunHooks( 'AlternateEdit', array( &$this ) ) )
return;
-
+
$fname = 'EditPage::edit';
wfProfileIn( $fname );
wfDebug( "$fname: enter\n" );
if ( ! $this->mTitle->userCanEdit() ) {
wfDebug( "$fname: user can't edit\n" );
- $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+ $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
wfProfileOut( $fname );
return;
}
# 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();
+ $wgOut->blockedPage();
wfProfileOut( $fname );
return;
}
return;
} else {
wfDebug( "$fname: read-only page\n" );
- $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+ $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
wfProfileOut( $fname );
return;
}
}
+ if ( !$this->mTitle->userCan( 'create' ) && !$this->mTitle->exists() ) {
+ wfDebug( "$fname: no create permission\n" );
+ $this->noCreatePermission();
+ wfProfileOut( $fname );
+ return;
+ }
if ( wfReadOnly() ) {
wfDebug( "$fname: read-only mode is engaged\n" );
if( $this->save || $this->preview ) {
} else if ( $this->diff ) {
$this->formtype = 'diff';
} else {
- $wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
+ $wgOut->readOnlyPage( $this->mArticle->getContent() );
wfProfileOut( $fname );
return;
}
}
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
*/
}
}
}
-
+
if(!$this->mTitle->getArticleID() && ('initial' == $this->formtype || $this->firsttime )) { # new article
$this->showIntro();
}
return;
}
}
-
+
# First time through: get contents, set time for conflict
# checking, etc.
if ( 'initial' == $this->formtype || $this->firsttime ) {
*/
function previewOnOpen() {
global $wgUser;
- return $wgUser->getOption( 'previewonfirst' ) ||
- ( $this->mTitle->getNamespace() == NS_CATEGORY &&
- !$this->mTitle->exists() );
+ return $this->section != 'new' &&
+ ( ( $wgUser->getOption( 'previewonfirst' ) && $this->mTitle->exists() ) ||
+ ( $this->mTitle->getNamespace() == NS_CATEGORY &&
+ !$this->mTitle->exists() ) );
}
/**
} else {
$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( !preg_match( '/^\d{14}$/', $this->starttime )) {
$this->starttime = null;
}
-
+
$this->recreate = $request->getCheck( 'wpRecreate' );
$this->minoredit = $request->getCheck( 'wpMinoredit' );
$this->live = $request->getCheck( 'live' );
$this->editintro = $request->getText( 'editintro' );
-
+
wfProfileOut( $fname );
}
}
}
if($addstandardintro) {
- if ( $wgUser->isLoggedIn() )
+ if ( $wgUser->isLoggedIn() )
$wgOut->addWikiText( wfMsg( 'newarticletext' ) );
else
$wgOut->addWikiText( wfMsg( 'newarticletextanon' ) );
*/
function attemptSave() {
global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgOut;
-
+
$fname = 'EditPage::attemptSave';
wfProfileIn( $fname );
wfProfileIn( "$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 ) {
+ // Late check for create permission, just in case *PARANOIA*
+ if ( !$this->mTitle->userCan( 'create' ) ) {
+ wfDebug( "$fname: no create permission\n" );
+ $this->noCreatePermission();
+ wfProfileOut( $fname );
+ return;
+ }
+
# Don't save a new article if it's blank.
if ( ( '' == $this->textbox1 ) ) {
$wgOut->redirect( $this->mTitle->getFullURL() );
$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
- if( ( $this->section != 'new' ) &&
- ($this->mArticle->getTimestamp() != $this->edittime ) )
- {
+ if( $this->mArticle->getTimestamp() != $this->edittime ) {
$this->isConflict = true;
+ if( $this->section == 'new' ) {
+ if( $this->mArticle->getUserText() == $wgUser->getName() &&
+ $this->mArticle->getComment() == $this->summary ) {
+ // Probably a duplicate submission of a new comment.
+ // This can happen when squid resends a request after
+ // a timeout but the first one actually went through.
+ wfDebug( "EditPage::editForm duplicate new section submission; trigger edit conflict!\n" );
+ } else {
+ // New comment; suppress conflict.
+ $this->isConflict = false;
+ wfDebug( "EditPage::editForm conflict suppressed; new section\n" );
+ }
+ }
}
$userid = $wgUser->getID();
}
}
}
-
+
if ( $this->isConflict ) {
wfProfileOut( $fname );
return true;
}
-
+
# All's well
wfProfileIn( "$fname-sectionanchor" );
$sectionanchor = '';
*/
function initialiseForm() {
$this->edittime = $this->mArticle->getTimestamp();
- $this->textbox1 = $this->mArticle->getContent( true );
+ $this->textbox1 = $this->mArticle->getContent();
$this->summary = '';
+ if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI )
+ $this->textbox1 = wfMsgWeirdKey ( $this->mArticle->mTitle->getText() ) ;
wfProxyCheck();
}
* near the top, for captchas and the like.
*/
function showEditForm( $formCallback=null ) {
- global $wgOut, $wgUser, $wgAllowAnonymousMinor, $wgLang, $wgContLang;
+ global $wgOut, $wgUser, $wgLang, $wgContLang;
$fname = 'EditPage::showEditForm';
wfProfileIn( $fname );
$sk =& $wgUser->getSkin();
-
+
+ wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ) ;
+
$wgOut->setRobotpolicy( 'noindex,nofollow' );
# Enabled article-related sidebar, toplinks, etc.
$wgOut->addWikiText( wfMsg( 'explainconflict' ) );
$this->textbox2 = $this->textbox1;
- $this->textbox1 = $this->mArticle->getContent( true );
+ $this->textbox1 = $this->mArticle->getContent();
$this->edittime = $this->mArticle->getTimestamp();
} else {
if( !empty( $matches[2] ) ) {
$this->summary = "/* ". trim($matches[2])." */ ";
}
- }
+ }
}
} else {
$s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
}
$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' ) );
}
}
$minoredithtml = '';
- if ( $wgUser->isLoggedIn() || $wgAllowAnonymousMinor ) {
+ if ( $wgUser->isAllowed('minoredit') ) {
$minoredithtml =
"<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
" accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
if( !$this->preview && !$this->diff ) {
$wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
}
- $templates = $this->getTemplatesUsed();
+ $templates = $this->formatTemplates();
global $wgLivePreview;
if ( $wgLivePreview ) {
$metadata = $this->mMetaData ;
$metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
$helppage = Title::newFromText( wfMsg( "metadata_page" ) ) ;
- $top = wfMsg( 'metadata', $helppage->getInternalURL() );
+ $top = wfMsg( 'metadata', $helppage->getLocalURL() );
$metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
}
else $metadata = "" ;
if( is_callable( $formCallback ) ) {
call_user_func_array( $formCallback, array( &$wgOut ) );
}
+
+ // Put these up at the top to ensure they aren't lost on early form submission
+ $wgOut->addHTML( "
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<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" );
+
$wgOut->addHTML( <<<END
$recreate
{$commentsubject}
END
. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) .
"
-</textarea><br />
+</textarea>
+
+ " );
+
+ $wgOut->addWikiText( $copywarn );
+
+ $wgOut->addHTML( "
{$metadata}
{$editsummary}
{$checkboxhtml}
{$safemodehtml}
+");
+
+ $wgOut->addHTML( "
<div class='editButtons'>
<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
" title=\"".wfMsg('tooltip-save')."\"/>
<input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
" title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div>
</div>
+" );
+
+ $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+
+ $wgOut->addHTML( "
<div class='templatesUsed'>
{$templates}
</div>
" );
- $wgOut->addWikiText( $copywarn );
- $wgOut->addHTML( "
-<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
-<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() ) {
/**
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'>"
wfProfileOut( $fname );
}
-
+
/**
* Append preview output to $wgOut.
* Includes category rendering if this is a category page.
/**
* Prepare a list of templates used by this page. Returns HTML.
*/
- function getTemplatesUsed() {
+ function formatTemplates() {
global $wgUser;
- $fname = 'EditPage::getTemplatesUsed';
+ $fname = 'EditPage::formatTemplates';
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>';
- }
+ $outText = '';
+ $templates = $this->mArticle->getUsedTemplates();
+ if ( count( $templates ) > 0 ) {
+ # Do a batch existence check
+ $batch = new LinkBatch;
+ foreach( $templates as $title ) {
+ $batch->addObj( $title );
}
- $templates .= '</ul>';
+ $batch->execute();
+
+ # Construct the HTML
+ $outText = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
+ foreach ( $templates as $titleObj ) {
+ $outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
+ }
+ $outText .= '</ul>';
}
wfProfileOut( $fname );
- return $templates;
+ return $outText;
}
/**
* 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
+ * 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
+ *
+ * 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() {
'editform.wpTextbox1.value,' .
htmlspecialchars( '"' . $liveAction . '"' ) . ')"';
}
-
+
function getLastDelete() {
$dbr =& wfGetDB( DB_SLAVE );
$fname = 'EditPage::getLastDelete';
* @todo document
*/
function getPreviewText() {
- global $wgOut, $wgUser, $wgTitle, $wgParser, $wgAllowDiffPreview, $wgEnableDiffPreviewPreference;
+ global $wgOut, $wgUser, $wgTitle, $wgParser;
$fname = 'EditPage::getPreviewText';
wfProfileIn( $fname );
} else {
# if user want to see preview when he edit an article
if( $wgUser->getOption('previewonfirst') and ($this->textbox1 == '')) {
- $this->textbox1 = $this->mArticle->getContent(true);
+ $this->textbox1 = $this->mArticle->getContent();
}
$toparse = $this->textbox1;
-
+
# If we're adding a comment, we need to show the
# summary as the headline
if($this->section=="new" && $this->summary!="") {
$toparse="== {$this->summary} ==\n\n".$toparse;
}
-
+
if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
$parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
$wgTitle, $parserOptions );
- $previewHTML = $parserOutput->mText;
-
- $wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
- $wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
+ $previewHTML = $parserOutput->getText();
+ $wgOut->addParserOutputNoText( $parserOutput );
wfProfileOut( $fname );
return $previewhead . $previewHTML;
* @todo document
*/
function blockedIPpage() {
- global $wgOut, $wgUser, $wgContLang;
-
- $wgOut->setPageTitle( wfMsg( 'blockedtitle' ) );
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
-
- $id = $wgUser->blockedBy();
- $reason = $wgUser->blockedFor();
- $ip = wfGetIP();
-
- if ( is_numeric( $id ) ) {
- $name = User::whoIs( $id );
- } else {
- $name = $id;
- }
- $link = '[[' . $wgContLang->getNsText( NS_USER ) .
- ":{$name}|{$name}]]";
-
- $wgOut->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
- $wgOut->returnToMain( false );
+ global $wgOut;
+ $wgOut->blockedPage();
}
/**
* The necessary JavaScript code can be found in style/wikibits.js.
*/
function getEditToolbar() {
- global $wgStylePath, $wgLang, $wgMimeType, $wgJsMimeType;
+ global $wgStylePath, $wgContLang, $wgJsMimeType;
/**
* toolarray an array of arrays which each include the filename of
'key' => 'H'
),
array( 'image'=>'button_image.png',
- 'open' => '[['.$wgLang->getNsText(NS_IMAGE).":",
+ 'open' => '[['.$wgContLang->getNsText(NS_IMAGE).":",
'close' => ']]',
'sample'=> wfMsg('image_sample'),
'tip' => wfMsg('image_tip'),
'key' => 'D'
),
array( 'image' =>'button_media.png',
- 'open' => '[['.$wgLang->getNsText(NS_MEDIA).':',
+ 'open' => '[['.$wgContLang->getNsText(NS_MEDIA).':',
'close' => ']]',
'sample'=> wfMsg('media_sample'),
'tip' => wfMsg('media_tip'),
$this->section, $this->textbox1, $this->summary, $this->edittime );
$oldtitle = wfMsg( 'currentrev' );
$newtitle = wfMsg( 'yourtext' );
- if ( $oldtext != wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) || $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>';
? $this->unmakesafe( $text )
: $text;
}
-
+
/**
* Filter an output field through a Unicode armoring process if it is
* going to an old browser with known broken Unicode editing issues.
? $codedText
: $this->makesafe( $codedText );
}
-
+
/**
* A number of web browsers are known to corrupt non-ASCII characters
* in a UTF-8 text editing environment. To protect against this,
function makesafe( $invalue ) {
// Armor existing references for reversability.
$invalue = strtr( $invalue, array( "&#x" => "�" ) );
-
+
$bytesleft = 0;
$result = "";
$working = 0;
}
return $result;
}
-
+
/**
* Reverse the previously applied transliteration of non-ASCII characters
* back to UTF-8. Used to protect data from corruption by broken web browsers
$hexstring .= $invalue{$i};
$i++;
} while( ctype_xdigit( $invalue{$i} ) && ( $i < strlen( $invalue ) ) );
-
+
// Do some sanity checks. These aren't needed for reversability,
- // but should help keep the breakage down if the editor
+ // but should help keep the breakage down if the editor
// breaks one of the entities whilst editing.
- if ((substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6)) {
+ if ((substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6)) {
$codepoint = hexdec($hexstring);
$result .= codepointToUtf8( $codepoint );
} else {
// reverse the transform that we made for reversability reasons.
return strtr( $result, array( "�" => "&#x" ) );
}
-
+
+ function noCreatePermission() {
+ global $wgOut;
+ $wgOut->setPageTitle( wfMsg( 'nocreatetitle' ) );
+ $wgOut->addWikiText( wfMsg( 'nocreatetext' ) );
+ }
}
dépôts / lhc / web / wiklou.git / blobdiff