* To turn the feature on, set $wgUseMetadataEdit = true ; in LocalSettings
* and set $wgMetadataWhitelist to the *full* title of the template whitelist
*/
- function extractMetaDataFromArticle ()
- {
+ function extractMetaDataFromArticle () {
global $wgUseMetadataEdit , $wgMetadataWhitelist , $wgLang ;
$this->mMetaData = '' ;
if ( !$wgUseMetadataEdit ) return ;
- if ( $wgMetadataWhitelist == "" ) return ;
+ if ( $wgMetadataWhitelist == '' ) return ;
$s = '' ;
$t = $this->mArticle->getContent ( true ) ;
foreach ( $t AS $key => $x )
{
$y = trim ( strtolower ( $x ) ) ;
- while ( substr ( $y , 0 , 2 ) == "[[" )
+ while ( substr ( $y , 0 , 2 ) == '[[' )
{
- $y = explode ( "]]" , trim ( $x ) ) ;
+ $y = explode ( ']]' , trim ( $x ) ) ;
$first = array_shift ( $y ) ;
- $first = explode ( ":" , $first ) ;
+ $first = explode ( ':' , $first ) ;
$ns = array_shift ( $first ) ;
$ns = trim ( str_replace ( '[' , '' , $ns ) ) ;
if ( strlen ( $ns ) == 2 OR strtolower ( $ns ) == $catlow )
* This is the function that gets called for "action=edit".
*/
function edit() {
- global $wgOut, $wgUser, $wgWhitelistEdit, $wgRequest;
+ global $wgOut, $wgUser, $wgRequest;
// this is not an article
$wgOut->setArticleFlag(false);
$this->blockedIPpage();
return;
}
- if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
- $this->userNotLoggedInPage();
- return;
+ if ( !$wgUser->isAllowed('edit') ) {
+ if ( $wgUser->isAnon() ) {
+ $this->userNotLoggedInPage();
+ return;
+ } else {
+ $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+ return;
+ }
}
if ( wfReadOnly() ) {
if( $this->save || $this->preview ) {
} else if ( $this->diff ) {
$this->editForm( 'diff' );
} else { # First time through
- if( $wgUser->getOption('previewonfirst') ) {
+ if( $wgUser->getOption('previewonfirst')
+ or $this->mTitle->getNamespace() == NS_CATEGORY ) {
$this->editForm( 'preview', true );
} else {
$this->extractMetaDataFromArticle () ;
$this->textbox1 = rtrim( $request->getText( 'wpTextbox1' ) );
$this->textbox2 = rtrim( $request->getText( 'wpTextbox2' ) );
$this->mMetaData = rtrim( $request->getText( 'metadata' ) );
- $this->summary = trim( $request->getText( 'wpSummary' ) );
+ $this->summary = $request->getText( 'wpSummary' );
$this->edittime = $request->getVal( 'wpEdittime' );
if( is_null( $this->edittime ) ) {
global $wgOut, $wgUser;
global $wgLang, $wgContLang, $wgParser, $wgTitle;
global $wgAllowAnonymousMinor;
- global $wgWhitelistEdit;
global $wgSpamRegex, $wgFilterCallback;
$sk = $wgUser->getSkin();
$this->blockedIPpage();
return;
}
- if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
+
+ if ( !$wgUser->isAllowed('edit') ) {
+ if ( $wgUser->isAnon() ) {
$this->userNotLoggedInPage();
return;
}
+ else {
+ $wgOut->readOnlyPage();
+ return;
+ }
+ }
+
if ( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
+ if ( $wgUser->pingLimiter() ) {
+ $wgOut->rateLimited();
+ return;
+ }
# If article is new, insert it.
$aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
$userid = $wgUser->getID();
if ( $isConflict) {
- wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime'\n" );
+ 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);
}
# Suppress edit conflict with self
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( $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 ( $isConflict ) {
$s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
$wgOut->setPageTitle( $s );
- $wgOut->addHTML( wfMsg( 'explainconflict' ) );
+ $wgOut->addWikiText( wfMsg( 'explainconflict' ) );
$this->textbox2 = $this->textbox1;
$this->textbox1 = $this->mArticle->getContent( true );
} else {
$s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
}
- if(!$this->preview) {
+ if( !$this->preview && !$this->diff ) {
preg_match( "/^(=+)(.+)\\1/mi",
$this->textbox1,
$matches );
$this->mArticle->setOldSubtitle();
$wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
}
- if ( $this->oldid ) {
+ if ( isset( $this->mArticle )
+ && isset( $this->mArticle->mRevision )
+ && !$this->mArticle->mRevision->isCurrent() ) {
$this->mArticle->setOldSubtitle();
- $wgOut->addHTML( wfMsg( 'editingold' ) );
+ $wgOut->addWikiText( wfMsg( 'editingold' ) );
}
}
if( wfReadOnly() ) {
- $wgOut->addHTML( '<strong>' .
- wfMsg( 'readonlywarning' ) .
- "</strong>" );
+ $wgOut->addWikiText( wfMsg( 'readonlywarning' ) );
} else if ( $isCssJsSubpage and 'preview' != $formtype) {
- $wgOut->addHTML( wfMsg( 'usercssjsyoucanpreview' ));
+ $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ));
}
if( $this->mTitle->isProtected('edit') ) {
- $wgOut->addHTML( '<strong>' . wfMsg( 'protectedpagewarning' ) .
- "</strong><br />\n" );
+ $wgOut->addWikiText( wfMsg( 'protectedpagewarning' ) );
}
$kblength = (int)(strlen( $this->textbox1 ) / 1024);
if( $kblength > 29 ) {
- $wgOut->addHTML( '<strong>' .
- wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) )
- . '</strong>' );
+ $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) ) );
}
$rows = $wgUser->getOption( 'rows' );
$cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
wfMsg('cancel') );
- $edithelpurl = $sk->makeUrl( wfMsg( 'edithelppage' ));
+ $edithelpurl = $sk->makeInternalOrExternalUrl( wfMsg( 'edithelppage' ));
$edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '.
htmlspecialchars( wfMsg( 'newwindow' ) );
$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" );
}
}
$wgOut->addHTML( '</div>' );
if ( 'diff' == $formtype ) {
- $wgOut->addHTML( '<div id="wikiDiff">' );
- require_once( 'DifferenceEngine.php' );
- $oldtext = $this->mArticle->getContent( true );
- $newtext = $this->textbox1;
- $oldtitle = wfMsg( 'currentrev' );
- $newtitle = wfMsg( 'yourtext' );
-
- if ( $oldtext != wfMsg( 'noarticletext' ) || $newtext != '' ) {
- $difftext = DifferenceEngine::getDiff( $oldtext, $newtext, $oldtitle, $newtitle );
- }
if ( $wgUser->getOption('previewontop' ) ) {
- $wgOut->addHTML( $difftext );
- $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
+ $wgOut->addHTML( $this->getDiff() );
}
- $wgOut->addHTML( '</div>' );
}
$editsummary = '';
} else {
$commentsubject = '';
- $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
+ $editsummary="{$summary}: <input tabindex='2' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
}
if( !$this->preview && !$this->diff ) {
* it will fall through to the normal form submission method.
*/
if( $wgLivePreview ) {
- $wgOut->addHTML( '<script type="text/javascript" src="' .
+ global $wgJsMimeType;
+ $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
'"></script>' . "\n" );
$liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
<br />{$editsummary}
{$checkboxhtml}
<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
-" title=\"".wfMsg('tooltip-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='6' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
+<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}" );
$wgOut->addWikiText( $copywarn );
if ( $isConflict ) {
require_once( "DifferenceEngine.php" );
- $wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
+ $wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
- $wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
-<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
+ $wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' );
+ $wgOut->addHTML( "<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
. htmlspecialchars( $wgContLang->recodeForEdit( $this->textbox2 ) ) .
"
</textarea>" );
$wgOut->addHTML( '<div id="wikiPreview">' . $previewOutput . '</div>' );
}
if ( $formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
- $wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
+ #$wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
+ $wgOut->addHTML( $this->getDiff() );
}
}
$wgTitle, $parserOptions );
$previewHTML = $parserOutput->mText;
-
+
$wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
$wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
return $previewhead . $previewHTML;
* @access private
* @todo document
*/
- function mergeChangesInto( &$text ){
- $yourtext = $this->mArticle->fetchRevisionText();
+ function mergeChangesInto( &$editText ){
+ $db =& wfGetDB( DB_MASTER );
- $db =& wfGetDB( DB_SLAVE );
- $oldText = $this->mArticle->fetchRevisionText(
- $db->timestamp( $this->edittime ),
- 'rev_timestamp' );
+ // This is the revision the editor started from
+ $baseRevision = Revision::loadFromTimestamp(
+ $db, $this->mArticle->mTitle, $this->edittime );
+ if( is_null( $baseRevision ) ) {
+ return false;
+ }
+ $baseText = $baseRevision->getText();
+
+ // The current state, we want to merge updates into it
+ $currentRevision = Revision::loadFromTitle(
+ $db, $this->mArticle->mTitle );
+ if( is_null( $currentRevision ) ) {
+ return false;
+ }
+ $currentText = $currentRevision->getText();
- if(wfMerge($oldText, $text, $yourtext, $result)){
- $text = $result;
+ if( wfMerge( $baseText, $editText, $currentText, $result ) ){
+ $editText = $result;
return true;
} else {
return false;
* @access private
*/
function sectionAnchor( $text ) {
- global $wgInputEncoding;
- $headline = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
+ $headline = Sanitizer::decodeCharReferences( $text );
# strip out HTML
$headline = preg_replace( '/<.*?' . '>/', '', $headline );
$headline = trim( $headline );
* The necessary JavaScript code can be found in style/wikibits.js.
*/
function getEditToolbar() {
- global $wgStylePath, $wgLang, $wgMimeType;
+ global $wgStylePath, $wgLang, $wgMimeType, $wgJsMimeType;
/**
* toolarray an array of arrays which each include the filename of
'key' => 'R'
)
);
- $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
+ $toolbar ="<script type='$wgJsMimeType'>\n/*<![CDATA[*/\n";
$toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
foreach($toolarray as $tool) {
// Older browsers show a "speedtip" type message only for ALT.
// Ideally these should be different, realistically they
// probably don't need to be.
- $tip = addslashes( $tool['tip'] );
+ $tip = wfEscapeJsString( $tool['tip'] );
#$key = $tool["key"];
echo $this->getPreviewText( false, false );
}
+
+ /**
+ * Get a diff between the current contents of the edit box and the
+ * version of the page we're editing from.
+ *
+ * If this is a section edit, we'll replace the section as for final
+ * save and then make a comparison.
+ *
+ * @return string HTML
+ */
+ function getDiff() {
+ require_once( 'DifferenceEngine.php' );
+ $oldtext = $this->mArticle->fetchContent();
+ $newtext = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+ $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 );
+ }
+
+ return '<div id="wikiDiff">' . $difftext . '</div>';
+ }
+
}
?>
dépôts / lhc / web / wiklou.git / blobdiff