X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=eeabe0328be4e6b4d50548759c7d33765389686b;hb=53f96171cccb378824f8708c3fe41cfb0fcdd62e;hp=5ac268d5be5a24c6fb127c2898bd1a2669ff34a6;hpb=f577792eb7294bc494488b50da506646021d6123;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/EditPage.php b/includes/EditPage.php index 5ac268d5be..eeabe0328b 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -15,6 +15,9 @@ * redirects go to, etc. $this->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. + * + * Surgeon General's Warning: prolonged exposure to this class is known to cause + * headaches, which may be fatal. */ class EditPage { const AS_SUCCESS_UPDATE = 200; @@ -52,11 +55,13 @@ class EditPage { */ var $mTitle; private $mContextTitle = null; - var $action; + var $action = 'submit'; var $isConflict = false; var $isCssJsSubpage = false; var $isCssSubpage = false; var $isJsSubpage = false; + var $isWrongCaseCssJsPage = false; + var $isNew = false; // new page or new section var $deletedSinceEdit; var $formtype; var $firsttime; @@ -73,7 +78,12 @@ class EditPage { var $autoSumm = ''; var $hookError = ''; #var $mPreviewTemplates; + + /** + * @var ParserOutput + */ var $mParserOutput; + var $mBaseRevision = false; var $mShowSummaryField = true; @@ -81,19 +91,20 @@ class EditPage { var $save = false, $preview = false, $diff = false; var $minoredit = false, $watchthis = false, $recreate = false; var $textbox1 = '', $textbox2 = '', $summary = '', $nosummary = false; - var $edittime = '', $section = '', $starttime = ''; + var $edittime = '', $section = '', $sectiontitle = '', $starttime = ''; var $oldid = 0, $editintro = '', $scrolltop = null, $bot = true; # Placeholders for text injection by hooks (must be HTML) # 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; - public $editFormTextAfterContent; - public $previewTextAfterContent; + public $editFormPageTop = ''; // Before even the preview + public $editFormTextTop = ''; + public $editFormTextBeforeContent = ''; + public $editFormTextAfterWarn = ''; + public $editFormTextAfterTools = ''; + public $editFormTextBottom = ''; + public $editFormTextAfterContent = ''; + public $previewTextAfterContent = ''; + public $mPreloadText = ''; /* $didSave should be set to true whenever an article was succesfully altered. */ public $didSave = false; @@ -103,29 +114,28 @@ class EditPage { /** * @todo document - * @param $article + * @param $article Article */ - function __construct( $article ) { - $this->mArticle =& $article; + public function __construct( $article ) { + $this->mArticle = $article; $this->mTitle = $article->getTitle(); - $this->action = 'submit'; - - # Placeholders for text injection by hooks (empty per default) - $this->editFormPageTop = - $this->editFormTextTop = - $this->editFormTextBeforeContent = - $this->editFormTextAfterWarn = - $this->editFormTextAfterTools = - $this->editFormTextBottom = - $this->editFormTextAfterContent = - $this->previewTextAfterContent = - $this->mPreloadText = ""; } - function getArticle() { + /** + * @return Article + */ + public function getArticle() { return $this->mArticle; } + /** + * @since 1.19 + * @return Title + */ + public function getTitle() { + return $this->mTitle; + } + /** * Set the context Title object * @@ -151,185 +161,6 @@ class EditPage { } } - /** - * Fetch initial editing page content. - * @returns mixed string on success, $def_text for invalid sections - * @private - */ - function getContent( $def_text = '' ) { - global $wgOut, $wgRequest, $wgParser; - - wfProfileIn( __METHOD__ ); - # Get variables from query string :P - $section = $wgRequest->getVal( 'section' ); - - $preload = $wgRequest->getVal( 'preload', - // Custom preload text for new sections - $section === 'new' ? 'MediaWiki:addsection-preload' : '' ); - $undoafter = $wgRequest->getVal( 'undoafter' ); - $undo = $wgRequest->getVal( 'undo' ); - - // 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. - $text = $this->mTitle->getDefaultMessageText(); - if( $text === false ) { - $text = $this->getPreloadedText( $preload ); - } - } else { - # If requested, preload some text. - $text = $this->getPreloadedText( $preload ); - } - // For existing pages, get text based on "undo" or section parameters. - } else { - $text = $this->mArticle->getContent(); - if ( $undo > 0 && $undoafter > 0 && $undo < $undoafter ) { - # If they got undoafter and undo round the wrong way, switch them - list( $undo, $undoafter ) = array( $undoafter, $undo ); - } - if ( $undo > 0 && $undo > $undoafter ) { - # Undoing a specific edit overrides section editing; section-editing - # doesn't work with undoing. - if ( $undoafter ) { - $undorev = Revision::newFromId( $undo ); - $oldrev = Revision::newFromId( $undoafter ); - } else { - $undorev = Revision::newFromId( $undo ); - $oldrev = $undorev ? $undorev->getPrevious() : null; - } - - # 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() && - !$undorev->isDeleted( Revision::DELETED_TEXT ) && - !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { - - $undotext = $this->mArticle->getUndoText( $undorev, $oldrev ); - if ( $undotext === false ) { - # Warn the user that something went wrong - $this->editFormPageTop .= $wgOut->parse( '
' . wfMsgNoTrans( 'undo-failure' ) . '
' ); - } else { - $text = $undotext; - # 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->undidRev = $undo; - } - $this->formtype = 'diff'; - } - } else { - // Failed basic sanity checks. - // Older revisions may have been removed since the link - // was created, or we may simply have got bogus input. - $this->editFormPageTop .= $wgOut->parse( '
' . wfMsgNoTrans( 'undo-norev' ) . '
' ); - } - } else if ( $section != '' ) { - if ( $section == 'new' ) { - $text = $this->getPreloadedText( $preload ); - } else { - // Get section edit text (returns $def_text for invalid sections) - $text = $wgParser->getSection( $text, $section, $def_text ); - } - } - } - - wfProfileOut( __METHOD__ ); - return $text; - } - - /** Use this method before edit() to preload some text into the edit box */ - public function setPreloadedText( $text ) { - $this->mPreloadText = $text; - } - - /** - * Get the contents to be preloaded into the box, either set by - * an earlier setPreloadText() or by loading the given page. - * - * @param $preload String: representing the title to preload from. - * @return String - */ - protected function getPreloadedText( $preload ) { - global $wgUser, $wgParser; - if ( !empty( $this->mPreloadText ) ) { - return $this->mPreloadText; - } elseif ( $preload !== '' ) { - $title = Title::newFromText( $preload ); - # Check for existence to avoid getting MediaWiki:Noarticletext - if ( isset( $title ) && $title->exists() && $title->userCanRead() ) { - $article = new Article( $title ); - - if ( $article->isRedirect() ) { - $title = Title::newFromRedirectRecurse( $article->getContent() ); - # Redirects to missing titles are displayed, to hidden pages are followed - # Copying observed behaviour from ?action=view - if ( $title->exists() ) { - if ($title->userCanRead() ) { - $article = new Article( $title ); - } else { - return ""; - } - } - } - $parserOptions = ParserOptions::newFromUser( $wgUser ); - return $wgParser->getPreloadText( $article->getContent(), $title, $parserOptions ); - } - } - return ''; - } - - /* - * Check if a page was deleted while the user was editing it, before submit. - * 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. - */ - protected function wasDeletedSinceLastEdit() { - if ( $this->deletedSinceEdit !== null ) { - return $this->deletedSinceEdit; - } - - $this->deletedSinceEdit = false; - - if ( $this->mTitle->isDeletedQuick() ) { - $this->lastDelete = $this->getLastDelete(); - if ( $this->lastDelete ) { - $deleteTime = wfTimestamp( TS_MW, $this->lastDelete->log_timestamp ); - if ( $deleteTime > $this->starttime ) { - $this->deletedSinceEdit = true; - } - } - } - - 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(); } @@ -355,8 +186,12 @@ class EditPage { wfProfileIn( __METHOD__ ); wfDebug( __METHOD__.": enter\n" ); - // This is not an article - $wgOut->setArticleFlag( false ); + // If they used redlink=1 and the page exists, redirect to the main article + if ( $wgRequest->getBool( 'redlink' ) && $this->mTitle->exists() ) { + $wgOut->redirect( $this->mTitle->getFullURL() ); + wfProfileOut( __METHOD__ ); + return; + } $this->importFormData( $wgRequest ); $this->firsttime = false; @@ -373,52 +208,50 @@ class EditPage { $this->preview = true; } - $wgOut->addModules( array( 'mediawiki.legacy.edit', 'mediawiki.action.edit' ) ); - - if ( $wgUser->getOption( 'uselivepreview', false ) ) { - $wgOut->addModules( 'mediawiki.legacy.preview' ); + if ( $this->save ) { + $this->formtype = 'save'; + } elseif ( $this->preview ) { + $this->formtype = 'preview'; + } elseif ( $this->diff ) { + $this->formtype = 'diff'; + } else { # First time through + $this->firsttime = true; + if ( $this->previewOnOpen() ) { + $this->formtype = 'preview'; + } else { + $this->formtype = 'initial'; + } } - // 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" ); - $content = $this->getContent( null ); - $content = $content === '' ? null : $content; - $this->readOnlyPage( $content, true, $permErrors, 'edit' ); + // Auto-block user's IP if the account was "hard" blocked + $wgUser->spreadAnyEditBlock(); + + $this->displayPermissionsError( $permErrors ); + wfProfileOut( __METHOD__ ); return; - } else { - if ( $this->save ) { - $this->formtype = 'save'; - } else if ( $this->preview ) { - $this->formtype = 'preview'; - } else if ( $this->diff ) { - $this->formtype = 'diff'; - } else { # First time through - $this->firsttime = true; - if ( $this->previewOnOpen() ) { - $this->formtype = 'preview'; - } else { - $this->formtype = 'initial'; - } - } } - // If they used redlink=1 and the page exists, redirect to the main article - if ( $wgRequest->getBool( 'redlink' ) && $this->mTitle->exists() ) { - $wgOut->redirect( $this->mTitle->getFullURL() ); + $wgOut->addModules( array( 'mediawiki.action.edit' ) ); + + if ( $wgUser->getOption( 'uselivepreview', false ) ) { + $wgOut->addModules( 'mediawiki.legacy.preview' ); } + // Bug #19334: textarea jumps when editing articles in IE8 + $wgOut->addStyle( 'common/IE80Fixes.css', 'screen', 'IE 8' ); wfProfileIn( __METHOD__."-business-end" ); $this->isConflict = false; // css / js subpages of user pages get a special treatment - $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); - $this->isCssSubpage = $this->mTitle->isCssSubpage(); - $this->isJsSubpage = $this->mTitle->isJsSubpage(); + $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); + $this->isCssSubpage = $this->mTitle->isCssSubpage(); + $this->isJsSubpage = $this->mTitle->isJsSubpage(); $this->isWrongCaseCssJsPage = $this->isWrongCaseCssJsPage(); + $this->isNew = !$this->mTitle->exists() || $this->section == 'new'; # Show applicable editing introductions if ( $this->formtype == 'initial' || $this->firsttime ) @@ -444,6 +277,13 @@ class EditPage { $wgOut->addWikiText( $editnotice_base_msg->plain() ); } } + } else { + # Even if there are no subpages in namespace, we still don't want / in MW ns. + $editnoticeText = $editnotice_ns . '-' . str_replace( '/', '-', $this->mTitle->getDBkey() ); + $editnoticeMsg = wfMessage( $editnoticeText )->inContentLanguage(); + if ( $editnoticeMsg->exists() ) { + $wgOut->addWikiText( $editnoticeMsg->plain() ); + } } # Attempt submission here. This will check for edit conflicts, @@ -479,6 +319,9 @@ class EditPage { wfProfileOut( __METHOD__ ); } + /** + * @return array + */ protected function getEditPermissionErrors() { global $wgUser; $permErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ); @@ -500,12 +343,71 @@ class EditPage { return $permErrors; } + /** + * Display a permissions error page, like OutputPage::showPermissionsErrorPage(), + * but with the following differences: + * - If redlink=1, the user will be redirect to the page + * - If there is content to display or the error occurs while either saving, + * previewing or showing the difference, it will be a + * "View source for ..." page displaying the source code after the error message. + * + * @since 1.19 + * @param $permErrors Array of permissions errors, as returned by + * Title::getUserPermissionsErrors(). + */ + protected function displayPermissionsError( array $permErrors ) { + 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() ); + return; + } + + $content = $this->getContent(); + + # Use the normal message if there's nothing to display + if ( $this->firsttime && $content === '' ) { + $action = $this->mTitle->exists() ? 'edit' : + ( $permission = $this->mTitle->isTalkPage() ? 'createtalk' : 'createpage' ); + throw new PermissionsError( $action, $permErrors ); + } + + $wgOut->setPageTitle( wfMessage( 'viewsource-title', $this->getContextTitle()->getPrefixedText() ) ); + $wgOut->addBacklinkSubtitle( $this->getContextTitle() ); + $wgOut->addWikiText( $wgOut->formatPermissionsErrorMessage( $permErrors, 'edit' ) ); + $wgOut->addHTML( "
\n" ); + + # If the user made changes, preserve them when showing the markup + # (This happens when a user is blocked during edit, for instance) + if ( !$this->firsttime ) { + $content = $this->textbox1; + $wgOut->addWikiMsg( 'viewyourtext' ); + } else { + $wgOut->addWikiMsg( 'viewsourcetext' ); + } + + $this->showTextbox( $content, 'wpTextbox1', array( 'readonly' ) ); + + $wgOut->addHTML( Html::rawElement( 'div', array( 'class' => 'templatesUsed' ), + Linker::formatTemplates( $this->getTemplates() ) ) ); + + if ( $this->mTitle->exists() ) { + $wgOut->returnToMain( null, $this->mTitle ); + } + } + /** * Show a read-only error * Parameters are the same as OutputPage:readOnlyPage() * Redirect to the article page if redlink=1 + * @deprecated in 1.19; use displayPermissionsError() instead */ function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) { + wfDeprecated( __METHOD__, '1.19' ); + global $wgRequest, $wgOut; if ( $wgRequest->getBool( 'redlink' ) ) { // The edit page was reached via a red link. @@ -548,31 +450,38 @@ class EditPage { } /** - * Does this EditPage class support section editing? - * This is used by EditPage subclasses to indicate their ui cannot handle section edits + * Checks whether the user entered a skin name in uppercase, + * e.g. "User:Example/Monobook.css" instead of "monobook.css" * * @return bool */ - protected function isSectionEditSupported() { - return true; + 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; + } } /** - * Returns the URL to use in the form's action attribute. - * This is used by EditPage subclasses when simply customizing the action - * variable in the constructor is not enough. This can be used when the - * EditPage lives inside of a Special page rather than a custom page action. + * Does this EditPage class support section editing? + * This is used by EditPage subclasses to indicate their ui cannot handle section edits * - * @param $title Title object for which is being edited (where we go to for &action= links) - * @return string + * @return bool */ - protected function getActionURL( Title $title ) { - return $title->getLocalURL( array( 'action' => $this->action ) ); + protected function isSectionEditSupported() { + return true; } /** - * @todo document - * @param $request + * This function collects the form data and uses it to populate various member variables. + * @param $request WebRequest */ function importFormData( &$request ) { global $wgLang, $wgUser; @@ -601,15 +510,25 @@ class EditPage { # Truncate for whole multibyte characters. +5 bytes for ellipsis $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); + # If the summary consists of a heading, e.g. '==Foobar==', extract the title from the + # header syntax, e.g. 'Foobar'. This is mainly an issue when we are using wpSummary for + # section titles. + $this->summary = preg_replace( '/^\s*=+\s*(.*?)\s*=+\s*$/', '$1', $this->summary ); + + # Treat sectiontitle the same way as summary. + # Note that wpSectionTitle is not yet a part of the actual edit form, as wpSummary is + # currently doing double duty as both edit summary and section title. Right now this + # is just to allow API edits to work around this limitation, but this should be + # incorporated into the actual edit form when EditPage is rewritten (Bugs 18654, 26312). + $this->sectiontitle = $wgLang->truncate( $request->getText( 'wpSectionTitle' ), 250 ); + $this->sectiontitle = preg_replace( '/^\s*=+\s*(.*?)\s*=+\s*$/', '$1', $this->sectiontitle ); $this->edittime = $request->getVal( 'wpEdittime' ); $this->starttime = $request->getVal( 'wpStarttime' ); $this->scrolltop = $request->getIntOrNull( 'wpScrolltop' ); - if ($this->textbox1 === '' && $request->getVal( 'wpTextbox1' ) === null) { + if ( $this->textbox1 === '' && $request->getVal( 'wpTextbox1' ) === null ) { // wpTextbox1 field is missing, possibly due to being "too big" // according to some filter rules such as Suhosin's setting for // suhosin.request.max_value_length (d'oh) @@ -639,7 +558,7 @@ class EditPage { # The unmarked state will be assumed to be a save, # if the form seems otherwise complete. wfDebug( __METHOD__ . ": Passed token check.\n" ); - } else if ( $this->diff ) { + } elseif ( $this->diff ) { # Failed token check, but only requested "Show Changes". wfDebug( __METHOD__ . ": Failed token check; Show Changes requested.\n" ); } else { @@ -676,19 +595,24 @@ class EditPage { } else { # Not a posted form? Start with nothing. wfDebug( __METHOD__ . ": Not a posted form.\n" ); - $this->textbox1 = ''; - $this->summary = ''; - $this->edittime = ''; - $this->starttime = wfTimestampNow(); - $this->edit = false; - $this->preview = false; - $this->save = false; - $this->diff = false; - $this->minoredit = false; - $this->watchthis = $request->getBool( 'watchthis', false ); // Watch may be overriden by request parameters - $this->recreate = false; - + $this->textbox1 = ''; + $this->summary = ''; + $this->sectiontitle = ''; + $this->edittime = ''; + $this->starttime = wfTimestampNow(); + $this->edit = false; + $this->preview = false; + $this->save = false; + $this->diff = false; + $this->minoredit = false; + $this->watchthis = $request->getBool( 'watchthis', false ); // Watch may be overriden by request parameters + $this->recreate = false; + + // When creating a new section, we can preload a section title by passing it as the + // preloadtitle parameter in the URL (Bug 13100) if ( $this->section == 'new' && $request->getVal( 'preloadtitle' ) ) { + $this->sectiontitle = $request->getVal( 'preloadtitle' ); + // Once wpSummary isn't being use for setting section titles, we should delete this. $this->summary = $request->getVal( 'preloadtitle' ); } elseif ( $this->section != 'new' && $request->getVal( 'summary' ) ) { @@ -703,7 +627,7 @@ class EditPage { $this->bot = $request->getBool( 'bot', true ); $this->nosummary = $request->getBool( 'nosummary' ); - // FIXME: unused variable? + // @todo FIXME: Unused variable? $this->oldid = $request->getInt( 'oldid' ); $this->live = $request->getCheck( 'live' ); @@ -730,131 +654,331 @@ class EditPage { } /** - * Make sure the form isn't faking a user's credentials. - * - * @param $request WebRequest - * @return bool - * @private + * Initialise form fields in the object + * Called on the first invocation, e.g. when a user clicks an edit link + * @return bool -- if the requested section is valid */ - function tokenOk( &$request ) { + function initialiseForm() { global $wgUser; - $token = $request->getVal( 'wpEditToken' ); - $this->mTokenOk = $wgUser->matchEditToken( $token ); - $this->mTokenOkExceptSuffix = $wgUser->matchEditTokenNoSuffix( $token ); - return $this->mTokenOk; + $this->edittime = $this->mArticle->getTimestamp(); + $this->textbox1 = $this->getContent( false ); + // activate checkboxes if user wants them to be always active + # Sort out the "watch" checkbox + if ( $wgUser->getOption( 'watchdefault' ) ) { + # Watch all edits + $this->watchthis = true; + } elseif ( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) { + # Watch creations + $this->watchthis = true; + } elseif ( $this->mTitle->userIsWatching() ) { + # Already watched + $this->watchthis = true; + } + if ( $wgUser->getOption( 'minordefault' ) && !$this->isNew ) { + $this->minoredit = true; + } + if ( $this->textbox1 === false ) { + return false; + } + wfProxyCheck(); + return true; } /** - * Show all applicable editing introductions + * Fetch initial editing page content. + * + * @param $def_text string + * @return mixed string on success, $def_text for invalid sections + * @private */ - protected function showIntro() { - global $wgOut, $wgUser; - if ( $this->suppressIntro ) { - return; + function getContent( $def_text = '' ) { + global $wgOut, $wgRequest, $wgParser; + + wfProfileIn( __METHOD__ ); + # Get variables from query string :P + $section = $wgRequest->getVal( 'section' ); + + $preload = $wgRequest->getVal( 'preload', + // Custom preload text for new sections + $section === 'new' ? 'MediaWiki:addsection-preload' : '' ); + $undoafter = $wgRequest->getVal( 'undoafter' ); + $undo = $wgRequest->getVal( 'undo' ); + + // 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. + $text = $this->mTitle->getDefaultMessageText(); + if( $text === false ) { + $text = $this->getPreloadedText( $preload ); + } + } else { + # If requested, preload some text. + $text = $this->getPreloadedText( $preload ); + } + // For existing pages, get text based on "undo" or section parameters. + } else { + $text = $this->mArticle->getContent(); + if ( $undo > 0 && $undoafter > 0 && $undo < $undoafter ) { + # If they got undoafter and undo round the wrong way, switch them + list( $undo, $undoafter ) = array( $undoafter, $undo ); + } + if ( $undo > 0 && $undo > $undoafter ) { + # Undoing a specific edit overrides section editing; section-editing + # doesn't work with undoing. + if ( $undoafter ) { + $undorev = Revision::newFromId( $undo ); + $oldrev = Revision::newFromId( $undoafter ); + } else { + $undorev = Revision::newFromId( $undo ); + $oldrev = $undorev ? $undorev->getPrevious() : null; + } + + # 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() && + !$undorev->isDeleted( Revision::DELETED_TEXT ) && + !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { + + $undotext = $this->mArticle->getUndoText( $undorev, $oldrev ); + if ( $undotext === false ) { + # Warn the user that something went wrong + $this->editFormPageTop .= $wgOut->parse( '
' . + wfMsgNoTrans( 'undo-failure' ) . '
', true, /* interface */true ); + } else { + $text = $undotext; + # Inform the user of our success and set an automatic edit summary + $this->editFormPageTop .= $wgOut->parse( '
' . + wfMsgNoTrans( 'undo-success' ) . '
', true, /* interface */true ); + $firstrev = $oldrev->getNext(); + # If we just undid one rev, use an autosummary + if ( $firstrev->getId() == $undo ) { + $undoSummary = wfMsgForContent( 'undo-summary', $undo, $undorev->getUserText() ); + if ( $this->summary === '' ) { + $this->summary = $undoSummary; + } else { + $this->summary = $undoSummary . wfMsgForContent( 'colon-separator' ) . $this->summary; + } + $this->undidRev = $undo; + } + $this->formtype = 'diff'; + } + } else { + // Failed basic sanity checks. + // Older revisions may have been removed since the link + // was created, or we may simply have got bogus input. + $this->editFormPageTop .= $wgOut->parse( '
' . + wfMsgNoTrans( 'undo-norev' ) . '
', true, /* interface */true ); + } + } elseif ( $section != '' ) { + if ( $section == 'new' ) { + $text = $this->getPreloadedText( $preload ); + } else { + // Get section edit text (returns $def_text for invalid sections) + $text = $wgParser->getSection( $text, $section, $def_text ); + } + } } - $namespace = $this->mTitle->getNamespace(); + wfProfileOut( __METHOD__ ); + return $text; + } - if ( $namespace == NS_MEDIAWIKI ) { - # Show a warning if editing an interface message - $wgOut->wrapWikiMsg( "
\n$1\n
", 'editinginterface' ); + /** + * Use this method before edit() to preload some text into the edit box + * + * @param $text string + */ + public function setPreloadedText( $text ) { + $this->mPreloadText = $text; + } + + /** + * Get the contents to be preloaded into the box, either set by + * an earlier setPreloadText() or by loading the given page. + * + * @param $preload String: representing the title to preload from. + * @return String + */ + protected function getPreloadedText( $preload ) { + global $wgUser, $wgParser; + + if ( !empty( $this->mPreloadText ) ) { + return $this->mPreloadText; + } + + if ( $preload === '' ) { + return ''; } - # Show a warning message when someone creates/edits a user (talk) page but the user does not exist - # Show log extract when the user is currently blocked - if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) { - $parts = explode( '/', $this->mTitle->getText(), 2 ); - $username = $parts[0]; - $user = User::newFromName( $username, false /* allow IP users*/ ); - $ip = User::isIP( $username ); - if ( !$user->isLoggedIn() && !$ip ) { # User does not exist - $wgOut->wrapWikiMsg( "
\n$1\n
", - array( 'userpage-userdoesnotexist', $username ) ); - } else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked - LogEventsList::showLogExtract( - $wgOut, - 'block', - $user->getUserPage()->getPrefixedText(), - '', - array( - 'lim' => 1, - 'showIfEmpty' => false, - 'msgKey' => array( - 'blocked-notice-logextract', - $user->getName() # Support GENDER in notice - ) - ) - ); - } + $title = Title::newFromText( $preload ); + # Check for existence to avoid getting MediaWiki:Noarticletext + if ( $title === null || !$title->exists() || !$title->userCan( 'read' ) ) { + return ''; } - # Try to add a custom edit intro, or use the standard one if this is not possible. - if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) { - if ( $wgUser->isLoggedIn() ) { - $wgOut->wrapWikiMsg( "
\n$1\n
", 'newarticletext' ); - } else { - $wgOut->wrapWikiMsg( "
\n$1\n
", 'newarticletextanon' ); + + $page = WikiPage::factory( $title ); + if ( $page->isRedirect() ) { + $title = $page->getRedirectTarget(); + # Same as before + if ( $title === null || !$title->exists() || !$title->userCan( 'read' ) ) { + return ''; } + $page = WikiPage::factory( $title ); } - # Give a notice if the user is editing a deleted/moved page... - if ( !$this->mTitle->exists() ) { - LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), - '', array( 'lim' => 10, - 'conds' => array( "log_action != 'revision'" ), - 'showIfEmpty' => false, - 'msgKey' => array( 'recreate-moveddeleted-warn') ) - ); - } + + $parserOptions = ParserOptions::newFromUser( $wgUser ); + return $wgParser->getPreloadText( $page->getRawText(), $title, $parserOptions ); } /** - * Attempt to show a custom editing introduction, if supplied + * Make sure the form isn't faking a user's credentials. * + * @param $request WebRequest * @return bool + * @private */ - protected function showCustomIntro() { - if ( $this->editintro ) { - $title = Title::newFromText( $this->editintro ); - if ( $title instanceof Title && $title->exists() && $title->userCanRead() ) { - global $wgOut; - // Added using template syntax, to take 's into account. - $wgOut->addWikiTextTitleTidy( '{{:' . $title->getFullText() . '}}', $this->mTitle ); + function tokenOk( &$request ) { + global $wgUser; + $token = $request->getVal( 'wpEditToken' ); + $this->mTokenOk = $wgUser->matchEditToken( $token ); + $this->mTokenOkExceptSuffix = $wgUser->matchEditTokenNoSuffix( $token ); + return $this->mTokenOk; + } + + /** + * Attempt submission + * @return bool false if output is done, true if the rest of the form should be displayed + */ + function attemptSave() { + global $wgUser, $wgOut; + + $resultDetails = false; + # Allow bots to exempt some edits from bot flagging + $bot = $wgUser->isAllowed( 'bot' ) && $this->bot; + $status = $this->internalAttemptSave( $resultDetails, $bot ); + // FIXME: once the interface for internalAttemptSave() is made nicer, this should use the message in $status + + if ( $status->value == self::AS_SUCCESS_UPDATE || $status->value == self::AS_SUCCESS_NEW_ARTICLE ) { + $this->didSave = true; + } + + switch ( $status->value ) { + case self::AS_HOOK_ERROR_EXPECTED: + case self::AS_CONTENT_TOO_BIG: + case self::AS_ARTICLE_WAS_DELETED: + case self::AS_CONFLICT_DETECTED: + case self::AS_SUMMARY_NEEDED: + case self::AS_TEXTBOX_EMPTY: + case self::AS_MAX_ARTICLE_SIZE_EXCEEDED: + case self::AS_END: return true; - } else { + + case self::AS_HOOK_ERROR: + case self::AS_FILTERING: return false; - } - } else { - return false; + + case self::AS_SUCCESS_NEW_ARTICLE: + $query = $resultDetails['redirect'] ? 'redirect=no' : ''; + $anchor = isset ( $resultDetails['sectionanchor'] ) ? $resultDetails['sectionanchor'] : ''; + $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $anchor ); + 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_BLANK_ARTICLE: + $wgOut->redirect( $this->getContextTitle()->getFullURL() ); + return false; + + case self::AS_SPAM_ERROR: + $this->spamPageWithContent( $resultDetails['spam'] ); + return false; + + case self::AS_BLOCKED_PAGE_FOR_USER: + throw new UserBlockedError( $wgUser->mBlock ); + + case self::AS_IMAGE_REDIRECT_ANON: + case self::AS_IMAGE_REDIRECT_LOGGED: + throw new PermissionsError( 'upload' ); + + case self::AS_READ_ONLY_PAGE_ANON: + case self::AS_READ_ONLY_PAGE_LOGGED: + throw new PermissionsError( 'edit' ); + + case self::AS_READ_ONLY_PAGE: + throw new ReadOnlyError; + + case self::AS_RATE_LIMITED: + throw new ThrottledError(); + + case self::AS_NO_CREATE_PERMISSION: + $permission = $this->mTitle->isTalkPage() ? 'createtalk' : 'createpage'; + throw new PermissionsError( $permission ); + } + return false; } /** * Attempt submission (no UI) - * @return one of the constants describing the result + * + * @param $result + * @param $bot bool + * + * @return Status object, possibly with a message, but always with one of the AS_* constants in $status->value, + * + * FIXME: This interface is TERRIBLE, but hard to get rid of due to various error display idiosyncrasies. There are + * also lots of cases where error metadata is set in the object and retrieved later instead of being returned, e.g. + * AS_CONTENT_TOO_BIG and AS_BLOCKED_PAGE_FOR_USER. All that stuff needs to be cleaned up some time. */ function internalAttemptSave( &$result, $bot = false ) { - global $wgFilterCallback, $wgUser, $wgParser; + global $wgFilterCallback, $wgUser, $wgRequest, $wgParser; global $wgMaxArticleSize; + $status = Status::newGood(); + wfProfileIn( __METHOD__ ); wfProfileIn( __METHOD__ . '-checks' ); if ( !wfRunHooks( 'EditPage::attemptSave', array( $this ) ) ) { wfDebug( "Hook 'EditPage::attemptSave' aborted article saving\n" ); + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR; + return $status; } # Check image redirect if ( $this->mTitle->getNamespace() == NS_FILE && Title::newFromRedirect( $this->textbox1 ) instanceof Title && !$wgUser->isAllowed( 'upload' ) ) { - $isAnon = $wgUser->isAnon(); + $code = $wgUser->isAnon() ? self::AS_IMAGE_REDIRECT_ANON : self::AS_IMAGE_REDIRECT_LOGGED; + $status->setResult( false, $code ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return $isAnon ? self::AS_IMAGE_REDIRECT_ANON : self::AS_IMAGE_REDIRECT_LOGGED; + return $status; } # Check for spam @@ -864,75 +988,96 @@ class EditPage { } if ( $match !== false ) { $result['spam'] = $match; - $ip = wfGetIP(); + $ip = $wgRequest->getIP(); $pdbk = $this->mTitle->getPrefixedDBkey(); $match = str_replace( "\n", '', $match ); wfDebugLog( 'SpamRegex', "$ip spam regex hit [[$pdbk]]: \"$match\"" ); + $status->fatal( 'spamprotectionmatch', $match ); + $status->value = self::AS_SPAM_ERROR; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_SPAM_ERROR; + return $status; } - if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section, $this->hookError, $this->summary ) ) { + if ( $wgFilterCallback && is_callable( $wgFilterCallback ) && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section, $this->hookError, $this->summary ) ) { # Error messages or other handling should be performed by the filter function + $status->setResult( false, self::AS_FILTERING ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_FILTERING; + return $status; } if ( !wfRunHooks( 'EditFilter', array( $this, $this->textbox1, $this->section, &$this->hookError, $this->summary ) ) ) { # Error messages etc. could be handled within the hook... + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR; + return $status; } elseif ( $this->hookError != '' ) { # ...or the hook could be expecting us to produce an error + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR_EXPECTED; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR_EXPECTED; + return $status; } + if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) { + // Auto-block user's IP if the account was "hard" blocked + $wgUser->spreadAnyEditBlock(); # Check block state against master, thus 'false'. + $status->setResult( false, self::AS_BLOCKED_PAGE_FOR_USER ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_BLOCKED_PAGE_FOR_USER; + return $status; } + $this->kblength = (int)( strlen( $this->textbox1 ) / 1024 ); if ( $this->kblength > $wgMaxArticleSize ) { // Error will be displayed by showEditForm() $this->tooBig = true; + $status->setResult( false, self::AS_CONTENT_TOO_BIG ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_CONTENT_TOO_BIG; + return $status; } if ( !$wgUser->isAllowed( 'edit' ) ) { if ( $wgUser->isAnon() ) { + $status->setResult( false, self::AS_READ_ONLY_PAGE_ANON ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_READ_ONLY_PAGE_ANON; + return $status; } else { + $status->fatal( 'readonlytext' ); + $status->value = self::AS_READ_ONLY_PAGE_LOGGED; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_READ_ONLY_PAGE_LOGGED; + return $status; } } if ( wfReadOnly() ) { + $status->fatal( 'readonlytext' ); + $status->value = self::AS_READ_ONLY_PAGE; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_READ_ONLY_PAGE; + return $status; } if ( $wgUser->pingLimiter() ) { + $status->fatal( 'actionthrottledtext' ); + $status->value = self::AS_RATE_LIMITED; wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_RATE_LIMITED; + return $status; } # If the article has been deleted while editing, don't save it without # confirmation if ( $this->wasDeletedSinceLastEdit() && !$this->recreate ) { + $status->setResult( false, self::AS_ARTICLE_WAS_DELETED ); wfProfileOut( __METHOD__ . '-checks' ); wfProfileOut( __METHOD__ ); - return self::AS_ARTICLE_WAS_DELETED; + return $status; } wfProfileOut( __METHOD__ . '-checks' ); @@ -944,50 +1089,83 @@ class EditPage { if ( $new ) { // Late check for create permission, just in case *PARANOIA* if ( !$this->mTitle->userCan( 'create' ) ) { + $status->fatal( 'nocreatetext' ); + $status->value = self::AS_NO_CREATE_PERMISSION; wfDebug( __METHOD__ . ": no create permission\n" ); wfProfileOut( __METHOD__ ); - return self::AS_NO_CREATE_PERMISSION; + return $status; } # Don't save a new article if it's blank. if ( $this->textbox1 == '' ) { + $status->setResult( false, self::AS_BLANK_ARTICLE ); wfProfileOut( __METHOD__ ); - return self::AS_BLANK_ARTICLE; + return $status; } // Run post-section-merge edit filter if ( !wfRunHooks( 'EditFilterMerged', array( $this, $this->textbox1, &$this->hookError, $this->summary ) ) ) { # Error messages etc. could be handled within the hook... + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR; wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR; + return $status; } elseif ( $this->hookError != '' ) { # ...or the hook could be expecting us to produce an error + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR_EXPECTED; wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR_EXPECTED; + return $status; } # Handle the user preference to force summaries here. Check if it's not a redirect. if ( !$this->allowBlankSummary && !Title::newFromRedirect( $this->textbox1 ) ) { if ( md5( $this->summary ) == $this->autoSumm ) { $this->missingSummary = true; + $status->fatal( 'missingsummary' ); // or 'missingcommentheader' if $section == 'new'. Blegh + $status->value = self::AS_SUMMARY_NEEDED; wfProfileOut( __METHOD__ ); - return self::AS_SUMMARY_NEEDED; + return $status; } } $text = $this->textbox1; - if ( $this->section == 'new' && $this->summary != '' ) { - $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $this->summary ) . "\n\n" . $text; + $result['sectionanchor'] = ''; + if ( $this->section == 'new' ) { + if ( $this->sectiontitle != '' ) { + // Insert the section title above the content. + $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $this->sectiontitle ) . "\n\n" . $text; + + // Jump to the new section + $result['sectionanchor'] = $wgParser->guessLegacySectionNameFromWikiText( $this->sectiontitle ); + + // If no edit summary was specified, create one automatically from the section + // title and have it link to the new section. Otherwise, respect the summary as + // passed. + if ( $this->summary == '' ) { + $cleanSectionTitle = $wgParser->stripSectionName( $this->sectiontitle ); + $this->summary = wfMsgForContent( 'newsectionsummary', $cleanSectionTitle ); + } + } elseif ( $this->summary != '' ) { + // Insert the section title above the content. + $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $this->summary ) . "\n\n" . $text; + + // Jump to the new section + $result['sectionanchor'] = $wgParser->guessLegacySectionNameFromWikiText( $this->summary ); + + // Create a link to the new section from the edit summary. + $cleanSummary = $wgParser->stripSectionName( $this->summary ); + $this->summary = wfMsgForContent( 'newsectionsummary', $cleanSummary ); + } } - $retval = self::AS_SUCCESS_NEW_ARTICLE; + $status->value = self::AS_SUCCESS_NEW_ARTICLE; } else { # Article exists. Check for edit conflict. $this->mArticle->clear(); # Force reload of dates, etc. - $this->mArticle->forUpdate( true ); # Lock the article wfDebug( "timestamp: {$this->mArticle->getTimestamp()}, edittime: {$this->edittime}\n" ); @@ -1005,15 +1183,12 @@ class EditPage { $this->isConflict = false; wfDebug( __METHOD__ .": conflict suppressed; new section\n" ); } + } elseif ( $this->section == '' && $this->userWasLastToEdit( $wgUser->getId(), $this->edittime ) ) { + # Suppress edit conflict with self, except for section edits where merging is required. + wfDebug( __METHOD__ . ": Suppressing edit conflict, same user.\n" ); + $this->isConflict = false; } } - $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 '" . @@ -1027,7 +1202,7 @@ class EditPage { wfDebug( __METHOD__ . ": activating conflict; section replace failed.\n" ); $this->isConflict = true; $text = $this->textbox1; // do not try to merge here! - } else if ( $this->isConflict ) { + } elseif ( $this->isConflict ) { # Attempt merge if ( $this->mergeChangesInto( $text ) ) { // Successful merge! Maybe we should tell the user the good news? @@ -1041,31 +1216,37 @@ class EditPage { } if ( $this->isConflict ) { + $status->setResult( false, self::AS_CONFLICT_DETECTED ); wfProfileOut( __METHOD__ ); - return self::AS_CONFLICT_DETECTED; + return $status; } - $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... + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR; wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR; + return $status; } elseif ( $this->hookError != '' ) { # ...or the hook could be expecting us to produce an error + $status->fatal( 'hookaborted' ); + $status->value = self::AS_HOOK_ERROR_EXPECTED; wfProfileOut( __METHOD__ ); - return self::AS_HOOK_ERROR_EXPECTED; + return $status; } # Handle the user preference to force summaries here, but not for null edits - if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp( $oldtext, $text ) + if ( $this->section != 'new' && !$this->allowBlankSummary + && 0 != strcmp( $this->mArticle->getContent(), $text ) && !Title::newFromRedirect( $text ) ) # check if it's not a redirect { if ( md5( $this->summary ) == $this->autoSumm ) { $this->missingSummary = true; + $status->fatal( 'missingsummary' ); + $status->value = self::AS_SUMMARY_NEEDED; wfProfileOut( __METHOD__ ); - return self::AS_SUMMARY_NEEDED; + return $status; } } @@ -1073,8 +1254,10 @@ class EditPage { if ( $this->section == 'new' && !$this->allowBlankSummary ) { if ( trim( $this->summary ) == '' ) { $this->missingSummary = true; + $status->fatal( 'missingsummary' ); // or 'missingcommentheader' if $section == 'new'. Blegh + $status->value = self::AS_SUMMARY_NEEDED; wfProfileOut( __METHOD__ ); - return self::AS_SUMMARY_NEEDED; + return $status; } } @@ -1084,9 +1267,11 @@ class EditPage { if ( $this->section == 'new' ) { if ( $this->textbox1 == '' ) { $this->missingComment = true; + $status->fatal( 'missingcommenttext' ); + $status->value = self::AS_TEXTBOX_EMPTY; wfProfileOut( __METHOD__ . '-sectionanchor' ); wfProfileOut( __METHOD__ ); - return self::AS_TEXTBOX_EMPTY; + return $status; } if ( $this->summary != '' ) { $sectionanchor = $wgParser->guessLegacySectionNameFromWikiText( $this->summary ); @@ -1102,7 +1287,7 @@ class EditPage { $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 ) { + if ( $hasmatch && strlen( $matches[2] ) > 0 ) { $sectionanchor = $wgParser->guessLegacySectionNameFromWikiText( $matches[2] ); } } @@ -1116,33 +1301,35 @@ class EditPage { $this->textbox1 = $text; $this->section = ''; - $retval = self::AS_SUCCESS_UPDATE; + $status->value = self::AS_SUCCESS_UPDATE; } // Check for length errors again now that the section is merged in $this->kblength = (int)( strlen( $text ) / 1024 ); if ( $this->kblength > $wgMaxArticleSize ) { $this->tooBig = true; + $status->setResult( false, self::AS_MAX_ARTICLE_SIZE_EXCEEDED ); wfProfileOut( __METHOD__ ); - return self::AS_MAX_ARTICLE_SIZE_EXCEEDED; + return $status; } $flags = EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY | ( $new ? EDIT_NEW : EDIT_UPDATE ) | - ( $this->minoredit ? EDIT_MINOR : 0 ) | + ( ( $this->minoredit && !$this->isNew ) ? EDIT_MINOR : 0 ) | ( $bot ? EDIT_FORCE_BOT : 0 ); - $status = $this->mArticle->doEdit( $text, $this->summary, $flags ); + $doEditStatus = $this->mArticle->doEdit( $text, $this->summary, $flags ); - if ( $status->isOK() ) { + if ( $doEditStatus->isOK() ) { $result['redirect'] = Title::newFromRedirect( $text ) !== null; $this->commitWatch(); wfProfileOut( __METHOD__ ); - return $retval; + return $status; } else { $this->isConflict = true; + $doEditStatus->value = self::AS_END; // Destroys data doEdit() put in $status->value but who cares wfProfileOut( __METHOD__ ); - return self::AS_END; + return $doEditStatus; } } @@ -1150,13 +1337,14 @@ class EditPage { * Commit the change of watch status */ protected function commitWatch() { + global $wgUser; if ( $this->watchthis xor $this->mTitle->userIsWatching() ) { $dbw = wfGetDB( DB_MASTER ); $dbw->begin(); if ( $this->watchthis ) { - $this->mArticle->doWatch(); + WatchAction::doWatch( $this->mTitle, $wgUser ); } else { - $this->mArticle->doUnwatch(); + WatchAction::doUnwatch( $this->mTitle, $wgUser ); } $dbw->commit(); } @@ -1166,6 +1354,11 @@ class EditPage { * Check if no edits were made by other users since * the time a user started editing the page. Limit to * 50 revisions for the sake of performance. + * + * @param $id int + * @param $edittime string + * + * @return bool */ protected function userWasLastToEdit( $id, $edittime ) { if( !$id ) return false; @@ -1186,9 +1379,66 @@ class EditPage { return true; } + /** + * @private + * @todo document + * + * @parma $editText string + * + * @return bool + */ + function mergeChangesInto( &$editText ){ + wfProfileIn( __METHOD__ ); + + $db = wfGetDB( DB_MASTER ); + + // This is the revision the editor started from + $baseRevision = $this->getBaseRevision(); + if ( is_null( $baseRevision ) ) { + wfProfileOut( __METHOD__ ); + return false; + } + $baseText = $baseRevision->getText(); + + // The current state, we want to merge updates into it + $currentRevision = Revision::loadFromTitle( $db, $this->mTitle ); + if ( is_null( $currentRevision ) ) { + wfProfileOut( __METHOD__ ); + return false; + } + $currentText = $currentRevision->getText(); + + $result = ''; + if ( wfMerge( $baseText, $editText, $currentText, $result ) ) { + $editText = $result; + wfProfileOut( __METHOD__ ); + return true; + } else { + wfProfileOut( __METHOD__ ); + return false; + } + } + + /** + * @return Revision + */ + function getBaseRevision() { + if ( !$this->mBaseRevision ) { + $db = wfGetDB( DB_MASTER ); + $baseRevision = Revision::loadFromTimestamp( + $db, $this->mTitle, $this->edittime ); + return $this->mBaseRevision = $baseRevision; + } else { + return $this->mBaseRevision; + } + } + /** * Check given input text against $wgSpamRegex, and return the text of the first match. - * @return mixed -- matching string or false + * + * @param $text string + * + * @return string|false matching string or false */ public static function matchSpamRegex( $text ) { global $wgSpamRegex; @@ -1199,7 +1449,10 @@ class EditPage { /** * Check given input text against $wgSpamRegex, and return the text of the first match. - * @return mixed -- matching string or false + * + * @parma $text string + * + * @return string|false matching string or false */ public static function matchSummarySpamRegex( $text ) { global $wgSummarySpamRegex; @@ -1207,6 +1460,11 @@ class EditPage { return self::matchSpamRegexInternal( $text, $regexes ); } + /** + * @param $text string + * @param $regexes array + * @return bool|string + */ protected static function matchSpamRegexInternal( $text, $regexes ) { foreach( $regexes as $regex ) { $matches = array(); @@ -1217,44 +1475,14 @@ class EditPage { return false; } - /** - * Initialise form fields in the object - * Called on the first invocation, e.g. when a user clicks an edit link - * @returns bool -- if the requested section is valid - */ - function initialiseForm() { - global $wgUser; - $this->edittime = $this->mArticle->getTimestamp(); - $this->textbox1 = $this->getContent( false ); - // activate checkboxes if user wants them to be always active - # Sort out the "watch" checkbox - if ( $wgUser->getOption( 'watchdefault' ) ) { - # Watch all edits - $this->watchthis = true; - } elseif ( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) { - # Watch creations - $this->watchthis = true; - } elseif ( $this->mTitle->userIsWatching() ) { - # Already watched - $this->watchthis = true; - } - if ( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true; - if ( $this->textbox1 === false ) return false; - wfProxyCheck(); - return true; - } - function setHeaders() { global $wgOut; $wgOut->setRobotPolicy( 'noindex,nofollow' ); - if ( $this->formtype == 'preview' ) { - $wgOut->setPageTitleActionText( wfMsg( 'preview' ) ); - } if ( $this->isConflict ) { - $wgOut->setPageTitle( wfMsg( 'editconflict', $this->getContextTitle()->getPrefixedText() ) ); + $wgOut->setPageTitle( wfMessage( 'editconflict', $this->getContextTitle()->getPrefixedText() ) ); } elseif ( $this->section != '' ) { $msg = $this->section == 'new' ? 'editingcomment' : 'editingsection'; - $wgOut->setPageTitle( wfMsg( $msg, $this->getContextTitle()->getPrefixedText() ) ); + $wgOut->setPageTitle( wfMessage( $msg, $this->getContextTitle()->getPrefixedText() ) ); } else { # Use the title defined by DISPLAYTITLE magic word when present if ( isset( $this->mParserOutput ) @@ -1263,23 +1491,103 @@ class EditPage { } else { $title = $this->getContextTitle()->getPrefixedText(); } - $wgOut->setPageTitle( wfMsg( 'editing', $title ) ); + $wgOut->setPageTitle( wfMessage( 'editing', $title ) ); + } + } + + /** + * Show all applicable editing introductions + */ + protected function showIntro() { + global $wgOut, $wgUser; + if ( $this->suppressIntro ) { + return; + } + + $namespace = $this->mTitle->getNamespace(); + + if ( $namespace == NS_MEDIAWIKI ) { + # Show a warning if editing an interface message + $wgOut->wrapWikiMsg( "
\n$1\n
", 'editinginterface' ); + } + + # Show a warning message when someone creates/edits a user (talk) page but the user does not exist + # Show log extract when the user is currently blocked + if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) { + $parts = explode( '/', $this->mTitle->getText(), 2 ); + $username = $parts[0]; + $user = User::newFromName( $username, false /* allow IP users*/ ); + $ip = User::isIP( $username ); + if ( !($user && $user->isLoggedIn()) && !$ip ) { # User does not exist + $wgOut->wrapWikiMsg( "
\n$1\n
", + array( 'userpage-userdoesnotexist', wfEscapeWikiText( $username ) ) ); + } elseif ( $user->isBlocked() ) { # Show log extract if the user is currently blocked + LogEventsList::showLogExtract( + $wgOut, + 'block', + $user->getUserPage(), + '', + array( + 'lim' => 1, + 'showIfEmpty' => false, + 'msgKey' => array( + 'blocked-notice-logextract', + $user->getName() # Support GENDER in notice + ) + ) + ); + } + } + # Try to add a custom edit intro, or use the standard one if this is not possible. + if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) { + if ( $wgUser->isLoggedIn() ) { + $wgOut->wrapWikiMsg( "
\n$1\n
", 'newarticletext' ); + } else { + $wgOut->wrapWikiMsg( "
\n$1\n
", 'newarticletextanon' ); + } + } + # Give a notice if the user is editing a deleted/moved page... + if ( !$this->mTitle->exists() ) { + LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle, + '', array( 'lim' => 10, + 'conds' => array( "log_action != 'revision'" ), + 'showIfEmpty' => false, + 'msgKey' => array( 'recreate-moveddeleted-warn') ) + ); + } + } + + /** + * Attempt to show a custom editing introduction, if supplied + * + * @return bool + */ + protected function showCustomIntro() { + if ( $this->editintro ) { + $title = Title::newFromText( $this->editintro ); + if ( $title instanceof Title && $title->exists() && $title->userCan( 'read' ) ) { + global $wgOut; + // Added using template syntax, to take 's into account. + $wgOut->addWikiTextTitleTidy( '{{:' . $title->getFullText() . '}}', $this->mTitle ); + return true; + } else { + return false; + } + } else { + return false; } } /** * Send the edit form and related headers to $wgOut - * @param $formCallback Optional callable that takes an OutputPage - * parameter; will be called during form output - * near the top, for captchas and the like. + * @param $formCallback Callback that takes an OutputPage parameter; will be called + * during form output near the top, for captchas and the like. */ function showEditForm( $formCallback = null ) { global $wgOut, $wgUser; wfProfileIn( __METHOD__ ); - $sk = $wgUser->getSkin(); - #need to parse the preview early so that we know which templates are used, #otherwise users with "show preview after edit box" will get a blank list #we parse this near the beginning so that setHeaders can do the title @@ -1320,10 +1628,10 @@ class EditPage { $wgOut->addHTML( $this->editFormTextTop ); $templates = $this->getTemplates(); - $formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != ''); + $formattedtemplates = Linker::formatTemplates( $templates, $this->preview, $this->section != ''); $hiddencats = $this->mArticle->getHiddenCategories(); - $formattedhiddencats = $sk->formatHiddenCategories( $hiddencats ); + $formattedhiddencats = Linker::formatHiddenCategories( $hiddencats ); if ( $this->wasDeletedSinceLastEdit() && 'save' != $this->formtype ) { $wgOut->wrapWikiMsg( @@ -1336,7 +1644,6 @@ class EditPage { // @todo move this to a cleaner conditional instead of blanking a variable } $wgOut->addHTML( << HTML ); @@ -1356,12 +1663,14 @@ HTML // 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? - $key = $comment ? 'confirmrecreate' : 'confirmrecreate-noreason'; + $key = $comment === '' + ? 'confirmrecreate-noreason' + : 'confirmrecreate'; $wgOut->addHTML( '
' . wfMsgExt( $key, 'parseinline', $username, "$comment" ) . Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false, - array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' ) + array( 'title' => Linker::titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' ) ) . '
' ); @@ -1389,6 +1698,8 @@ HTML $wgOut->addHTML( $this->editFormTextBeforeContent ); + $wgOut->addHTML( $toolbar ); + if ( $this->isConflict ) { // In an edit conflict bypass the overrideable content form method // and fallback to the raw wpTextbox1 since editconflicts can't be @@ -1435,6 +1746,22 @@ HTML wfProfileOut( __METHOD__ ); } + /** + * Extract the section title from current section text, if any. + * + * @param string $text + * @return Mixed|string or false + */ + public static function extractSectionTitle( $text ) { + preg_match( "/^(=+)(.+)\\1(\n|$)/i", $text, $matches ); + if ( !empty( $matches[2] ) ) { + global $wgParser; + return $wgParser->stripSectionName(trim($matches[2])); + } else { + return false; + } + } + protected function showHeader() { global $wgOut, $wgUser, $wgMaxArticleSize, $wgLang; if ( $this->isConflict ) { @@ -1452,12 +1779,9 @@ HTML if ( $this->section != '' && $this->section != 'new' ) { $matches = array(); if ( !$this->summary && !$this->preview && !$this->diff ) { - preg_match( "/^(=+)(.+)\\1/mi", $this->textbox1, $matches ); - if ( !empty( $matches[2] ) ) { - global $wgParser; - $this->summary = "/* " . - $wgParser->stripSectionName(trim($matches[2])) . - " */ "; + $sectionTitle = self::extractSectionTitle( $this->textbox1 ); + if ( $sectionTitle !== false ) { + $this->summary = "/* $sectionTitle */ "; } } } @@ -1487,7 +1811,7 @@ HTML if ( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) { $wgOut->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-permission' ); - } else if ( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { + } elseif ( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { $wgOut->wrapWikiMsg( "
\n$1\n
\n", 'rev-deleted-text-view' ); } @@ -1510,7 +1834,7 @@ HTML if ( $this->isCssJsSubpage ) { # Check the skin exists if ( $this->isWrongCaseCssJsPage ) { - $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'userinvalidcssjstitle', $this->getContextTitle()->getSkinFromCssJsSubpage() ) ); + $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) ); } if ( $this->formtype !== 'preview' ) { if ( $this->isCssSubpage ) @@ -1529,7 +1853,7 @@ HTML # Then it must be protected based on static groups (regular) $noticeMsg = 'protectedpagewarning'; } - LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '', + LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle, '', array( 'lim' => 1, 'msgKey' => array( $noticeMsg ) ) ); } if ( $this->mTitle->isCascadeProtected() ) { @@ -1547,7 +1871,7 @@ HTML $wgOut->wrapWikiMsg( $notice, array( 'cascadeprotectedwarning', $cascadeSourcesCount ) ); } if ( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) ) { - LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '', + LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle, '', array( 'lim' => 1, 'showIfEmpty' => false, 'msgKey' => array( 'titleprotectedwarning' ), @@ -1577,15 +1901,14 @@ HTML * inferred by the id given to the input. You can remove them both by * passing array( 'id' => false ) to $userInputAttrs. * - * @param $summary The value of the summary input - * @param $labelText The html to place inside the label - * @param $inputAttrs An array of attrs to use on the input - * @param $spanLabelAttrs An array of attrs to use on the span inside the label + * @param $summary string The value of the summary input + * @param $labelText string The html to place inside the label + * @param $inputAttrs array of attrs to use on the input + * @param $spanLabelAttrs array of attrs to use on the span inside the label * * @return array An array in the format array( $label, $input ) */ function getSummaryInput($summary = "", $labelText = null, $inputAttrs = null, $spanLabelAttrs = null) { - global $wgUser; //Note: the maxlength is overriden in JS to 250 and to make it use UTF-8 bytes, not characters. $inputAttrs = ( is_array($inputAttrs) ? $inputAttrs : array() ) + array( 'id' => 'wpSummary', @@ -1593,7 +1916,7 @@ HTML 'tabindex' => '1', 'size' => 60, 'spellcheck' => 'true', - ) + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'summary' ); + ) + Linker::tooltipAndAccesskeyAttribs( 'summary' ); $spanLabelAttrs = ( is_array($spanLabelAttrs) ? $spanLabelAttrs : array() ) + array( 'class' => $this->missingSummary ? 'mw-summarymissed' : 'mw-summary', @@ -1623,11 +1946,13 @@ HTML # Add a class if 'missingsummary' is triggered to allow styling of the summary line $summaryClass = $this->missingSummary ? 'mw-summarymissed' : 'mw-summary'; if ( $isSubjectPreview ) { - if ( $this->nosummary ) + if ( $this->nosummary ) { return; + } } else { - if ( !$this->mShowSummaryField ) + if ( !$this->mShowSummaryField ) { return; + } } $summary = $wgContLang->recodeForEdit( $summary ); $labelText = wfMsgExt( $isSubjectPreview ? 'subject' : 'summary', 'parseinline' ); @@ -1646,15 +1971,14 @@ HTML if ( !$summary || ( !$this->preview && !$this->diff ) ) return ""; - global $wgParser, $wgUser; - $sk = $wgUser->getSkin(); + global $wgParser; if ( $isSubjectPreview ) $summary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $summary ) ); $message = $isSubjectPreview ? 'subject-preview' : 'summary-preview'; - $summary = wfMsgExt( $message, 'parseinline' ) . $sk->commentBlock( $summary, $this->mTitle, $isSubjectPreview ); + $summary = wfMsgExt( $message, 'parseinline' ) . Linker::commentBlock( $summary, $this->mTitle, $isSubjectPreview ); return Xml::tags( 'div', array( 'class' => 'mw-summary-preview' ), $summary ); } @@ -1687,7 +2011,7 @@ HTML * include the constant suffix to prevent editing from * broken text-mangling proxies. */ - $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" ); + $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->getEditToken() ) . "\n" ); } /** @@ -1720,6 +2044,10 @@ HTML # Then it must be protected based on static groups (regular) $classes[] = 'mw-textarea-protected'; } + # Is the title cascade-protected? + if ( $this->mTitle->isCascadeProtected() ) { + $classes[] = 'mw-textarea-cprotected'; + } } $attribs = array( 'tabindex' => 1 ); if ( is_array($customAttribs) ) @@ -1737,14 +2065,14 @@ HTML } protected function showTextbox2() { - $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6 ) ); + $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6, 'readonly' ) ); } protected function showTextbox( $content, $name, $customAttribs = array() ) { global $wgOut, $wgUser; $wikitext = $this->safeUnicodeOutput( $content ); - if ( $wikitext !== '' ) { + if ( strval($wikitext) !== '' ) { // 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 @@ -1760,6 +2088,10 @@ HTML 'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work ); + $pageLang = $this->mTitle->getPageLanguage(); + $attribs['lang'] = $pageLang->getCode(); + $attribs['dir'] = $pageLang->getDir(); + $wgOut->addHTML( Html::textarea( $name, $wikitext, $attribs ) ); } @@ -1807,6 +2139,39 @@ HTML } } + /** + * 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. + */ + function showDiff() { + global $wgUser, $wgContLang, $wgParser; + + $oldtext = $this->mArticle->fetchContent(); + $newtext = $this->mArticle->replaceSection( + $this->section, $this->textbox1, $this->summary, $this->edittime ); + + wfRunHooks( 'EditPageGetDiffText', array( $this, &$newtext ) ); + + $popts = ParserOptions::newFromUserAndLang( $wgUser, $wgContLang ); + $newtext = $wgParser->preSaveTransform( $newtext, $this->mTitle, $wgUser, $popts ); + $oldtitle = wfMsgExt( 'currentrev', array( 'parseinline' ) ); + $newtitle = wfMsgExt( 'yourtext', array( 'parseinline' ) ); + if ( $oldtext !== false || $newtext != '' ) { + $de = new DifferenceEngine( $this->mArticle->getContext() ); + $de->setText( $oldtext, $newtext ); + $difftext = $de->getDiff( $oldtitle, $newtitle ); + $de->showDiffStyle(); + } else { + $difftext = ''; + } + + global $wgOut; + $wgOut->addHTML( '
' . $difftext . '
' ); + } + /** * Give a chance for site and per-namespace customizations of * terms of service summary link that might exist separately @@ -1821,16 +2186,16 @@ HTML if( !wfMessage( $msg )->isDisabled() ) { global $wgOut; $wgOut->addHTML( '
' ); - $wgOut->addWikiMsgArray( $msg, array() ); + $wgOut->addWikiMsg( $msg ); $wgOut->addHTML( '
' ); } } protected function showEditTools() { global $wgOut; - $wgOut->addHTML( '
' ); - $wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) ); - $wgOut->addHTML( '
' ); + $wgOut->addHTML( '
' . + wfMessage( 'edittools' )->inContentLanguage()->parse() . + '
' ); } protected function getCopywarn() { @@ -1851,7 +2216,7 @@ HTML } protected function showStandardInputs( &$tabindex = 2 ) { - global $wgOut, $wgUser; + global $wgOut; $wgOut->addHTML( "
\n" ); if ( $this->section != 'new' ) { @@ -1859,23 +2224,25 @@ HTML $wgOut->addHTML( $this->getSummaryPreview( false, $this->summary ) ); } - $checkboxes = $this->getCheckboxes( $tabindex, $wgUser->getSkin(), + $checkboxes = $this->getCheckboxes( $tabindex, array( 'minor' => $this->minoredit, 'watch' => $this->watchthis ) ); $wgOut->addHTML( "
" . implode( $checkboxes, "\n" ) . "
\n" ); $wgOut->addHTML( "
\n" ); $wgOut->addHTML( implode( $this->getEditButtons( $tabindex ), "\n" ) . "\n" ); $cancel = $this->getCancelLink(); - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); + if ( $cancel !== '' ) { + $cancel .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); + } $edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' ) ); $edithelp = ''. htmlspecialchars( wfMsg( 'edithelp' ) ).' '. htmlspecialchars( wfMsg( 'newwindow' ) ); - $wgOut->addHTML( " {$cancel}{$separator}{$edithelp}\n" ); + $wgOut->addHTML( " {$cancel}{$edithelp}\n" ); $wgOut->addHTML( "
\n
\n" ); } - /* + /** * Show an edit conflict. textbox1 is already shown in showEditForm(). * If you want to use another entry point to this function, be careful. */ @@ -1886,15 +2253,71 @@ HTML if ( wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) { $wgOut->wrapWikiMsg( '

$1

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

$1

', "yourtext" ); $this->showTextbox2(); } } + /** + * @return string + */ + public function getCancelLink() { + $cancelParams = array(); + if ( !$this->isConflict && $this->mArticle->getOldID() > 0 ) { + $cancelParams['oldid'] = $this->mArticle->getOldID(); + } + + return Linker::linkKnown( + $this->getContextTitle(), + wfMsgExt( 'cancel', array( 'parseinline' ) ), + array( 'id' => 'mw-editform-cancel' ), + $cancelParams + ); + } + + /** + * Returns the URL to use in the form's action attribute. + * This is used by EditPage subclasses when simply customizing the action + * variable in the constructor is not enough. This can be used when the + * EditPage lives inside of a Special page rather than a custom page action. + * + * @param $title Title object for which is being edited (where we go to for &action= links) + * @return string + */ + protected function getActionURL( Title $title ) { + return $title->getLocalURL( array( 'action' => $this->action ) ); + } + + /** + * Check if a page was deleted while the user was editing it, before submit. + * 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. + */ + protected function wasDeletedSinceLastEdit() { + if ( $this->deletedSinceEdit !== null ) { + return $this->deletedSinceEdit; + } + + $this->deletedSinceEdit = false; + + if ( $this->mTitle->isDeletedQuick() ) { + $this->lastDelete = $this->getLastDelete(); + if ( $this->lastDelete ) { + $deleteTime = wfTimestamp( TS_MW, $this->lastDelete->log_timestamp ); + if ( $deleteTime > $this->starttime ) { + $this->deletedSinceEdit = true; + } + } + } + + return $this->deletedSinceEdit; + } + protected function getLastDelete() { $dbr = wfGetDB( DB_SLAVE ); $data = $dbr->selectRow( @@ -1932,17 +2355,32 @@ HTML * @return string */ function getPreviewText() { - global $wgOut, $wgUser, $wgParser; + global $wgOut, $wgUser, $wgParser, $wgRawHtml; wfProfileIn( __METHOD__ ); + if ( $wgRawHtml && !$this->mTokenOk ) { + // Could be an offsite preview attempt. This is very unsafe if + // HTML is enabled, as it could be an attack. + $parsedNote = ''; + if ( $this->textbox1 !== '' ) { + // Do not put big scary notice, if previewing the empty + // string, which happens when you initially edit + // a category page, due to automatic preview-on-open. + $parsedNote = $wgOut->parse( "
" . + wfMsg( 'session_fail_preview_html' ) . "
", true, /* interface */true ); + } + wfProfileOut( __METHOD__ ); + return $parsedNote; + } + if ( $this->mTriedSave && !$this->mTokenOk ) { if ( $this->mTokenOkExceptSuffix ) { $note = wfMsg( 'token_suffix_mismatch' ); } else { $note = wfMsg( 'session_fail_preview' ); } - } else if ( $this->incompleteForm ) { + } elseif ( $this->incompleteForm ) { $note = wfMsg( 'edit_form_incomplete' ); } else { $note = wfMsg( 'previewnote' ); @@ -1950,41 +2388,36 @@ HTML $parserOptions = ParserOptions::newFromUser( $wgUser ); $parserOptions->setEditSection( false ); + $parserOptions->setTidy( true ); $parserOptions->setIsPreview( true ); $parserOptions->setIsSectionPreview( !is_null($this->section) && $this->section !== '' ); - global $wgRawHtml; - if ( $wgRawHtml && !$this->mTokenOk ) { - // Could be an offsite preview attempt. This is very unsafe if - // HTML is enabled, as it could be an attack. - $parsedNote = $wgOut->parse( "
" . - wfMsg( 'session_fail_preview_html' ) . "
" ); - wfProfileOut( __METHOD__ ); - return $parsedNote; - } - - # don't parse user css/js, show message about preview + # don't parse non-wikitext pages, show message about preview # XXX: stupid php bug won't let us use $this->getContextTitle()->isCssJsSubpage() here -- This note has been there since r3530. Sure the bug was fixed time ago? - if ( $this->isCssJsSubpage || $this->mTitle->isCssOrJsPage() ) { - $level = 'user'; - if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + if ( $this->isCssJsSubpage || !$this->mTitle->isWikitextPage() ) { + if( $this->mTitle->isCssJsSubpage() ) { + $level = 'user'; + } elseif( $this->mTitle->isCssOrJsPage() ) { $level = 'site'; + } else { + $level = false; } # Used messages to make sure grep find them: # Messages: usercsspreview, userjspreview, sitecsspreview, sitejspreview - if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) { - $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!' ); + if( $level ) { + if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) { + $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; $previewHTML .= "
\n" . htmlspecialchars( $this->textbox1 ) . "\n
\n"; @@ -2003,17 +2436,10 @@ HTML 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 ), - $this->mTitle, $parserOptions ); + + $toparse = $wgParser->preSaveTransform( $toparse, $this->mTitle, $wgUser, $parserOptions ); + $parserOutput = $wgParser->parse( $toparse, $this->mTitle, $parserOptions ); $previewHTML = $parserOutput->getText(); $this->mParserOutput = $parserOutput; @@ -2033,223 +2459,35 @@ HTML $previewhead = "
\n" . '

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

" . - $wgOut->parse( $note ) . $conflict . "
\n"; + $wgOut->parse( $note, true, /* interface */true ) . $conflict . "\n"; + + $pageLang = $this->mTitle->getPageLanguage(); + $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(), + 'class' => 'mw-content-'.$pageLang->getDir() ); + $previewHTML = Html::rawElement( 'div', $attribs, $previewHTML ); wfProfileOut( __METHOD__ ); return $previewhead . $previewHTML . $this->previewTextAfterContent; } - function getTemplates() { - if ( $this->preview || $this->section != '' ) { - $templates = array(); - if ( !isset( $this->mParserOutput ) ) return $templates; - foreach( $this->mParserOutput->getTemplates() as $ns => $template) { - foreach( array_keys( $template ) as $dbk ) { - $templates[] = Title::makeTitle($ns, $dbk); - } - } - return $templates; - } else { - return $this->mArticle->getUsedTemplates(); - } - } - - /** - * Call the stock "user is blocked" page - */ - function blockedPage() { - global $wgOut; - $wgOut->blockedPage( false ); # Standard block notice on the top, don't 'return' - - # If the user made changes, preserve them when showing the markup - # (This happens when a user is blocked during edit, for instance) - $first = $this->firsttime || ( !$this->save && $this->textbox1 == '' ); - if ( $first ) { - $source = $this->mTitle->exists() ? $this->getContent() : false; - } else { - $source = $this->textbox1; - } - - # Spit out the source or the user's modified version - if ( $source !== false ) { - $wgOut->addHTML( '
' ); - $wgOut->addWikiMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ); - $this->showTextbox1( array( 'readonly' ), $source ); - } - } - - /** - * Produce the stock "please login to edit pages" page - */ - function userNotLoggedInPage() { - global $wgUser, $wgOut; - $skin = $wgUser->getSkin(); - - $loginTitle = SpecialPage::getTitleFor( 'Userlogin' ); - $loginLink = $skin->link( - $loginTitle, - wfMsgHtml( 'loginreqlink' ), - array(), - array( 'returnto' => $this->getContextTitle()->getPrefixedText() ), - array( 'known', 'noclasses' ) - ); - - $wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) ); - $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->setArticleRelated( false ); - - $wgOut->addWikiMsgArray( 'whitelistedittext', array( $loginLink ), array( 'replaceafter' ) ); - $wgOut->returnToMain( false, $this->getContextTitle() ); - } - - /** - * Creates a basic error page which informs the user that - * they have attempted to edit a nonexistent section. - */ - function noSuchSectionPage() { - global $wgOut; - - $wgOut->setPageTitle( wfMsg( 'nosuchsectiontitle' ) ); - $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->setArticleRelated( false ); - - $res = wfMsgExt( 'nosuchsectiontext', 'parse', $this->section ); - wfRunHooks( 'EditPageNoSuchSection', array( &$this, &$res ) ); - $wgOut->addHTML( $res ); - - $wgOut->returnToMain( false, $this->mTitle ); - } - - /** - * Produce the stock "your edit contains spam" page - * - * @param $match Text which triggered one or more filters - * @deprecated Use method spamPageWithContent() instead - */ - static function spamPage( $match = false ) { - global $wgOut, $wgTitle; - - $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->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; - $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( $this->getContextTitle(), array( 'action' => 'edit' ) ); - } - - - /** - * @private - * @todo document - */ - function mergeChangesInto( &$editText ){ - wfProfileIn( __METHOD__ ); - - $db = wfGetDB( DB_MASTER ); - - // This is the revision the editor started from - $baseRevision = $this->getBaseRevision(); - if ( is_null( $baseRevision ) ) { - wfProfileOut( __METHOD__ ); - return false; - } - $baseText = $baseRevision->getText(); - - // The current state, we want to merge updates into it - $currentRevision = Revision::loadFromTitle( $db, $this->mTitle ); - if ( is_null( $currentRevision ) ) { - wfProfileOut( __METHOD__ ); - return false; - } - $currentText = $currentRevision->getText(); - - $result = ''; - if ( wfMerge( $baseText, $editText, $currentText, $result ) ) { - $editText = $result; - wfProfileOut( __METHOD__ ); - return true; - } else { - wfProfileOut( __METHOD__ ); - return false; - } - } - - /** - * Check if the browser is on a blacklist of user-agents known to - * mangle UTF-8 data on form submission. Returns true if Unicode - * should make it through, false if it's known to be a problem. - * @return bool - * @private - */ - function checkUnicodeCompliantBrowser() { - global $wgBrowserBlackList; - if ( empty( $_SERVER["HTTP_USER_AGENT"] ) ) { - // No User-Agent header sent? Trust it by default... - return true; - } - $currentbrowser = $_SERVER["HTTP_USER_AGENT"]; - foreach ( $wgBrowserBlackList as $browser ) { - if ( preg_match($browser, $currentbrowser) ) { - return false; - } - } - return true; - } - - /** - * @deprecated use $wgParser->stripSectionName() - */ - function pseudoParseSectionAnchor( $text ) { - global $wgParser; - return $wgParser->stripSectionName( $text ); - } - /** - * Format an anchor fragment as it would appear for a given section name - * @param $text String - * @return String - * @private + * @return Array */ - function sectionAnchor( $text ) { - global $wgParser; - return $wgParser->guessSectionNameFromWikiText( $text ); + function getTemplates() { + if ( $this->preview || $this->section != '' ) { + $templates = array(); + if ( !isset( $this->mParserOutput ) ) { + return $templates; + } + foreach( $this->mParserOutput->getTemplates() as $ns => $template) { + foreach( array_keys( $template ) as $dbk ) { + $templates[] = Title::makeTitle($ns, $dbk); + } + } + return $templates; + } else { + return $this->mArticle->getUsedTemplates(); + } } /** @@ -2270,10 +2508,8 @@ HTML * filename of the button image (without path), the opening * tag, the closing tag, optionally a sample text that is * inserted between the two when no selection is highlighted - * and an option to select which switches the automatic - * selection of inserted text (default is true, see - * mw-editbutton-image). The tip text is shown when the user - * moves the mouse over the button. + * and. The tip text is shown when the user moves the mouse + * over the button. * * Also here: accesskeys (key), which are not used yet until * someone can figure out a way to make them work in @@ -2334,7 +2570,6 @@ HTML 'sample' => wfMsg( 'image_sample' ), 'tip' => wfMsg( 'image_tip' ), 'key' => 'D', - 'select' => true ) : false, $imagesAvailable ? array( 'image' => $wgLang->getImageFile( 'button-media' ), @@ -2382,7 +2617,6 @@ HTML 'key' => 'R' ) ); - $toolbar = "
\n"; $script = ''; foreach ( $toolarray as $tool ) { @@ -2390,10 +2624,6 @@ HTML continue; } - if( !isset( $tool['select'] ) ) { - $tool['select'] = true; - } - $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. @@ -2407,16 +2637,11 @@ HTML $cssId = $tool['id'], ); - $paramList = implode( ',', - array_map( array( 'Xml', 'encodeJsVar' ), $params ) ); - $script .= "addButton($paramList);\n"; + $script .= Xml::encodeJsCall( 'mw.toolbar.addButton', $params ); } + $wgOut->addScript( Html::inlineScript( ResourceLoader::makeLoaderConditionalScript( $script ) ) ); - $wgOut->addScript( Html::inlineScript( - "if ( window.mediaWiki ) { jQuery(function(){{$script}}); }" - ) ); - - $toolbar .= "\n
"; + $toolbar = '
'; wfRunHooks( 'EditPageBeforeEditToolbar', array( &$toolbar ) ); @@ -2428,30 +2653,32 @@ HTML * minor and watch * * @param $tabindex Current tabindex - * @param $skin Skin object * @param $checked Array of checkbox => bool, where bool indicates the checked * status of the checkbox * * @return array */ - public function getCheckboxes( &$tabindex, $skin, $checked ) { + public function getCheckboxes( &$tabindex, $checked ) { global $wgUser; $checkboxes = array(); - $checkboxes['minor'] = ''; - $minorLabel = wfMsgExt( 'minoredit', array( 'parseinline' ) ); - if ( $wgUser->isAllowed( 'minoredit' ) ) { - $attribs = array( - 'tabindex' => ++$tabindex, - 'accesskey' => wfMsg( 'accesskey-minoredit' ), - 'id' => 'wpMinoredit', - ); - $checkboxes['minor'] = - Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) . - " "; + // don't show the minor edit checkbox if it's a new page or section + if ( !$this->isNew ) { + $checkboxes['minor'] = ''; + $minorLabel = wfMsgExt( 'minoredit', array( 'parseinline' ) ); + if ( $wgUser->isAllowed( 'minoredit' ) ) { + $attribs = array( + 'tabindex' => ++$tabindex, + 'accesskey' => wfMsg( 'accesskey-minoredit' ), + 'id' => 'wpMinoredit', + ); + $checkboxes['minor'] = + Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) . + " "; + } } $watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) ); @@ -2465,7 +2692,7 @@ HTML $checkboxes['watch'] = Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) . " "; } wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) ); @@ -2552,52 +2779,139 @@ HTML echo $s; } - - public function getCancelLink() { + /** + * Call the stock "user is blocked" page + * + * @deprecated in 1.19; throw an exception directly instead + */ + function blockedPage() { + wfDeprecated( __METHOD__, '1.19' ); global $wgUser; - $cancelParams = array(); - if ( !$this->isConflict && $this->mArticle->getOldID() > 0 ) { - $cancelParams['oldid'] = $this->mArticle->getOldID(); - } + throw new UserBlockedError( $wgUser->mBlock ); + } - return $wgUser->getSkin()->link( - $this->getContextTitle(), - wfMsgExt( 'cancel', array( 'parseinline' ) ), - array( 'id' => 'mw-editform-cancel' ), - $cancelParams, - array( 'known', 'noclasses' ) - ); + /** + * Produce the stock "please login to edit pages" page + * + * @deprecated in 1.19; throw an exception directly instead + */ + function userNotLoggedInPage() { + wfDeprecated( __METHOD__, '1.19' ); + throw new PermissionsError( 'edit' ); } /** - * Get a diff between the current contents of the edit box and the - * version of the page we're editing from. + * Show an error page saying to the user that he has insufficient permissions + * to create a new page * - * If this is a section edit, we'll replace the section as for final - * save and then make a comparison. + * @deprecated in 1.19; throw an exception directly instead */ - function showDiff() { - $oldtext = $this->mArticle->fetchContent(); - $newtext = $this->mArticle->replaceSection( - $this->section, $this->textbox1, $this->summary, $this->edittime ); + function noCreatePermission() { + wfDeprecated( __METHOD__, '1.19' ); + $permission = $this->mTitle->isTalkPage() ? 'createtalk' : 'createpage'; + throw new PermissionsError( $permission ); + } - wfRunHooks( 'EditPageGetDiffText', array( $this, &$newtext ) ); + /** + * Creates a basic error page which informs the user that + * they have attempted to edit a nonexistent section. + */ + function noSuchSectionPage() { + global $wgOut; - $newtext = $this->mArticle->preSaveTransform( $newtext ); - $oldtitle = wfMsgExt( 'currentrev', array( 'parseinline' ) ); - $newtitle = wfMsgExt( 'yourtext', array( 'parseinline' ) ); - if ( $oldtext !== false || $newtext != '' ) { - $de = new DifferenceEngine( $this->mTitle ); - $de->setText( $oldtext, $newtext ); - $difftext = $de->getDiff( $oldtitle, $newtitle ); - $de->showDiffStyle(); - } else { - $difftext = ''; + $wgOut->prepareErrorPage( wfMessage( 'nosuchsectiontitle' ) ); + + $res = wfMsgExt( 'nosuchsectiontext', 'parse', $this->section ); + wfRunHooks( 'EditPageNoSuchSection', array( &$this, &$res ) ); + $wgOut->addHTML( $res ); + + $wgOut->returnToMain( false, $this->mTitle ); + } + + /** + * Produce the stock "your edit contains spam" page + * + * @param $match Text which triggered one or more filters + * @deprecated since 1.17 Use method spamPageWithContent() instead + */ + static function spamPage( $match = false ) { + wfDeprecated( __METHOD__, '1.17' ); + + global $wgOut, $wgTitle; + + $wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) ); + + $wgOut->addHTML( '
' ); + $wgOut->addWikiMsg( 'spamprotectiontext' ); + 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; - $wgOut->addHTML( '
' . $difftext . '
' ); + $this->textbox2 = $this->textbox1; + + $wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) ); + + $wgOut->addHTML( '
' ); + $wgOut->addWikiMsg( 'spamprotectiontext' ); + if ( $match ) { + $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) ); + } + $wgOut->addHTML( '
' ); + + $wgOut->wrapWikiMsg( '

$1

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

$1

', "yourtext" ); + $this->showTextbox2(); + + $wgOut->addReturnTo( $this->getContextTitle(), array( 'action' => 'edit' ) ); + } + + /** + * Format an anchor fragment as it would appear for a given section name + * @param $text String + * @return String + * @private + */ + function sectionAnchor( $text ) { + global $wgParser; + return $wgParser->guessSectionNameFromWikiText( $text ); + } + + /** + * Check if the browser is on a blacklist of user-agents known to + * mangle UTF-8 data on form submission. Returns true if Unicode + * should make it through, false if it's known to be a problem. + * @return bool + * @private + */ + function checkUnicodeCompliantBrowser() { + global $wgBrowserBlackList; + if ( empty( $_SERVER["HTTP_USER_AGENT"] ) ) { + // No User-Agent header sent? Trust it by default... + return true; + } + $currentbrowser = $_SERVER["HTTP_USER_AGENT"]; + foreach ( $wgBrowserBlackList as $browser ) { + if ( preg_match($browser, $currentbrowser) ) { + return false; + } + } + return true; } /** @@ -2616,6 +2930,11 @@ HTML : $text; } + /** + * @param $request WebRequest + * @param $text string + * @return string + */ function safeUnicodeText( $request, $text ) { $text = rtrim( $text ); return $request->getBool( 'safemode' ) @@ -2660,7 +2979,7 @@ HTML $result = ""; $working = 0; for( $i = 0; $i < strlen( $invalue ); $i++ ) { - $bytevalue = ord( $invalue{$i} ); + $bytevalue = ord( $invalue[$i] ); if ( $bytevalue <= 0x7F ) { //0xxx xxxx $result .= chr( $bytevalue ); $bytesleft = 0; @@ -2697,13 +3016,13 @@ HTML function unmakesafe( $invalue ) { $result = ""; for( $i = 0; $i < strlen( $invalue ); $i++ ) { - if ( ( substr( $invalue, $i, 3 ) == "&#x" ) && ( $invalue{$i+3} != '0' ) ) { + if ( ( substr( $invalue, $i, 3 ) == "&#x" ) && ( $invalue[$i+3] != '0' ) ) { $i += 3; $hexstring = ""; do { - $hexstring .= $invalue{$i}; + $hexstring .= $invalue[$i]; $i++; - } while( ctype_xdigit( $invalue{$i} ) && ( $i < strlen( $invalue ) ) ); + } 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 @@ -2721,113 +3040,4 @@ HTML // reverse the transform that we made for reversability reasons. return strtr( $result, array( "�" => "&#x" ) ); } - - function noCreatePermission() { - global $wgOut; - $wgOut->setPageTitle( wfMsg( 'nocreatetitle' ) ); - $wgOut->addWikiMsg( 'nocreatetext' ); - } - - /** - * Attempt submission - * @return bool false if output is done, true if the rest of the form should be displayed - */ - function attemptSave() { - global $wgUser, $wgOut; - - $resultDetails = false; - # Allow bots to exempt some edits from bot flagging - $bot = $wgUser->isAllowed( 'bot' ) && $this->bot; - $value = $this->internalAttemptSave( $resultDetails, $bot ); - - if ( $value == self::AS_SUCCESS_UPDATE || $value == self::AS_SUCCESS_NEW_ARTICLE ) { - $this->didSave = true; - } - - switch ( $value ) { - case self::AS_HOOK_ERROR_EXPECTED: - case self::AS_CONTENT_TOO_BIG: - case self::AS_ARTICLE_WAS_DELETED: - case self::AS_CONFLICT_DETECTED: - case self::AS_SUMMARY_NEEDED: - case self::AS_TEXTBOX_EMPTY: - case self::AS_MAX_ARTICLE_SIZE_EXCEEDED: - case self::AS_END: - return true; - - 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->spamPageWithContent( $resultDetails['spam'] ); - return false; - - case self::AS_BLOCKED_PAGE_FOR_USER: - $this->blockedPage(); - return false; - - case self::AS_IMAGE_REDIRECT_ANON: - $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' ); - return false; - - case self::AS_READ_ONLY_PAGE_ANON: - $this->userNotLoggedInPage(); - return false; - - case self::AS_READ_ONLY_PAGE_LOGGED: - case self::AS_READ_ONLY_PAGE: - $wgOut->readOnlyPage(); - return false; - - case self::AS_RATE_LIMITED: - $wgOut->rateLimited(); - return false; - - case self::AS_NO_CREATE_PERMISSION: - $this->noCreatePermission(); - return; - - case self::AS_BLANK_ARTICLE: - $wgOut->redirect( $this->getContextTitle()->getFullURL() ); - return false; - - case self::AS_IMAGE_REDIRECT_LOGGED: - $wgOut->permissionRequired( 'upload' ); - return false; - } - } - - function getBaseRevision() { - if ( !$this->mBaseRevision ) { - $db = wfGetDB( DB_MASTER ); - $baseRevision = Revision::loadFromTimestamp( - $db, $this->mTitle, $this->edittime ); - return $this->mBaseRevision = $baseRevision; - } else { - return $this->mBaseRevision; - } - } }