X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=65df005ab7f55cd902ec00dae4c682b884e69adf;hb=51c6afc751e5e038952ef1fc325676489bbb08fd;hp=2cc94d54b37ab39dcfe83d4a6da645217003a27f;hpb=efb7949d704d802fdd5c79b34f46e6bd3abd1bab;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/EditPage.php b/includes/EditPage.php index 2cc94d54b3..65df005ab7 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -49,7 +49,7 @@ class EditPage { var $isCssJsSubpage = false; var $isCssSubpage = false; var $isJsSubpage = false; - var $deletedSinceEdit = false; + var $deletedSinceEdit; var $formtype; var $firsttime; var $lastDelete; @@ -96,7 +96,7 @@ class EditPage { * @todo document * @param $article */ - function EditPage( $article ) { + function __construct( $article ) { $this->mArticle =& $article; $this->mTitle = $article->getTitle(); $this->action = 'submit'; @@ -124,7 +124,7 @@ class EditPage { * @private */ function getContent( $def_text = '' ) { - global $wgOut, $wgRequest, $wgParser, $wgContLang, $wgMessageCache; + global $wgOut, $wgRequest, $wgParser, $wgContLang; wfProfileIn( __METHOD__ ); # Get variables from query string :P @@ -136,14 +136,12 @@ class EditPage { $undoafter = $wgRequest->getVal( 'undoafter' ); $undo = $wgRequest->getVal( 'undo' ); - $text = ''; // For message page not locally set, use the i18n message. // For other non-existent articles, use preload text if any. if ( !$this->mTitle->exists() ) { if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { # If this is a system message, get the default text. - list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); - $wgMessageCache->loadAllMessages( $lang ); + list( $message, $lang ) = MessageCache::singleton()->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); $text = wfMsgGetKey( $message, false, $lang, false ); if( wfEmptyMsg( $message, $text ) ) $text = $this->getPreloadedText( $preload ); @@ -262,8 +260,12 @@ class EditPage { * deletes. */ protected function wasDeletedSinceLastEdit() { - if ( $this->deletedSinceEdit ) - return true; + if ( $this->deletedSinceEdit !== null ) { + return $this->deletedSinceEdit; + } + + $this->deletedSinceEdit = false; + if ( $this->mTitle->isDeletedQuick() ) { $this->lastDelete = $this->getLastDelete(); if ( $this->lastDelete ) { @@ -273,9 +275,28 @@ class EditPage { } } } + return $this->deletedSinceEdit; } + /** + * Checks whether the user entered a skin name in uppercase, + * e.g. "User:Example/Monobook.css" instead of "monobook.css" + */ + protected function isWrongCaseCssJsPage() { + if( $this->mTitle->isCssJsSubpage() ) { + $name = $this->mTitle->getSkinFromCssJsSubpage(); + $skins = array_merge( + array_keys( Skin::getSkinNames() ), + array( 'common' ) + ); + return !in_array( $name, $skins ) + && in_array( strtolower( $name ), $skins ); + } else { + return false; + } + } + function submit() { $this->edit(); } @@ -319,19 +340,18 @@ class EditPage { $this->preview = true; } - $wgOut->addScriptFile( 'edit.js' ); + $wgOut->addModules( array( 'mediawiki.legacy.edit', 'mediawiki.action.edit' ) ); if ( $wgUser->getOption( 'uselivepreview', false ) ) { - $wgOut->includeJQuery(); - $wgOut->addScriptFile( 'preview.js' ); + $wgOut->addModules( 'mediawiki.legacy.preview' ); } - // Bug #19334: textarea jumps when editing articles in IE8 - $wgOut->addStyle( 'common/IE80Fixes.css', 'screen', 'IE 8' ); $permErrors = $this->getEditPermissionErrors(); if ( $permErrors ) { wfDebug( __METHOD__ . ": User can't edit\n" ); - $this->readOnlyPage( $this->getContent( false ), true, $permErrors, 'edit' ); + $content = $this->getContent( null ); + $content = $content === '' ? null : $content; + $this->readOnlyPage( $content, true, $permErrors, 'edit' ); wfProfileOut( __METHOD__ ); return; } else { @@ -363,7 +383,7 @@ class EditPage { $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); $this->isCssSubpage = $this->mTitle->isCssSubpage(); $this->isJsSubpage = $this->mTitle->isJsSubpage(); - $this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage(); + $this->isWrongCaseCssJsPage = $this->isWrongCaseCssJsPage(); # Show applicable editing introductions if ( $this->formtype == 'initial' || $this->firsttime ) @@ -375,16 +395,18 @@ class EditPage { # Optional notices on a per-namespace and per-page basis $editnotice_ns = 'editnotice-'.$this->mTitle->getNamespace(); - if ( !wfEmptyMsg( $editnotice_ns, wfMsgForContent( $editnotice_ns ) ) ) { - $wgOut->addWikiText( wfMsgForContent( $editnotice_ns ) ); + $editnotice_ns_message = wfMessage( $editnotice_ns )->inContentLanguage(); + if ( $editnotice_ns_message->exists() ) { + $wgOut->addWikiText( $editnotice_ns_message->plain() ); } if ( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) { $parts = explode( '/', $this->mTitle->getDBkey() ); $editnotice_base = $editnotice_ns; while ( count( $parts ) > 0 ) { $editnotice_base .= '-'.array_shift( $parts ); - if ( !wfEmptyMsg( $editnotice_base, wfMsgForContent( $editnotice_base ) ) ) { - $wgOut->addWikiText( wfMsgForContent( $editnotice_base ) ); + $editnotice_base_msg = wfMessage( $editnotice_base )->inContentLanguage(); + if ( $editnotice_base_msg->exists() ) { + $wgOut->addWikiText( $editnotice_base_msg->plain() ); } } } @@ -542,7 +564,7 @@ class EditPage { } # Truncate for whole multibyte characters. +5 bytes for ellipsis - $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250, '' ); + $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 ); # Remove extra headings from summaries and new sections. $this->summary = preg_replace('/^\s*=+\s*(.*?)\s*=+\s*$/', '$1', $this->summary); @@ -749,8 +771,8 @@ class EditPage { $title = Title::newFromText( $this->editintro ); if ( $title instanceof Title && $title->exists() && $title->userCanRead() ) { global $wgOut; - $revision = Revision::newFromTitle( $title ); - $wgOut->addWikiTextTitleTidy( $revision->getText(), $this->mTitle ); + // Added using template syntax, to take 's into account. + $wgOut->addWikiTextTitleTidy( '{{:' . $title->getFullText() . '}}', $this->mTitle ); return true; } else { return false; @@ -765,7 +787,7 @@ class EditPage { * @return one of the constants describing the result */ function internalAttemptSave( &$result, $bot = false ) { - global $wgFilterCallback, $wgUser, $wgOut, $wgParser; + global $wgFilterCallback, $wgUser, $wgParser; global $wgMaxArticleSize; wfProfileIn( __METHOD__ ); @@ -868,8 +890,10 @@ class EditPage { wfProfileOut( __METHOD__ . '-checks' ); # If article is new, insert it. - $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); - if ( 0 == $aid ) { + $aid = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE ); + $new = ( $aid == 0 ); + + if ( $new ) { // Late check for create permission, just in case *PARANOIA* if ( !$this->mTitle->userCan( 'create' ) ) { wfDebug( __METHOD__ . ": no create permission\n" ); @@ -903,154 +927,149 @@ class EditPage { } } - $isComment = ( $this->section == 'new' ); + $text = $this->textbox1; + if ( $this->section == 'new' && $this->summary != '' ) { + $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $this->summary ) . "\n\n" . $text; + } - $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY | - ( $this->minoredit ? EDIT_MINOR : 0 ) | - ( $bot ? EDIT_FORCE_BOT : 0 ); - $status = $this->mArticle->doEdit( $this->textbox1, $this->summary, $flags, - false, null, $this->watchthis, $isComment, '', true ); + $retval = self::AS_SUCCESS_NEW_ARTICLE; - if ( $status->isOK() ) { - wfProfileOut( __METHOD__ ); - return self::AS_SUCCESS_NEW_ARTICLE; - } else { - $result = $status->getErrorsArray(); - } - wfProfileOut( __METHOD__ ); - return self::AS_END; - } + } else { - # Article exists. Check for edit conflict. + # Article exists. Check for edit conflict. - $this->mArticle->clear(); # Force reload of dates, etc. - $this->mArticle->forUpdate( true ); # Lock the article + $this->mArticle->clear(); # Force reload of dates, etc. + $this->mArticle->forUpdate( true ); # Lock the article - wfDebug( "timestamp: {$this->mArticle->getTimestamp()}, edittime: {$this->edittime}\n" ); + wfDebug( "timestamp: {$this->mArticle->getTimestamp()}, edittime: {$this->edittime}\n" ); - 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( __METHOD__ . ": duplicate new section submission; trigger edit conflict!\n" ); - } else { - // New comment; suppress conflict. - $this->isConflict = false; - wfDebug( __METHOD__ .": conflict suppressed; new section\n" ); + 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( __METHOD__ . ": duplicate new section submission; trigger edit conflict!\n" ); + } else { + // New comment; suppress conflict. + $this->isConflict = false; + wfDebug( __METHOD__ .": conflict suppressed; new section\n" ); + } } } - } - $userid = $wgUser->getId(); + $userid = $wgUser->getId(); - # Suppress edit conflict with self, except for section edits where merging is required. - if ( $this->isConflict && $this->section == '' && $this->userWasLastToEdit( $userid, $this->edittime ) ) { - wfDebug( __METHOD__ . ": Suppressing edit conflict, same user.\n" ); - $this->isConflict = false; - } - - if ( $this->isConflict ) { - wfDebug( __METHOD__ . ": 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( __METHOD__ . ": getting section '$this->section'\n" ); - $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary ); - } - if ( is_null( $text ) ) { - wfDebug( __METHOD__ . ": activating conflict; section replace failed.\n" ); - $this->isConflict = true; - $text = $this->textbox1; // do not try to merge here! - } else if ( $this->isConflict ) { - # Attempt merge - if ( $this->mergeChangesInto( $text ) ) { - // Successful merge! Maybe we should tell the user the good news? + # Suppress edit conflict with self, except for section edits where merging is required. + if ( $this->isConflict && $this->section == '' && $this->userWasLastToEdit( $userid, $this->edittime ) ) { + wfDebug( __METHOD__ . ": Suppressing edit conflict, same user.\n" ); $this->isConflict = false; - wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" ); - } else { - $this->section = ''; - $this->textbox1 = $text; - wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" ); } - } - - if ( $this->isConflict ) { - wfProfileOut( __METHOD__ ); - return self::AS_CONFLICT_DETECTED; - } - - $oldtext = $this->mArticle->getContent(); - // Run post-section-merge edit filter - if ( !wfRunHooks( 'EditFilterMerged', array( $this, $text, &$this->hookError, $this->summary ) ) ) { - # Error messages etc. could be handled within the hook... - wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR; - } elseif ( $this->hookError != '' ) { - # ...or the hook could be expecting us to produce an error - wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR_EXPECTED; - } + if ( $this->isConflict ) { + wfDebug( __METHOD__ . ": 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( __METHOD__ . ": getting section '$this->section'\n" ); + $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary ); + } + if ( is_null( $text ) ) { + wfDebug( __METHOD__ . ": activating conflict; section replace failed.\n" ); + $this->isConflict = true; + $text = $this->textbox1; // do not try to merge here! + } else if ( $this->isConflict ) { + # Attempt merge + if ( $this->mergeChangesInto( $text ) ) { + // Successful merge! Maybe we should tell the user the good news? + $this->isConflict = false; + wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" ); + } else { + $this->section = ''; + $this->textbox1 = $text; + wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" ); + } + } - # Handle the user preference to force summaries here, but not for null edits - if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp( $oldtext, $text ) - && !Title::newFromRedirect( $text ) ) # check if it's not a redirect - { - if ( md5( $this->summary ) == $this->autoSumm ) { - $this->missingSummary = true; + if ( $this->isConflict ) { wfProfileOut( __METHOD__ ); - return self::AS_SUMMARY_NEEDED; + return self::AS_CONFLICT_DETECTED; } - } - # And a similar thing for new sections - if ( $this->section == 'new' && !$this->allowBlankSummary ) { - if ( trim( $this->summary ) == '' ) { - $this->missingSummary = true; + $oldtext = $this->mArticle->getContent(); + + // Run post-section-merge edit filter + if ( !wfRunHooks( 'EditFilterMerged', array( $this, $text, &$this->hookError, $this->summary ) ) ) { + # Error messages etc. could be handled within the hook... wfProfileOut( __METHOD__ ); - return self::AS_SUMMARY_NEEDED; + return self::AS_HOOK_ERROR; + } elseif ( $this->hookError != '' ) { + # ...or the hook could be expecting us to produce an error + wfProfileOut( __METHOD__ ); + return self::AS_HOOK_ERROR_EXPECTED; } - } - # All's well - wfProfileIn( __METHOD__ . '-sectionanchor' ); - $sectionanchor = ''; - if ( $this->section == 'new' ) { - if ( $this->textbox1 == '' ) { - $this->missingComment = true; - wfProfileOut( __METHOD__ . '-sectionanchor' ); - wfProfileOut( __METHOD__ ); - return self::AS_TEXTBOX_EMPTY; + # Handle the user preference to force summaries here, but not for null edits + if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp( $oldtext, $text ) + && !Title::newFromRedirect( $text ) ) # check if it's not a redirect + { + if ( md5( $this->summary ) == $this->autoSumm ) { + $this->missingSummary = true; + wfProfileOut( __METHOD__ ); + return self::AS_SUMMARY_NEEDED; + } } - if ( $this->summary != '' ) { - $sectionanchor = $wgParser->guessSectionNameFromWikiText( $this->summary ); - # This is a new section, so create a link to the new section - # in the revision summary. - $cleanSummary = $wgParser->stripSectionName( $this->summary ); - $this->summary = wfMsgForContent( 'newsectionsummary', $cleanSummary ); + + # And a similar thing for new sections + if ( $this->section == 'new' && !$this->allowBlankSummary ) { + if ( trim( $this->summary ) == '' ) { + $this->missingSummary = true; + wfProfileOut( __METHOD__ ); + return self::AS_SUMMARY_NEEDED; + } } - } 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 = $wgParser->guessSectionNameFromWikiText( $matches[2] ); + + # All's well + wfProfileIn( __METHOD__ . '-sectionanchor' ); + $sectionanchor = ''; + if ( $this->section == 'new' ) { + if ( $this->textbox1 == '' ) { + $this->missingComment = true; + wfProfileOut( __METHOD__ . '-sectionanchor' ); + wfProfileOut( __METHOD__ ); + return self::AS_TEXTBOX_EMPTY; + } + if ( $this->summary != '' ) { + $sectionanchor = $wgParser->guessLegacySectionNameFromWikiText( $this->summary ); + # This is a new section, so create a link to the new section + # in the revision summary. + $cleanSummary = $wgParser->stripSectionName( $this->summary ); + $this->summary = wfMsgForContent( 'newsectionsummary', $cleanSummary ); + } + } 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 = $wgParser->guessLegacySectionNameFromWikiText( $matches[2] ); + } } - } - wfProfileOut( __METHOD__ . '-sectionanchor' ); + $result['sectionanchor'] = $sectionanchor; + wfProfileOut( __METHOD__ . '-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 = ''; + // 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 = ''; + + $retval = self::AS_SUCCESS_UPDATE; + } // Check for length errors again now that the section is merged in $this->kblength = (int)( strlen( $text ) / 1024 ); @@ -1060,23 +1079,39 @@ class EditPage { return self::AS_MAX_ARTICLE_SIZE_EXCEEDED; } - // Update the article here - $flags = EDIT_UPDATE | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY | + $flags = EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY | + ( $new ? EDIT_NEW : EDIT_UPDATE ) | ( $this->minoredit ? EDIT_MINOR : 0 ) | ( $bot ? EDIT_FORCE_BOT : 0 ); - $status = $this->mArticle->doEdit( $text, $this->summary, $flags, - false, null, $this->watchthis, false, $sectionanchor, true ); - if ( $status->isOK() ) - { + $status = $this->mArticle->doEdit( $text, $this->summary, $flags ); + + if ( $status->isOK() ) { + $result['redirect'] = Title::newFromRedirect( $text ) !== null; + $this->commitWatch(); wfProfileOut( __METHOD__ ); - return self::AS_SUCCESS_UPDATE; + return $retval; } else { $this->isConflict = true; - $result = $status->getErrorsArray(); + wfProfileOut( __METHOD__ ); + return self::AS_END; + } + } + + /** + * Commit the change of watch status + */ + protected function commitWatch() { + if ( $this->watchthis xor $this->mTitle->userIsWatching() ) { + $dbw = wfGetDB( DB_MASTER ); + $dbw->begin(); + if ( $this->watchthis ) { + $this->mArticle->doWatch(); + } else { + $this->mArticle->doUnwatch(); + } + $dbw->commit(); } - wfProfileOut( __METHOD__ ); - return self::AS_END; } /** @@ -1095,7 +1130,7 @@ class EditPage { ), __METHOD__, array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ) ); - while( $row = $res->fetchObject() ) { + foreach ( $res as $row ) { if( $row->rev_user != $id ) { return false; } @@ -1155,6 +1190,7 @@ class EditPage { # Already watched $this->watchthis = true; } + if ( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true; if ( $this->textbox1 === false ) return false; wfProxyCheck(); return true; @@ -1189,7 +1225,7 @@ class EditPage { * parameter; will be called during form output * near the top, for captchas and the like. */ - function showEditForm( $formCallback=null ) { + function showEditForm( $formCallback = null ) { global $wgOut, $wgUser, $wgTitle; # If $wgTitle is null, that means we're in API mode. @@ -1222,7 +1258,7 @@ class EditPage { if ( $this->showHeader() === false ) return; - $action = htmlspecialchars($this->getActionURL($wgTitle)); + $action = htmlspecialchars( $this->getActionURL( $wgTitle ) ); if ( $wgUser->getOption( 'showtoolbar' ) and !$this->isCssJsSubpage ) { # prepare toolbar for edit buttons @@ -1272,9 +1308,14 @@ HTML $this->showFormBeforeText(); if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) { + $username = $this->lastDelete->user_name; + $comment = $this->lastDelete->log_comment; + + // It is better to not parse the comment at all than to have templates expanded in the middle + // TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used? $wgOut->addHTML( '
' . - $wgOut->parse( wfMsg( 'confirmrecreate', $this->lastDelete->user_name , $this->lastDelete->log_comment ) ) . + wfMsgExt( 'confirmrecreate', 'parseinline', $username, "$comment" ) . Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false, array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' ) ) . @@ -1291,11 +1332,11 @@ HTML # automatic one and pass that in the hidden field wpAutoSummary. if ( $this->missingSummary || ( $this->section == 'new' && $this->nosummary ) ) - $wgOut->addHTML( Xml::hidden( 'wpIgnoreBlankSummary', true ) ); + $wgOut->addHTML( Html::hidden( 'wpIgnoreBlankSummary', true ) ); $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); - $wgOut->addHTML( Xml::hidden( 'wpAutoSummary', $autosumm ) ); + $wgOut->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) ); - $wgOut->addHTML( Xml::hidden( 'oldid', $this->mArticle->getOldID() ) ); + $wgOut->addHTML( Html::hidden( 'oldid', $this->mArticle->getOldID() ) ); if ( $this->section == 'new' ) { $this->showSummaryInput( true, $this->summary ); @@ -1424,7 +1465,7 @@ HTML } else { if ( $this->isCssJsSubpage ) { # Check the skin exists - if ( !$this->isValidCssJsSubpage ) { + if ( $this->isWrongCaseCssJsPage ) { $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'userinvalidcssjstitle', $wgTitle->getSkinFromCssJsSubpage() ) ); } if ( $this->formtype !== 'preview' ) { @@ -1474,13 +1515,14 @@ HTML } if ( $this->tooBig || $this->kblength > $wgMaxArticleSize ) { - $wgOut->addHTML( "
\n" ); - $wgOut->addWikiMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgLang->formatNum( $wgMaxArticleSize ) ); - $wgOut->addHTML( "
\n" ); - } elseif ( $this->kblength > 29 ) { - $wgOut->addHTML( "
\n" ); - $wgOut->addWikiMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ); - $wgOut->addHTML( "
\n" ); + $wgOut->wrapWikiMsg( "
\n$1\n
", + array( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgLang->formatNum( $wgMaxArticleSize ) ) ); + } else { + if( !wfMessage('longpage-hint')->isDisabled() ) { + $wgOut->wrapWikiMsg( "
\n$1\n
", + array( 'longpage-hint', $wgLang->formatSize( strlen( $this->textbox1 ) ), strlen( $this->textbox1 ) ) + ); + } } } @@ -1575,16 +1617,16 @@ HTML protected function showFormBeforeText() { global $wgOut; $section = htmlspecialchars( $this->section ); - $wgOut->addHTML( <<addHTML( << -INPUTS +HTML ); if ( !$this->checkUnicodeCompliantBrowser() ) - $wgOut->addHTML(Xml::hidden( 'safemode', '1' )); + $wgOut->addHTML(Html::hidden( 'safemode', '1' )); } protected function showFormAfterText() { @@ -1601,7 +1643,7 @@ INPUTS * include the constant suffix to prevent editing from * broken text-mangling proxies. */ - $wgOut->addHTML( "\n" . Xml::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" ); + $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" ); } /** @@ -1611,8 +1653,6 @@ INPUTS * be it a form, or simply wpTextbox1 with a modified content that will be * reverse modified when extracted from the post data. * Note that this is basically the inverse for importContentFormData - * - * @param $request WebRequest */ protected function showContentForm() { $this->showTextbox1(); @@ -1734,8 +1774,7 @@ INPUTS protected function showTosSummary() { $msg = 'editpage-tos-summary'; wfRunHooks( 'EditPageTosSummary', array( $this->mTitle, &$msg ) ); - $text = wfMsg( $msg ); - if( !wfEmptyMsg( $msg, $text ) && $text !== '-' ) { + if( !wfMessage( $msg )->isDisabled() ) { global $wgOut; $wgOut->addHTML( '
' ); $wgOut->addWikiMsgArray( $msg, array() ); @@ -1848,7 +1887,7 @@ INPUTS * @return string */ function getPreviewText() { - global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang, $wgMessageCache; + global $wgOut, $wgUser, $wgParser; wfProfileIn( __METHOD__ ); @@ -1876,49 +1915,64 @@ INPUTS } # don't parse user css/js, show message about preview - # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here + # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here -- This note has been there since r3530. Sure the bug was fixed time ago? - if ( $this->isCssJsSubpage ) { + if ( $this->isCssJsSubpage || $this->mTitle->isCssOrJsPage() ) { + $level = 'user'; + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + $level = 'site'; + } + + # Used messages to make sure grep find them: + # Messages: usercsspreview, userjspreview, sitecsspreview, sitejspreview if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) { - $previewtext = "
\n" . wfMsg( 'usercsspreview' ) . "\n
"; - } else if (preg_match( "/\\.js$/", $this->mTitle->getText() ) ) { - $previewtext = "
\n" . wfMsg( 'userjspreview' ) . "\n
"; + $previewtext = "
\n" . wfMsg( "{$level}csspreview" ) . "\n
"; + $class = "mw-code mw-css"; + } elseif (preg_match( "/\\.js$/", $this->mTitle->getText() ) ) { + $previewtext = "
\n" . wfMsg( "{$level}jspreview" ) . "\n
"; + $class = "mw-code mw-js"; + } else { + throw new MWException( 'A CSS/JS (sub)page but which is not css nor js!' ); } + $parserOptions->setTidy( true ); $parserOutput = $wgParser->parse( $previewtext, $this->mTitle, $parserOptions ); $previewHTML = $parserOutput->mText; - } elseif ( $rt = Title::newFromRedirectArray( $this->textbox1 ) ) { - $previewHTML = $this->mArticle->viewRedirect( $rt, false ); + $previewHTML .= "
\n" . htmlspecialchars( $this->textbox1 ) . "\n
\n"; } else { - $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; - } + $rt = Title::newFromRedirectArray( $this->textbox1 ); + if ( $rt ) { + $previewHTML = $this->mArticle->viewRedirect( $rt, false ); + } else { + $toparse = $this->textbox1; - wfRunHooks( 'EditPageGetPreviewText', array( $this, &$toparse ) ); + # 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; + } - // Parse mediawiki messages with correct target language - if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - list( /* $unused */, $lang ) = $wgMessageCache->figureMessage( $this->mTitle->getText() ); - $obj = wfGetLangObj( $lang ); - $parserOptions->setTargetLanguage( $obj ); - } + wfRunHooks( 'EditPageGetPreviewText', array( $this, &$toparse ) ); + // Parse mediawiki messages with correct target language + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + list( /* $unused */, $lang ) = MessageCache::singleton()->figureMessage( $this->mTitle->getText() ); + $obj = wfGetLangObj( $lang ); + $parserOptions->setTargetLanguage( $obj ); + } - $parserOptions->setTidy( true ); - $parserOptions->enableLimitReport(); - $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ), + $parserOptions->setTidy( true ); + $parserOptions->enableLimitReport(); + $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ), $this->mTitle, $parserOptions ); - $previewHTML = $parserOutput->getText(); - $this->mParserOutput = $parserOutput; - $wgOut->addParserOutputNoText( $parserOutput ); + $previewHTML = $parserOutput->getText(); + $this->mParserOutput = $parserOutput; + $wgOut->addParserOutputNoText( $parserOutput ); - if ( count( $parserOutput->getWarnings() ) ) { - $note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() ); + if ( count( $parserOutput->getWarnings() ) ) { + $note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() ); + } } } @@ -2021,8 +2075,9 @@ INPUTS * Produce the stock "your edit contains spam" page * * @param $match Text which triggered one or more filters + * @deprecated Use method spamPageWithContent() instead */ - function spamPage( $match = false ) { + static function spamPage( $match = false ) { global $wgOut, $wgTitle; $wgOut->setPageTitle( wfMsg( 'spamprotectiontitle' ) ); @@ -2031,13 +2086,46 @@ INPUTS $wgOut->addHTML( '
' ); $wgOut->addWikiMsg( 'spamprotectiontext' ); - if ( $match ) + if ( $match ) { $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) ); + } $wgOut->addHTML( '
' ); $wgOut->returnToMain( false, $wgTitle ); } + /** + * Show "your edit contains spam" page with your diff and text + * + * @param $match Text which triggered one or more filters + */ + public function spamPageWithContent( $match = false ) { + global $wgOut, $wgTitle; + $this->textbox2 = $this->textbox1; + + $wgOut->setPageTitle( wfMsg( 'spamprotectiontitle' ) ); + $wgOut->setRobotPolicy( 'noindex,nofollow' ); + $wgOut->setArticleRelated( false ); + + $wgOut->addHTML( '
' ); + $wgOut->addWikiMsg( 'spamprotectiontext' ); + if ( $match ) { + $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) ); + } + $wgOut->addHTML( '
' ); + + $wgOut->wrapWikiMsg( '

$1

', "yourdiff" ); + $de = new DifferenceEngine( $this->mTitle ); + $de->setText( $this->getContent(), $this->textbox2 ); + $de->showDiff( wfMsg( "storedversion" ), wfMsg( "yourtext" ) ); + + $wgOut->wrapWikiMsg( '

$1

', "yourtext" ); + $this->showTextbox2(); + + $wgOut->addReturnTo( $wgTitle, array( 'action' => 'edit' ) ); + } + + /** * @private * @todo document @@ -2123,7 +2211,10 @@ INPUTS * @return string */ static function getEditToolbar() { - global $wgStylePath, $wgContLang, $wgLang; + global $wgStylePath, $wgContLang, $wgLang, $wgOut; + global $wgUseTeX, $wgEnableUploads, $wgForeignFileRepos; + + $imagesAvailable = $wgEnableUploads || count( $wgForeignFileRepos ); /** @@ -2183,7 +2274,7 @@ INPUTS 'tip' => wfMsg( 'headline_tip' ), 'key' => 'H' ), - array( + $imagesAvailable ? array( 'image' => $wgLang->getImageFile( 'button-image' ), 'id' => 'mw-editbutton-image', 'open' => '[[' . $wgContLang->getNsText( NS_FILE ) . ':', @@ -2191,8 +2282,8 @@ INPUTS 'sample' => wfMsg( 'image_sample' ), 'tip' => wfMsg( 'image_tip' ), 'key' => 'D' - ), - array( + ) : false, + $imagesAvailable ? array( 'image' => $wgLang->getImageFile( 'button-media' ), 'id' => 'mw-editbutton-media', 'open' => '[[' . $wgContLang->getNsText( NS_MEDIA ) . ':', @@ -2200,8 +2291,8 @@ INPUTS 'sample' => wfMsg( 'media_sample' ), 'tip' => wfMsg( 'media_tip' ), 'key' => 'M' - ), - array( + ) : false, + $wgUseTeX ? array( 'image' => $wgLang->getImageFile( 'button-math' ), 'id' => 'mw-editbutton-math', 'open' => "", @@ -2209,7 +2300,7 @@ INPUTS 'sample' => wfMsg( 'math_sample' ), 'tip' => wfMsg( 'math_tip' ), 'key' => 'C' - ), + ) : false, array( 'image' => $wgLang->getImageFile( 'button-nowiki' ), 'id' => 'mw-editbutton-nowiki', @@ -2242,6 +2333,10 @@ INPUTS $script = ''; foreach ( $toolarray as $tool ) { + if ( !$tool ) { + continue; + } + $params = array( $image = $wgStylePath . '/common/images/' . $tool['image'], // Note that we use the tip both for the ALT tag and the TITLE tag of the image. @@ -2259,8 +2354,11 @@ INPUTS array_map( array( 'Xml', 'encodeJsVar' ), $params ) ); $script .= "addButton($paramList);\n"; } - $toolbar .= Html::inlineScript( "\n$script\n" ); - + + $wgOut->addScript( Html::inlineScript( + "if ( window.mediaWiki ) { $script }" + ) ); + $toolbar .= "\n
"; wfRunHooks( 'EditPageBeforeEditToolbar', array( &$toolbar ) ); @@ -2294,7 +2392,9 @@ INPUTS ); $checkboxes['minor'] = Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) . - " "; + " "; } $watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) ); @@ -2307,7 +2407,9 @@ INPUTS ); $checkboxes['watch'] = Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) . - " "; + " "; } wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) ); return $checkboxes; @@ -2321,7 +2423,7 @@ INPUTS * * @return array */ - public function getEditButtons(&$tabindex) { + public function getEditButtons( &$tabindex ) { $buttons = array(); $temp = array( @@ -2598,12 +2700,32 @@ INPUTS case self::AS_HOOK_ERROR: case self::AS_FILTERING: + return false; + case self::AS_SUCCESS_NEW_ARTICLE: + $query = $resultDetails['redirect'] ? 'redirect=no' : ''; + $wgOut->redirect( $this->mTitle->getFullURL( $query ) ); + return false; + case self::AS_SUCCESS_UPDATE: + $extraQuery = ''; + $sectionanchor = $resultDetails['sectionanchor']; + + // Give extensions a chance to modify URL query on update + wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this->mArticle, &$sectionanchor, &$extraQuery ) ); + + if ( $resultDetails['redirect'] ) { + if ( $extraQuery == '' ) { + $extraQuery = 'redirect=no'; + } else { + $extraQuery = 'redirect=no&' . $extraQuery; + } + } + $wgOut->redirect( $this->mTitle->getFullURL( $extraQuery ) . $sectionanchor ); return false; case self::AS_SPAM_ERROR: - $this->spamPage( $resultDetails['spam'] ); + $this->spamPageWithContent( $resultDetails['spam'] ); return false; case self::AS_BLOCKED_PAGE_FOR_USER: