X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=8df876a2f0794f885d19828fb3a87f53f49f2a46;hb=40589a98d7743ae0726de1321f0933f4aae8720f;hp=c2ced80cfe1217043475b6cc139f235ecf0e1741;hpb=a67787f7487fb05199158d55c574f063227d364f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/EditPage.php b/includes/EditPage.php index c2ced80cfe..8df876a2f0 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1,6 +1,7 @@ mTitle (as well as $mArticle) is the + * page in the database that is actually being edited. These are + * usually the same, but they are now allowed to be different. */ class EditPage { + const AS_SUCCESS_UPDATE = 200; + const AS_SUCCESS_NEW_ARTICLE = 201; + const AS_HOOK_ERROR = 210; + const AS_FILTERING = 211; + const AS_HOOK_ERROR_EXPECTED = 212; + const AS_BLOCKED_PAGE_FOR_USER = 215; + const AS_CONTENT_TOO_BIG = 216; + const AS_USER_CANNOT_EDIT = 217; + const AS_READ_ONLY_PAGE_ANON = 218; + const AS_READ_ONLY_PAGE_LOGGED = 219; + const AS_READ_ONLY_PAGE = 220; + const AS_RATE_LIMITED = 221; + const AS_ARTICLE_WAS_DELETED = 222; + const AS_NO_CREATE_PERMISSION = 223; + const AS_BLANK_ARTICLE = 224; + const AS_CONFLICT_DETECTED = 225; + const AS_SUMMARY_NEEDED = 226; + const AS_TEXTBOX_EMPTY = 228; + const AS_MAX_ARTICLE_SIZE_EXCEEDED = 229; + const AS_OK = 230; + const AS_END = 231; + const AS_SPAM_ERROR = 232; + const AS_IMAGE_REDIRECT_ANON = 233; + const AS_IMAGE_REDIRECT_LOGGED = 234; + var $mArticle; var $mTitle; var $mMetaData = ''; @@ -42,32 +74,39 @@ class EditPage { # extensions should take care to _append_ to the present value public $editFormPageTop; // Before even the preview public $editFormTextTop; + public $editFormTextBeforeContent; public $editFormTextAfterWarn; public $editFormTextAfterTools; public $editFormTextBottom; + /* $didSave should be set to true whenever an article was succesfully altered. */ + public $didSave = false; + + public $suppressIntro = false; + /** * @todo document * @param $article */ function EditPage( $article ) { $this->mArticle =& $article; - global $wgTitle; - $this->mTitle =& $wgTitle; + $this->mTitle = $article->getTitle(); # Placeholders for text injection by hooks (empty per default) $this->editFormPageTop = $this->editFormTextTop = + $this->editFormTextBeforeContent = $this->editFormTextAfterWarn = $this->editFormTextAfterTools = $this->editFormTextBottom = ""; } - + /** * Fetch initial editing page content. + * @private */ - private function getContent( $def_text = '' ) { - global $wgOut, $wgRequest, $wgParser; + function getContent( $def_text = '' ) { + global $wgOut, $wgRequest, $wgParser, $wgMessageCache; # Get variables from query string :P $section = $wgRequest->getVal( 'section' ); @@ -80,7 +119,8 @@ class EditPage { $text = ''; if( !$this->mTitle->exists() ) { if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - # If this is a system message, get the default text. + $wgMessageCache->loadAllMessages(); + # If this is a system message, get the default text. $text = wfMsgWeirdKey ( $this->mTitle->getText() ) ; } else { # If requested, preload some text. @@ -114,39 +154,43 @@ class EditPage { $oldrev = $undorev ? $undorev->getPrevious() : null; } - #Sanity check, make sure it's the right page. + # Sanity check, make sure it's the right page, + # the revisions exist and they were not deleted. # Otherwise, $text will be left as-is. - if ( !is_null($undorev) && !is_null($oldrev) && $undorev->getPage()==$oldrev->getPage() && $undorev->getPage()==$this->mArticle->getID() ) { + if( !is_null( $undorev ) && !is_null( $oldrev ) && + $undorev->getPage() == $oldrev->getPage() && + $undorev->getPage() == $this->mArticle->getID() && + !$undorev->isDeleted( Revision::DELETED_TEXT ) && + !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { $undorev_text = $undorev->getText(); $oldrev_text = $oldrev->getText(); $currev_text = $text; - #No use doing a merge if it's just a straight revert. if ( $currev_text != $undorev_text ) { - $result = wfMerge($undorev_text, $oldrev_text, $currev_text, $text); + $result = wfMerge( $undorev_text, $oldrev_text, $currev_text, $text ); } else { + # No use doing a merge if it's just a straight revert. $text = $oldrev_text; $result = true; } + if( $result ) { + # Inform the user of our success and set an automatic edit summary + $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-success' ) ); + $firstrev = $oldrev->getNext(); + # If we just undid one rev, use an autosummary + if( $firstrev->mId == $undo ) { + $this->summary = wfMsgForContent('undo-summary', $undo, $undorev->getUserText()); + } + $this->formtype = 'diff'; + } else { + # Warn the user that something went wrong + $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-failure' ) ); + } } else { // Failed basic sanity checks. // Older revisions may have been removed since the link // was created, or we may simply have got bogus input. - $result = false; - } - - if( $result ) { - # Inform the user of our success and set an automatic edit summary - $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-success' ) ); - $firstrev = $oldrev->getNext(); - # If we just undid one rev, use an autosummary - if ( $firstrev->mId == $undo ) { - $this->summary = wfMsgForContent('undo-summary', $undo, $undorev->getUserText()); - } - $this->formtype = 'diff'; - } else { - # Warn the user that something went wrong - $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-failure' ) ); + $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-norev' ) ); } } else if( $section != '' ) { if( $section == 'new' ) { @@ -281,6 +325,25 @@ class EditPage { $this->mMetaData = $s ; } + protected function wasDeletedSinceLastEdit() { + /* Note that we rely on the logging table, which hasn't been always there, + * but that doesn't matter, because this only applies to brand new + * deletes. + */ + if ( $this->deletedSinceEdit ) + return true; + 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; + } + } + } + return $this->deletedSinceEdit; + } + function submit() { $this->edit(); } @@ -297,14 +360,13 @@ class EditPage { * the newly-edited page. */ function edit() { - global $wgOut, $wgUser, $wgRequest, $wgTitle; + global $wgOut, $wgUser, $wgRequest; - if ( ! wfRunHooks( 'AlternateEdit', array( &$this ) ) ) + if ( !wfRunHooks( 'AlternateEdit', array( &$this ) ) ) return; - $fname = 'EditPage::edit'; - wfProfileIn( $fname ); - wfDebug( "$fname: enter\n" ); + wfProfileIn( __METHOD__ ); + wfDebug( __METHOD__.": enter\n" ); // this is not an article $wgOut->setArticleFlag(false); @@ -314,18 +376,28 @@ class EditPage { if( $this->live ) { $this->livePreview(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); + return; + } + + $wgOut->addScriptFile( 'edit.js' ); + + if( wfReadOnly() ) { + $this->readOnlyPage( $this->getContent() ); + wfProfileOut( __METHOD__ ); return; } $permErrors = $this->mTitle->getUserPermissionsErrors('edit', $wgUser); - if( !$this->mTitle->exists() ) - $permErrors += array_diff( $this->mTitle->getUserPermissionsErrors('create', $wgUser), $permErrors ); + if( !$this->mTitle->exists() ) { + $permErrors = array_merge( $permErrors, + wfArrayDiff2( $this->mTitle->getUserPermissionsErrors('create', $wgUser), $permErrors ) ); + } # Ignore some permissions errors. $remove = array(); foreach( $permErrors as $error ) { - if ($this->preview || $this->diff && + if ( ( $this->preview || $this->diff ) && ($error[0] == 'blockedtext' || $error[0] == 'autoblockedtext')) { // Don't worry about blocks when previewing/diffing @@ -341,14 +413,12 @@ class EditPage { } } } - # array_diff returns elements in $permErrors that are not in $remove. - $permErrors = array_diff( $permErrors, $remove ); + $permErrors = wfArrayDiff2( $permErrors, $remove ); - if ( !empty($permErrors) ) - { - wfDebug( "$fname: User can't edit\n" ); - $wgOut->readOnlyPage( $this->getContent(), true, $permErrors ); - wfProfileOut( $fname ); + if ( $permErrors ) { + wfDebug( __METHOD__.": User can't edit\n" ); + $this->readOnlyPage( $this->getContent(), true, $permErrors ); + wfProfileOut( __METHOD__ ); return; } else { if ( $this->save ) { @@ -368,40 +438,19 @@ class EditPage { } } - wfProfileIn( "$fname-business-end" ); + wfProfileIn( __METHOD__."-business-end" ); $this->isConflict = false; // css / js subpages of user pages get a special treatment - $this->isCssJsSubpage = $wgTitle->isCssJsSubpage(); - $this->isValidCssJsSubpage = $wgTitle->isValidCssJsSubpage(); - - /* Notice that we can't use isDeleted, because it returns true if article is ever deleted - * no matter it's current state - */ - $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; - } - } - } - } + $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); + $this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage(); # Show applicable editing introductions if( $this->formtype == 'initial' || $this->firsttime ) $this->showIntro(); - + if( $this->mTitle->isTalkPage() ) { - $wgOut->addWikiText( wfMsg( 'talkpagetext' ) ); + $wgOut->addWikiMsg( 'talkpagetext' ); } # Attempt submission here. This will check for edit conflicts, @@ -411,8 +460,8 @@ class EditPage { if ( 'save' == $this->formtype ) { if ( !$this->attemptSave() ) { - wfProfileOut( "$fname-business-end" ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__."-business-end" ); + wfProfileOut( __METHOD__ ); return; } } @@ -422,17 +471,34 @@ class EditPage { if ( 'initial' == $this->formtype || $this->firsttime ) { if ($this->initialiseForm() === false) { $this->noSuchSectionPage(); - wfProfileOut( "$fname-business-end" ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__."-business-end" ); + wfProfileOut( __METHOD__ ); return; } - if( !$this->mTitle->getArticleId() ) + if( !$this->mTitle->getArticleId() ) wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) ); } $this->showEditForm(); - wfProfileOut( "$fname-business-end" ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__."-business-end" ); + wfProfileOut( __METHOD__ ); + } + + /** + * Show a read-only error + * Parameters are the same as OutputPage:readOnlyPage() + * Redirect to the article page if redlink=1 + */ + function readOnlyPage( $source = null, $protected = false, $reasons = array() ) { + global $wgRequest, $wgOut; + if ( $wgRequest->getBool( 'redlink' ) ) { + // The edit page was reached via a red link. + // Redirect to the article page and let them click the edit tab if + // they really want a permission error. + $wgOut->redirect( $this->mTitle->getFullUrl() ); + } else { + $wgOut->readOnlyPage( $source, $protected, $reasons ); + } } /** @@ -471,15 +537,21 @@ class EditPage { $fname = 'EditPage::importFormData'; wfProfileIn( $fname ); + # Section edit can come from either the form or a link + $this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) ); + if( $request->wasPosted() ) { # These fields need to be checked for encoding. # Also remove trailing whitespace, but don't remove _initial_ # whitespace from the text boxes. This may be significant formatting. $this->textbox1 = $this->safeUnicodeInput( $request, 'wpTextbox1' ); $this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' ); - $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); + $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); # 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); $this->edittime = $request->getVal( 'wpEdittime' ); $this->starttime = $request->getVal( 'wpStarttime' ); @@ -516,7 +588,7 @@ class EditPage { $this->preview = true; } } - $this->save = ! ( $this->preview OR $this->diff ); + $this->save = !$this->preview && !$this->diff; if( !preg_match( '/^\d{14}$/', $this->edittime )) { $this->edittime = null; } @@ -537,7 +609,7 @@ class EditPage { $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ); } - $this->autoSumm = $request->getText( 'wpAutoSummary' ); + $this->autoSumm = $request->getText( 'wpAutoSummary' ); } else { # Not a posted form? Start with nothing. wfDebug( "$fname: Not a posted form.\n" ); @@ -554,13 +626,14 @@ class EditPage { $this->minoredit = false; $this->watchthis = false; $this->recreate = false; + + if ( $this->section == 'new' && $request->getVal( 'preloadtitle' ) ) { + $this->summary = $request->getVal( 'preloadtitle' ); + } } $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' ); @@ -587,16 +660,32 @@ class EditPage { */ private function showIntro() { global $wgOut, $wgUser; + if( $this->suppressIntro ) + return; + + # Show a warning message when someone creates/edits a user (talk) page but the user does not exists + if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) { + $parts = explode( '/', $this->mTitle->getText(), 2 ); + $username = $parts[0]; + $id = User::idFromName( $username ); + $ip = User::isIP( $username ); + + if ( $id == 0 && !$ip ) { + $wgOut->wrapWikiMsg( '
$1
', + array( 'userpage-userdoesnotexist', $username ) ); + } + } + if( !$this->showCustomIntro() && !$this->mTitle->exists() ) { if( $wgUser->isLoggedIn() ) { - $wgOut->addWikiText( wfMsg( 'newarticletext' ) ); + $wgOut->wrapWikiMsg( '
$1
', 'newarticletext' ); } else { - $wgOut->addWikiText( wfMsg( 'newarticletextanon' ) ); + $wgOut->wrapWikiMsg( '
$1
', 'newarticletextanon' ); } $this->showDeletionLog( $wgOut ); } } - + /** * Attempt to show a custom editing introduction, if supplied * @@ -608,7 +697,7 @@ class EditPage { if( $title instanceof Title && $title->exists() && $title->userCanRead() ) { global $wgOut; $revision = Revision::newFromTitle( $title ); - $wgOut->addSecondaryWikiText( $revision->getText() ); + $wgOut->addWikiTextTitleTidy( $revision->getText(), $this->mTitle ); return true; } else { return false; @@ -619,10 +708,10 @@ class EditPage { } /** - * Attempt submission - * @return bool false if output is done, true if the rest of the form should be displayed + * Attempt submission (no UI) + * @return one of the constants describing the result */ - function attemptSave() { + function internalAttemptSave( &$result, $bot = false ) { global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgOut, $wgParser; global $wgMaxArticleSize; @@ -633,7 +722,18 @@ class EditPage { if( !wfRunHooks( 'EditPage::attemptSave', array( &$this ) ) ) { wfDebug( "Hook 'EditPage::attemptSave' aborted article saving" ); - return false; + return self::AS_HOOK_ERROR; + } + + # Check image redirect + if ( $this->mTitle->getNamespace() == NS_IMAGE && + Title::newFromRedirect( $this->textbox1 ) instanceof Title && + !$wgUser->isAllowed( 'upload' ) ) { + if( $wgUser->isAnon() ) { + return self::AS_IMAGE_REDIRECT_ANON; + } else { + return self::AS_IMAGE_REDIRECT_LOGGED; + } } # Reintegrate metadata @@ -643,34 +743,33 @@ class EditPage { # Check for spam $matches = array(); if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) { - $this->spamPage ( $matches[0] ); + $result['spam'] = $matches[0]; wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_SPAM_ERROR; } 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; + wfProfileOut( $fname ); + return self::AS_FILTERING; } if ( !wfRunHooks( 'EditFilter', array( $this, $this->textbox1, $this->section, &$this->hookError ) ) ) { # Error messages etc. could be handled within the hook... - wfProfileOut( $fname ); wfProfileOut( "$fname-checks" ); - return false; + wfProfileOut( $fname ); + return self::AS_HOOK_ERROR; } elseif( $this->hookError != '' ) { # ...or the hook could be expecting us to produce an error - wfProfileOut( "$fname-checks " ); + wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return true; + return self::AS_HOOK_ERROR_EXPECTED; } if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) { # Check block state against master, thus 'false'. - $this->blockedPage(); wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_BLOCKED_PAGE_FOR_USER; } $this->kblength = (int)(strlen( $this->textbox1 ) / 1024); if ( $this->kblength > $wgMaxArticleSize ) { @@ -678,43 +777,39 @@ class EditPage { $this->tooBig = true; wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return true; + return self::AS_CONTENT_TOO_BIG; } if ( !$wgUser->isAllowed('edit') ) { if ( $wgUser->isAnon() ) { - $this->userNotLoggedInPage(); wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_READ_ONLY_PAGE_ANON; } else { - $wgOut->readOnlyPage(); wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_READ_ONLY_PAGE_LOGGED; } } if ( wfReadOnly() ) { - $wgOut->readOnlyPage(); wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_READ_ONLY_PAGE; } if ( $wgUser->pingLimiter() ) { - $wgOut->rateLimited(); wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return false; + return self::AS_RATE_LIMITED; } # If the article has been deleted while editing, don't save it without # confirmation - if ( $this->deletedSinceEdit && !$this->recreate ) { + if ( $this->wasDeletedSinceLastEdit() && !$this->recreate ) { wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); - return true; + return self::AS_ARTICLE_WAS_DELETED; } wfProfileOut( "$fname-checks" ); @@ -726,24 +821,30 @@ class EditPage { // 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; + return self::AS_NO_CREATE_PERMISSION; } # Don't save a new article if it's blank. - if ( ( '' == $this->textbox1 ) ) { - $wgOut->redirect( $this->mTitle->getFullURL() ); + if ( '' == $this->textbox1 ) { wfProfileOut( $fname ); - return false; + return self::AS_BLANK_ARTICLE; + } + + // Run post-section-merge edit filter + if ( !wfRunHooks( 'EditFilterMerged', array( $this, $this->textbox1, &$this->hookError ) ) ) { + # Error messages etc. could be handled within the hook... + wfProfileOut( $fname ); + return self::AS_HOOK_ERROR; } - $isComment=($this->section=='new'); + $isComment = ( $this->section == 'new' ); + $this->mArticle->insertNewArticle( $this->textbox1, $this->summary, - $this->minoredit, $this->watchthis, false, $isComment); + $this->minoredit, $this->watchthis, false, $isComment, $bot); wfProfileOut( $fname ); - return false; + return self::AS_SUCCESS_NEW_ARTICLE; } # Article exists. Check for edit conflict. @@ -808,27 +909,34 @@ class EditPage { if ( $this->isConflict ) { wfProfileOut( $fname ); - return true; + return self::AS_CONFLICT_DETECTED; } $oldtext = $this->mArticle->getContent(); + // Run post-section-merge edit filter + if ( !wfRunHooks( 'EditFilterMerged', array( $this, $text, &$this->hookError ) ) ) { + # Error messages etc. could be handled within the hook... + wfProfileOut( $fname ); + return self::AS_HOOK_ERROR; + } + # Handle the user preference to force summaries here, but not for null edits if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary') && 0 != strcmp($oldtext, $text) && !Article::getRedirectAutosummary( $text )) { if( md5( $this->summary ) == $this->autoSumm ) { $this->missingSummary = true; wfProfileOut( $fname ); - return( true ); + return self::AS_SUMMARY_NEEDED; } } - #And a similar thing for new sections + # And a similar thing for new sections if( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) { if (trim($this->summary) == '') { $this->missingSummary = true; wfProfileOut( $fname ); - return( true ); + return self::AS_SUMMARY_NEEDED; } } @@ -838,7 +946,7 @@ class EditPage { if( $this->section == 'new' ) { if ( $this->textbox1 == '' ) { $this->missingComment = true; - return true; + return self::AS_TEXTBOX_EMPTY; } if( $this->summary != '' ) { $sectionanchor = $wgParser->guessSectionNameFromWikiText( $this->summary ); @@ -872,19 +980,19 @@ class EditPage { if ( $this->kblength > $wgMaxArticleSize ) { $this->tooBig = true; wfProfileOut( $fname ); - return true; + return self::AS_MAX_ARTICLE_SIZE_EXCEEDED; } # update the article here if( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, - $this->watchthis, '', $sectionanchor ) ) { + $this->watchthis, $bot, $sectionanchor ) ) { wfProfileOut( $fname ); - return false; + return self::AS_SUCCESS_UPDATE; } else { $this->isConflict = true; } wfProfileOut( $fname ); - return true; + return self::AS_END; } /** @@ -893,12 +1001,11 @@ class EditPage { */ function initialiseForm() { $this->edittime = $this->mArticle->getTimestamp(); - $this->summary = ''; $this->textbox1 = $this->getContent(false); if ($this->textbox1 === false) return false; - if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI ) - $this->textbox1 = wfMsgWeirdKey( $this->mArticle->mTitle->getText() ); + if ( !$this->mArticle->exists() && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) + $this->textbox1 = wfMsgWeirdKey( $this->mTitle->getText() ); wfProxyCheck(); return true; } @@ -910,7 +1017,14 @@ class EditPage { * near the top, for captchas and the like. */ function showEditForm( $formCallback=null ) { - global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize; + global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize, $wgTitle; + + # If $wgTitle is null, that means we're in API mode. + # Some hook probably called this function without checking + # for is_null($wgTitle) first. Bail out right here so we don't + # do lots of work just to discard it right after. + if(is_null($wgTitle)) + return; $fname = 'EditPage::showEditForm'; wfProfileIn( $fname ); @@ -929,20 +1043,19 @@ class EditPage { } if ( $this->isConflict ) { - $s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() ); + $s = wfMsg( 'editconflict', $wgTitle->getPrefixedText() ); $wgOut->setPageTitle( $s ); - $wgOut->addWikiText( wfMsg( 'explainconflict' ) ); + $wgOut->addWikiMsg( 'explainconflict' ); $this->textbox2 = $this->textbox1; $this->textbox1 = $this->getContent(); $this->edittime = $this->mArticle->getTimestamp(); } else { - if( $this->section != '' ) { if( $this->section == 'new' ) { - $s = wfMsg('editingcomment', $this->mTitle->getPrefixedText() ); + $s = wfMsg('editingcomment', $wgTitle->getPrefixedText() ); } else { - $s = wfMsg('editingsection', $this->mTitle->getPrefixedText() ); + $s = wfMsg('editingsection', $wgTitle->getPrefixedText() ); $matches = array(); if( !$this->summary && !$this->preview && !$this->diff ) { preg_match( "/^(=+)(.+)\\1/mi", @@ -950,98 +1063,103 @@ class EditPage { $matches ); if( !empty( $matches[2] ) ) { global $wgParser; - $this->summary = "/* " . - $wgParser->stripSectionName(trim($matches[2])) . + $this->summary = "/* " . + $wgParser->stripSectionName(trim($matches[2])) . " */ "; } } } } else { - $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() ); + $s = wfMsg( 'editing', $wgTitle->getPrefixedText() ); } $wgOut->setPageTitle( $s ); if ( $this->missingComment ) { - $wgOut->addWikiText( '
' . wfMsg( 'missingcommenttext' ) . '
' ); + $wgOut->wrapWikiMsg( '
$1
', 'missingcommenttext' ); } if( $this->missingSummary && $this->section != 'new' ) { - $wgOut->addWikiText( '
' . wfMsg( 'missingsummary' ) . '
' ); + $wgOut->wrapWikiMsg( '
$1
', 'missingsummary' ); } if( $this->missingSummary && $this->section == 'new' ) { - $wgOut->addWikiText( '
' . wfMsg( 'missingcommentheader' ) . '
' ); + $wgOut->wrapWikiMsg( '
$1
', 'missingcommentheader' ); } - if( !$this->hookError == '' ) { + if( $this->hookError !== '' ) { $wgOut->addWikiText( $this->hookError ); } if ( !$this->checkUnicodeCompliantBrowser() ) { - $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') ); + $wgOut->addWikiMsg( 'nonunicodebrowser' ); } if ( isset( $this->mArticle ) && isset( $this->mArticle->mRevision ) ) { // Let sysop know that this will make private content public if saved - if( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { - $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) ); + + if( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) { + $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); + } else if( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { + $wgOut->addWikiMsg( 'rev-deleted-text-view' ); } + if( !$this->mArticle->mRevision->isCurrent() ) { $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() ); - $wgOut->addWikiText( wfMsg( 'editingold' ) ); + $wgOut->addWikiMsg( 'editingold' ); } } } if( wfReadOnly() ) { - $wgOut->addWikiText( wfMsg( 'readonlywarning' ) ); + $wgOut->addHTML( '
'.wfMsgWikiHTML( 'readonlywarning' ).'
' ); } elseif( $wgUser->isAnon() && $this->formtype != 'preview' ) { - $wgOut->addWikiText( wfMsg( 'anoneditwarning' ) ); + $wgOut->addHTML( '
'.wfMsgWikiHTML( 'anoneditwarning' ).'
' ); } else { if( $this->isCssJsSubpage && $this->formtype != 'preview' ) { # Check the skin exists if( $this->isValidCssJsSubpage ) { - $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ) ); + $wgOut->addWikiMsg( 'usercssjsyoucanpreview' ); } else { - $wgOut->addWikiText( wfMsg( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) ); + $wgOut->addWikiMsg( 'userinvalidcssjstitle', $wgTitle->getSkinFromCssJsSubpage() ); } } } if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { # Show a warning if editing an interface message - $wgOut->addWikiText( wfMsg( 'editinginterface' ) ); + $wgOut->addWikiMsg( 'editinginterface' ); } elseif( $this->mTitle->isProtected( 'edit' ) ) { # Is the title semi-protected? if( $this->mTitle->isSemiProtected() ) { - $notice = wfMsg( 'semiprotectedpagewarning' ); - if( wfEmptyMsg( 'semiprotectedpagewarning', $notice ) || $notice == '-' ) - $notice = ''; + $noticeMsg = 'semiprotectedpagewarning'; } else { - # Then it must be protected based on static groups (regular) - $notice = wfMsg( 'protectedpagewarning' ); + # Then it must be protected based on static groups (regular) + $noticeMsg = 'protectedpagewarning'; } - $wgOut->addWikiText( $notice ); + $wgOut->addWikiMsg( $noticeMsg ); } if ( $this->mTitle->isCascadeProtected() ) { # Is this page under cascading protection from some source pages? list($cascadeSources, /* $restrictions */) = $this->mTitle->getCascadeProtectionSources(); + $notice = "$1\n"; if ( count($cascadeSources) > 0 ) { # Explain, and list the titles responsible - $notice = wfMsgExt( 'cascadeprotectedwarning', array('parsemag'), count($cascadeSources) ) . "\n"; foreach( $cascadeSources as $page ) { $notice .= '* [[:' . $page->getPrefixedText() . "]]\n"; } } - $wgOut->addWikiText( $notice ); + $wgOut->wrapWikiMsg( $notice, array( 'cascadeprotectedwarning', count($cascadeSources) ) ); + } + if( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) != array() ){ + $wgOut->addWikiMsg( 'titleprotectedwarning' ); } if ( $this->kblength === false ) { $this->kblength = (int)(strlen( $this->textbox1 ) / 1024); } if ( $this->tooBig || $this->kblength > $wgMaxArticleSize ) { - $wgOut->addWikiText( wfMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgMaxArticleSize ) ); + $wgOut->addWikiMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgMaxArticleSize ); } elseif( $this->kblength > 29 ) { - $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ) ); + $wgOut->addWikiMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ); } #need to parse the preview early so that we know which templates are used, @@ -1059,12 +1177,12 @@ class EditPage { $q = 'action=submit'; #if ( "no" == $redirect ) { $q .= "&redirect=no"; } - $action = $this->mTitle->escapeLocalURL( $q ); + $action = $wgTitle->escapeLocalURL( $q ); $summary = wfMsg('summary'); $subject = wfMsg('subject'); - $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(), + $cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(), wfMsgExt('cancel', array('parseinline')) ); $edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' )); $edithelp = ''. @@ -1072,10 +1190,14 @@ class EditPage { htmlspecialchars( wfMsg( 'newwindow' ) ); global $wgRightsText; - $copywarn = "
\n" . - wfMsg( $wgRightsText ? 'copyrightwarning' : 'copyrightwarning2', + if ( $wgRightsText ) { + $copywarnMsg = array( 'copyrightwarning', '[[' . wfMsgForContent( 'copyrightpage' ) . ']]', - $wgRightsText ) . "\n
"; + $wgRightsText ); + } else { + $copywarnMsg = array( 'copyrightwarning2', + '[[' . wfMsgForContent( 'copyrightpage' ) . ']]' ); + } if( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) { # prepare toolbar for edit buttons @@ -1122,14 +1244,28 @@ class EditPage { # 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 a blank edit summary was previously provided, and the appropriate + # user preference is active, pass a hidden tag as wpIgnoreBlankSummary. This will stop the + # user being bounced back more than once in the event that a summary + # is not required. + ##### + # For a bit more sophisticated detection of blank summaries, hash the + # automatic one and pass that in the hidden field wpAutoSummary. + $summaryhiddens = ''; + if( $this->missingSummary ) $summaryhiddens .= Xml::hidden( 'wpIgnoreBlankSummary', true ); + $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); + $summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm ); if( $this->section == 'new' ) { - $commentsubject="\n
\n
"; + $commentsubject="\n
\n{$summaryhiddens}
"; $editsummary = ''; - $subjectpreview = $summarytext && $this->preview ? "
".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."
\n" : ''; + global $wgParser; + $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) ); + $subjectpreview = $summarytext && $this->preview ? "
".wfMsg('subject-preview').':'.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."
\n" : ''; $summarypreview = ''; } else { $commentsubject = ''; - $editsummary="\n
\n
"; + $editsummary="\n
\n{$summaryhiddens}
"; $summarypreview = $summarytext && $this->preview ? "
".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."
\n" : ''; $subjectpreview = ''; } @@ -1141,6 +1277,9 @@ class EditPage { $templates = ($this->preview || $this->section != '') ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates(); $formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != ''); + $hiddencats = $this->mArticle->getHiddenCategories(); + $formattedhiddencats = $sk->formatHiddenCategories( $hiddencats ); + global $wgUseMetadataEdit ; if ( $wgUseMetadataEdit ) { $metadata = $this->mMetaData ; @@ -1152,9 +1291,9 @@ class EditPage { $hidden = ''; $recreate = ''; - if ($this->deletedSinceEdit) { + if ($this->wasDeletedSinceLastEdit()) { if ( 'save' != $this->formtype ) { - $wgOut->addWikiText( wfMsg('deletedwhileediting')); + $wgOut->addWikiMsg('deletedwhileediting'); } else { // Hide the toolbar and edit area, use can click preview to get it back // Add an confirmation checkbox and explanation. @@ -1199,19 +1338,26 @@ END edittime}\" name=\"wpEdittime\" />\n scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" ); + $encodedtext = htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ); + if( $encodedtext !== '' ) { + // Ensure there's a newline at the end, otherwise adding lines + // is awkward. + // But don't add a newline if the ext is empty, or Firefox in XHTML + // mode will show an extra newline. A bit annoying. + $encodedtext .= "\n"; + } + $wgOut->addHTML( <<editFormTextBeforeContent} END -. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) . -" - - " ); +); - $wgOut->addWikiText( $copywarn ); + $wgOut->wrapWikiMsg( "
\n$1\n
", $copywarnMsg ); $wgOut->addHTML( $this->editFormTextAfterWarn ); $wgOut->addHTML( " {$metadata} @@ -1228,18 +1374,6 @@ END
"); - $wgOut->addHtml( '
' ); - $wgOut->addWikiText( wfMsgForContent( 'edittools' ) ); - $wgOut->addHtml( '
' ); - - $wgOut->addHTML( $this->editFormTextAfterTools ); - - $wgOut->addHTML( " -
-{$formattedtemplates} -
-" ); - /** * To make it harder for someone to slip a user a page * which submits an edit form to the wiki without their @@ -1255,29 +1389,30 @@ END $token = htmlspecialchars( $wgUser->editToken() ); $wgOut->addHTML( "\n\n" ); + $wgOut->addHtml( '
' ); + $wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) ); + $wgOut->addHtml( '
' ); - # If a blank edit summary was previously provided, and the appropriate - # user preference is active, pass a hidden tag here. This will stop the - # user being bounced back more than once in the event that a summary - # is not required. - if( $this->missingSummary ) { - $wgOut->addHTML( "\n" ); - } + $wgOut->addHTML( $this->editFormTextAfterTools ); - # For a bit more sophisticated detection of blank summaries, hash the - # automatic one and pass that in a hidden field. - $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); - $wgOut->addHtml( wfHidden( 'wpAutoSummary', $autosumm ) ); + $wgOut->addHTML( " +
+{$formattedtemplates} +
+
+{$formattedhiddencats} +
+"); - if ( $this->isConflict ) { - $wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' ); + if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) { + $wgOut->wrapWikiMsg( '==$1==', "yourdiff" ); $de = new DifferenceEngine( $this->mTitle ); $de->setText( $this->textbox2, $this->textbox1 ); $de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) ); - $wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' ); - $wgOut->addHTML( "" ); } $wgOut->addHTML( $this->editFormTextBottom ); @@ -1331,10 +1466,8 @@ END * of the preview button */ function doLivePreviewScript() { - global $wgStylePath, $wgJsMimeType, $wgStyleVersion, $wgOut, $wgTitle; - $wgOut->addHTML( '' . "\n" ); + global $wgOut, $wgTitle; + $wgOut->addScriptFile( 'preview.js' ); $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' ); return "return !lpDoPreview(" . "editform.wpTextbox1.value," . @@ -1377,24 +1510,19 @@ END * @todo document */ function getPreviewText() { - global $wgOut, $wgUser, $wgTitle, $wgParser; + global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang; $fname = 'EditPage::getPreviewText'; wfProfileIn( $fname ); if ( $this->mTriedSave && !$this->mTokenOk ) { if ( $this->mTokenOkExceptSuffix ) { - $msg = 'token_suffix_mismatch'; + $note = wfMsg( 'token_suffix_mismatch' ); } else { - $msg = 'session_fail_preview'; + $note = wfMsg( 'session_fail_preview' ); } } else { - $msg = 'previewnote'; - } - $previewhead = '

' . htmlspecialchars( wfMsg( 'preview' ) ) . "

\n" . - "
" . $wgOut->parse( wfMsg( $msg ) ) . "
\n"; - if ( $this->isConflict ) { - $previewhead.='

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "

\n"; + $note = wfMsg( 'previewnote' ); } $parserOptions = ParserOptions::newFromUser( $wgUser ); @@ -1412,16 +1540,15 @@ END # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here if ( $this->isCssJsSubpage ) { - if(preg_match("/\\.css$/", $wgTitle->getText() ) ) { + if(preg_match("/\\.css$/", $this->mTitle->getText() ) ) { $previewtext = wfMsg('usercsspreview'); - } else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) { + } else if(preg_match("/\\.js$/", $this->mTitle->getText() ) ) { $previewtext = wfMsg('userjspreview'); } $parserOptions->setTidy(true); - $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions ); + $parserOutput = $wgParser->parse( $previewtext , $this->mTitle, $parserOptions ); $wgOut->addHTML( $parserOutput->mText ); - wfProfileOut( $fname ); - return $previewhead; + $previewHTML = ''; } else { $toparse = $this->textbox1; @@ -1431,24 +1558,66 @@ END $toparse="== {$this->summary} ==\n\n".$toparse; } - if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ; + if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData; + + // Parse mediawiki messages with correct target language + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + $pos = strrpos( $this->mTitle->getText(), '/' ); + if ( $pos !== false ) { + $code = substr( $this->mTitle->getText(), $pos+1 ); + switch ($code) { + case $wgLang->getCode(): + $obj = $wgLang; break; + case $wgContLang->getCode(): + $obj = $wgContLang; break; + default: + $obj = Language::factory( $code ); + } + $parserOptions->setTargetLanguage( $obj ); + } + } + + $parserOptions->setTidy(true); - $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n", - $wgTitle, $parserOptions ); + $parserOptions->enableLimitReport(); + $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ), + $this->mTitle, $parserOptions ); $previewHTML = $parserOutput->getText(); $wgOut->addParserOutputNoText( $parserOutput ); - + # ParserOutput might have altered the page title, so reset it - $wgOut->setPageTitle( wfMsg( 'editing', $this->mTitle->getPrefixedText() ) ); + # Also, use the title defined by DISPLAYTITLE magic word when present + if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) { + $wgOut->setPageTitle( wfMsg( 'editing', $dt ) ); + } else { + $wgOut->setPageTitle( wfMsg( 'editing', $wgTitle->getPrefixedText() ) ); + } foreach ( $parserOutput->getTemplates() as $ns => $template) foreach ( array_keys( $template ) as $dbk) $this->mPreviewTemplates[] = Title::makeTitle($ns, $dbk); - wfProfileOut( $fname ); - return $previewhead . $previewHTML; + if ( count( $parserOutput->getWarnings() ) ) { + $note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() ); + } + } + + $previewhead = '

' . htmlspecialchars( wfMsg( 'preview' ) ) . "

\n" . + "
" . $wgOut->parse( $note ) . "
\n"; + if ( $this->isConflict ) { + $previewhead.='

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "

\n"; } + + if( $wgUser->getOption( 'previewontop' ) ) { + // Spacer for the edit toolbar + $previewfoot = '


'; + } else { + $previewfoot = ''; + } + + wfProfileOut( $fname ); + return $previewhead . $previewHTML . $previewfoot; } /** @@ -1473,8 +1642,10 @@ END $cols = $wgUser->getOption( 'cols' ); $attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' ); $wgOut->addHtml( '
' ); - $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ) ); - $wgOut->addHtml( wfOpenElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . wfCloseElement( 'textarea' ) ); + $wgOut->addWikiMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ); + # Why we don't use Xml::element here? + # Is it because if $source is '', it returns