convert "::1" and other pseudo-IPv6 addresses that Apache may throw at us to their...
[lhc/web/wiklou.git] / includes / EditPage.php
index 30ed522..8cad492 100644 (file)
@@ -23,7 +23,8 @@ class EditPage {
        var $formtype;
        var $firsttime;
        var $lastDelete;
-       var $mTokenOk = true;
+       var $mTokenOk = false;
+       var $mTriedSave = false;
        var $tooBig = false;
        var $kblength = false;
        var $missingComment = false;
@@ -31,6 +32,7 @@ class EditPage {
        var $allowBlankSummary = false;
        var $autoSumm = '';
        var $hookError = '';
+       var $mPreviewTemplates;
 
        # Form values
        var $save = false, $preview = false, $diff = false;
@@ -39,6 +41,14 @@ class EditPage {
        var $edittime = '', $section = '', $starttime = '';
        var $oldid = 0, $editintro = '', $scrolltop = null;
 
+       # 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 $editFormTextAfterWarn;
+       public $editFormTextAfterTools;
+       public $editFormTextBottom;
+
        /**
         * @todo document
         * @param $article
@@ -47,6 +57,111 @@ class EditPage {
                $this->mArticle =& $article;
                global $wgTitle;
                $this->mTitle =& $wgTitle;
+
+               # Placeholders for text injection by hooks (empty per default)
+               $this->editFormPageTop =
+               $this->editFormTextTop =
+               $this->editFormTextAfterWarn =
+               $this->editFormTextAfterTools =
+               $this->editFormTextBottom = "";
+       }
+       
+       /**
+        * Fetch initial editing page content.
+        */
+       private function getContent() {
+               global $wgRequest, $wgParser;
+
+               # Get variables from query string :P
+               $section = $wgRequest->getVal( 'section' );
+               $preload = $wgRequest->getVal( 'preload' );
+               $undo = $wgRequest->getVal( 'undo' );
+
+               wfProfileIn( __METHOD__ );
+
+               $text = '';
+               if( !$this->mTitle->exists() ) {
+
+                       # If requested, preload some text.
+                       $text = $this->getPreloadedText( $preload );
+
+                       # We used to put MediaWiki:Newarticletext here if
+                       # $text was empty at this point.
+                       # This is now shown above the edit box instead.
+               } else {
+                       // FIXME: may be better to use Revision class directly
+                       // But don't mess with it just yet. Article knows how to
+                       // fetch the page record from the high-priority server,
+                       // which is needed to guarantee we don't pick up lagged
+                       // information.
+                       
+                       $text = $this->mArticle->getContent();
+
+                       if ( $undo > 0 ) {
+                               #Undoing a specific edit overrides section editing; section-editing
+                               # doesn't work with undoing.
+                               $undorev = Revision::newFromId($undo);
+
+                               #Sanity check, make sure it's the right page.
+                               # Otherwise, $text will be left as-is.
+                               if (!is_null($undorev) && $undorev->getPage() == $this->mArticle->getID()) {
+                                       $oldrev = $undorev->getPrevious();
+                                       $undorev_text = $undorev->getText();
+                                       $oldrev_text = $oldrev->getText();
+                                       $currev_text = $text;
+       
+                                       $result = wfMerge($undorev_text, $oldrev_text, $currev_text, $text);
+       
+                                       if (!$result) {
+                                               #Undoing failed. Bailing out with regular revision text.
+                                               $text = $currev_text;
+
+                                               #Give a warning
+                                               $this->editFormPageTop .= "<h2>" . wfMsg('undofailed') . "</h2>\n" .
+                                                                       '<p><strong class="error">'.wfMsg('explainundofailed').'</strong></p>';
+                                       } else {
+                                               $this->editFormPageTop .= '<h2>'.wfMsg('undosucceeded')."</h2>\n" .
+                                                                               '<p>'.wfMsg('explainundosucceeded').'</p>';
+                                               $this->summary = wfMsgForContent('undo-summary', $undo, $undorev->getUserText());
+                                       }
+                               }
+                       }
+                       else if( $section != '' ) {
+                               if( $section == 'new' ) {
+                                       $text = $this->getPreloadedText( $preload );
+                               } else {
+                                       $text = $wgParser->getSection( $text, $section );
+                               }
+                       }
+               }
+               
+               wfProfileOut( __METHOD__ );
+               return $text;
+       }
+
+       /**
+        * Get the contents of a page from its title and remove includeonly tags
+        *
+        * @param $preload String: the title of the page.
+        * @return string The contents of the page.
+        */
+       private function getPreloadedText($preload) {
+               if ( $preload === '' )
+                       return '';
+               else {
+                       $preloadTitle = Title::newFromText( $preload );
+                       if ( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) {
+                               $rev=Revision::newFromTitle($preloadTitle);
+                               if ( is_object( $rev ) ) {
+                                       $text = $rev->getText();
+                                       // TODO FIXME: AAAAAAAAAAA, this shouldn't be implementing
+                                       // its own mini-parser! -ævar
+                                       $text = preg_replace( '~</?includeonly>~', '', $text );
+                                       return $text;
+                               } else
+                                       return '';
+                       }
+               }
        }
 
        /**
@@ -60,7 +175,7 @@ class EditPage {
                if ( !$wgUseMetadataEdit ) return ;
                if ( $wgMetadataWhitelist == '' ) return ;
                $s = '' ;
-               $t = $this->mArticle->getContent();
+               $t = $this->getContent();
 
                # MISSING : <nowiki> filtering
 
@@ -184,7 +299,7 @@ class EditPage {
 
                if ( ! $this->mTitle->userCanEdit() ) {
                        wfDebug( "$fname: user can't edit\n" );
-                       $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
+                       $wgOut->readOnlyPage( $this->getContent(), true );
                        wfProfileOut( $fname );
                        return;
                }
@@ -193,7 +308,7 @@ class EditPage {
                        # When previewing, don't check blocked state - will get caught at save time.
                        # Also, check when starting edition is done against slave to improve performance.
                        wfDebug( "$fname: user is blocked\n" );
-                       $wgOut->blockedPage();
+                       $this->blockedPage();
                        wfProfileOut( $fname );
                        return;
                }
@@ -205,7 +320,7 @@ class EditPage {
                                return;
                        } else {
                                wfDebug( "$fname: read-only page\n" );
-                               $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
+                               $wgOut->readOnlyPage( $this->getContent(), true );
                                wfProfileOut( $fname );
                                return;
                        }
@@ -216,7 +331,7 @@ class EditPage {
                        wfProfileOut($fname);
                        return;
                }
-               if ( !$this->mTitle->userCan( 'create' ) && !$this->mTitle->exists() ) {
+               if ( !$this->mTitle->userCanCreate() && !$this->mTitle->exists() ) {
                        wfDebug( "$fname: no create permission\n" );
                        $this->noCreatePermission();
                        wfProfileOut( $fname );
@@ -229,7 +344,7 @@ class EditPage {
                        } else if ( $this->diff ) {
                                $this->formtype = 'diff';
                        } else {
-                               $wgOut->readOnlyPage( $this->mArticle->getContent() );
+                               $wgOut->readOnlyPage( $this->getContent() );
                                wfProfileOut( $fname );
                                return;
                        }
@@ -303,6 +418,8 @@ class EditPage {
                # checking, etc.
                if ( 'initial' == $this->formtype || $this->firsttime ) {
                        $this->initialiseForm();
+                       if( !$this->mTitle->getArticleId() ) 
+                               wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) );
                }
 
                $this->showEditForm();
@@ -358,19 +475,24 @@ class EditPage {
                                $this->preview = $request->getCheck( 'wpPreview' ) || $request->getCheck( 'wpLivePreview' );
                                $this->diff = $request->getCheck( 'wpDiff' );
 
-                               if( !$this->preview ) {
-                                       if ( $this->tokenOk( $request ) ) {
-                                               # Some browsers will not report any submit button
-                                               # if the user hits enter in the comment box.
-                                               # The unmarked state will be assumed to be a save,
-                                               # if the form seems otherwise complete.
-                                               wfDebug( "$fname: Passed token check.\n" );
-                                       } else {
-                                               # Page might be a hack attempt posted from
-                                               # an external site. Preview instead of saving.
-                                               wfDebug( "$fname: Failed token check; forcing preview\n" );
-                                               $this->preview = true;
-                                       }
+                               // Remember whether a save was requested, so we can indicate
+                               // if we forced preview due to session failure.
+                               $this->mTriedSave = !$this->preview;
+                               
+                               if ( $this->tokenOk( $request ) ) {
+                                       # Some browsers will not report any submit button
+                                       # if the user hits enter in the comment box.
+                                       # The unmarked state will be assumed to be a save,
+                                       # if the form seems otherwise complete.
+                                       wfDebug( "$fname: Passed token check.\n" );
+                               } else if ( $this->diff ) {
+                                       # Failed token check, but only requested "Show Changes".
+                                       wfDebug( "$fname: Failed token check; Show Changes requested.\n" );
+                               } else {
+                                       # Page might be a hack attempt posted from
+                                       # an external site. Preview instead of saving.
+                                       wfDebug( "$fname: Failed token check; forcing preview\n" );
+                                       $this->preview = true;
                                }
                        }
                        $this->save    = ! ( $this->preview OR $this->diff );
@@ -481,6 +603,7 @@ class EditPage {
                $this->mMetaData = '' ;
 
                # Check for spam
+               $matches = array();
                if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
                        $this->spamPage ( $matches[0] );
                        wfProfileOut( "$fname-checks" );
@@ -506,7 +629,7 @@ class EditPage {
                }
                if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
                        # Check block state against master, thus 'false'.
-                       $this->blockedIPpage();
+                       $this->blockedPage();
                        wfProfileOut( "$fname-checks" );
                        wfProfileOut( $fname );
                        return false;
@@ -562,7 +685,7 @@ class EditPage {
                $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
                if ( 0 == $aid ) {
                        // Late check for create permission, just in case *PARANOIA*
-                       if ( !$this->mTitle->userCan( 'create' ) ) {
+                       if ( !$this->mTitle->userCanCreate() ) {
                                wfDebug( "$fname: no create permission\n" );
                                $this->noCreatePermission();
                                wfProfileOut( $fname );
@@ -576,14 +699,6 @@ class EditPage {
                                        return false;
                        }
 
-                       # If no edit comment was given when creating a new page, and what's being
-                       # created is a redirect, be smart and fill in a neat auto-comment
-                       if( $this->summary == '' ) {
-                               $rt = Title::newFromRedirect( $this->textbox1 );
-                               if( is_object( $rt ) )
-                                       $this->summary = wfMsgForContent( 'autoredircomment', $rt->getPrefixedText() );
-                       }
-
                        $isComment=($this->section=='new');
                        $this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
                                $this->minoredit, $this->watchthis, false, $isComment);
@@ -655,8 +770,11 @@ class EditPage {
                        return true;
                }
 
-               # Handle the user preference to force summaries here
-               if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) {
+               $oldtext = $this->mArticle->getContent();
+
+               # Handle the user preference to force summaries here, but not for null edits
+               if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary')
+                       &&  0 != strcmp($oldtext, $text) && !Article::getRedirectAutosummary( $text )) {
                        if( md5( $this->summary ) == $this->autoSumm ) {
                                $this->missingSummary = true;
                                wfProfileOut( $fname );
@@ -664,6 +782,15 @@ class EditPage {
                        }
                }
 
+               #And a similar thing for new sections
+                if( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) {
+                       if (trim($this->summary) == '') {
+                               $this->missingSummary = true;
+                               wfProfileOut( $fname );
+                               return( true );
+                       }
+               }
+
                # All's well
                wfProfileIn( "$fname-sectionanchor" );
                $sectionanchor = '';
@@ -721,10 +848,10 @@ class EditPage {
         */
        function initialiseForm() {
                $this->edittime = $this->mArticle->getTimestamp();
-               $this->textbox1 = $this->mArticle->getContent();
                $this->summary = '';
+               $this->textbox1 = $this->getContent();
                if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI )
-                       $this->textbox1 = wfMsgWeirdKey ( $this->mArticle->mTitle->getText() ) ;
+                       $this->textbox1 = wfMsgWeirdKey( $this->mArticle->mTitle->getText() ) ;
                wfProxyCheck();
        }
 
@@ -755,7 +882,7 @@ class EditPage {
                        $wgOut->addWikiText( wfMsg( 'explainconflict' ) );
 
                        $this->textbox2 = $this->textbox1;
-                       $this->textbox1 = $this->mArticle->getContent();
+                       $this->textbox1 = $this->getContent();
                        $this->edittime = $this->mArticle->getTimestamp();
                } else {
 
@@ -764,7 +891,8 @@ class EditPage {
                                        $s = wfMsg('editingcomment', $this->mTitle->getPrefixedText() );
                                } else {
                                        $s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
-                                       if( !$this->preview && !$this->diff ) {
+                                       $matches = array();
+                                       if( !$this->summary && !$this->preview && !$this->diff ) {
                                                preg_match( "/^(=+)(.+)\\1/mi",
                                                        $this->textbox1,
                                                        $matches );
@@ -782,9 +910,13 @@ class EditPage {
                                $wgOut->addWikiText( wfMsg( 'missingcommenttext' ) );
                        }
                        
-                       if( $this->missingSummary ) {
+                       if( $this->missingSummary && $this->section != 'new' ) {
                                $wgOut->addWikiText( wfMsg( 'missingsummary' ) );
                        }
+
+                        if( $this->missingSummary && $this->section == 'new' ) {
+                                $wgOut->addWikiText( wfMsg( 'missingcommentheader' ) );
+                        }
                        
                        if( !$this->hookError == '' ) {
                                $wgOut->addWikiText( $this->hookError );
@@ -843,6 +975,10 @@ class EditPage {
                        $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ) );
                }
 
+               #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
+               $previewOutput = $this->getPreviewText();
+
                $rows = $wgUser->getIntOption( 'rows' );
                $cols = $wgUser->getIntOption( 'cols' );
 
@@ -861,7 +997,7 @@ class EditPage {
 
                $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
                                wfMsgExt('cancel', array('parseinline')) );
-               $edithelpurl = $sk->makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' ));
+               $edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' ));
                $edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
                        htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '.
                        htmlspecialchars( wfMsg( 'newwindow' ) );
@@ -917,10 +1053,12 @@ class EditPage {
 
                $checkboxhtml = $minoredithtml . $watchhtml;
 
+               $wgOut->addHTML( $this->editFormPageTop );
+
                if ( $wgUser->getOption( 'previewontop' ) ) {
 
                        if ( 'preview' == $this->formtype ) {
-                               $this->showPreview();
+                               $this->showPreview( $previewOutput );
                        } else {
                                $wgOut->addHTML( '<div id="wikiPreview"></div>' );
                        }
@@ -931,22 +1069,29 @@ class EditPage {
                }
 
 
+               $wgOut->addHTML( $this->editFormTextTop );
+
                # if this is a comment, show a subject line at the top, which is also the edit summary.
                # Otherwise, show a summary field at the bottom
                $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME
                if( $this->section == 'new' ) {
                        $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<div class='editOptions'>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
                        $editsummary = '';
+                       $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
+                       $summarypreview = '';
                } else {
                        $commentsubject = '';
                        $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<div class='editOptions'>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
+                       $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
+                       $subjectpreview = '';
                }
 
                # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display
                if( !$this->preview && !$this->diff ) {
                        $wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
                }
-               $templates = $this->formatTemplates();
+               $templates = ($this->preview || $this->section) ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates();
+               $formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != '');
 
                global $wgUseMetadataEdit ;
                if ( $wgUseMetadataEdit ) {
@@ -1057,6 +1202,7 @@ END
                $wgOut->addHTML( <<<END
 $recreate
 {$commentsubject}
+{$subjectpreview}
 <textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}'
 cols='{$cols}'{$ew} $hidden>
 END
@@ -1066,9 +1212,11 @@ END
                " );
 
                $wgOut->addWikiText( $copywarn );
+               $wgOut->addHTML( $this->editFormTextAfterWarn );
                $wgOut->addHTML( "
 {$metadata}
 {$editsummary}
+{$summarypreview}
 {$checkboxhtml}
 {$safemodehtml}
 ");
@@ -1084,10 +1232,11 @@ END
 </div><!-- editOptions -->");
 
                $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+               $wgOut->addHTML( $this->editFormTextAfterTools );
 
                $wgOut->addHTML( "
 <div class='templatesUsed'>
-{$templates}
+{$formattedtemplates}
 </div>
 " );
 
@@ -1115,10 +1264,9 @@ END
                # For a bit more sophisticated detection of blank summaries, hash the
                # automatic one and pass that in a hidden field.
                $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
-               $wgOut->addHTML( "<input type=\"hidden\" name=\"wpAutoSummary\" value=\"$autosumm\" />\n" );
+               $wgOut->addHtml( wfHidden( 'wpAutoSummary', $autosumm ) );
 
                if ( $this->isConflict ) {
-                       require_once( "DifferenceEngine.php" );
                        $wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
 
                        $de = new DifferenceEngine( $this->mTitle );
@@ -1129,11 +1277,12 @@ END
                        $wgOut->addHTML( "<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
                                . htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) . "\n</textarea>" );
                }
+               $wgOut->addHTML( $this->editFormTextBottom );
                $wgOut->addHTML( "</form>\n" );
                if ( !$wgUser->getOption( 'previewontop' ) ) {
 
                        if ( $this->formtype == 'preview') {
-                               $this->showPreview();
+                               $this->showPreview( $previewOutput );
                        } else {
                                $wgOut->addHTML( '<div id="wikiPreview"></div>' );
                        }
@@ -1150,55 +1299,23 @@ END
        /**
         * Append preview output to $wgOut.
         * Includes category rendering if this is a category page.
-        * @private
+        *
+        * @param string $text The HTML to be output for the preview.
         */
-       function showPreview() {
+       private function showPreview( $text ) {
                global $wgOut;
+
                $wgOut->addHTML( '<div id="wikiPreview">' );
                if($this->mTitle->getNamespace() == NS_CATEGORY) {
                        $this->mArticle->openShowCategory();
                }
-               $previewOutput = $this->getPreviewText();
-               $wgOut->addHTML( $previewOutput );
+               $wgOut->addHTML( $text );
                if($this->mTitle->getNamespace() == NS_CATEGORY) {
                        $this->mArticle->closeShowCategory();
                }
-               $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
                $wgOut->addHTML( '</div>' );
        }
 
-       /**
-        * Prepare a list of templates used by this page. Returns HTML.
-        */
-       function formatTemplates() {
-               global $wgUser;
-
-               $fname = 'EditPage::formatTemplates';
-               wfProfileIn( $fname );
-
-               $sk =& $wgUser->getSkin();
-
-               $outText = '';
-               $templates = $this->mArticle->getUsedTemplates();
-               if ( count( $templates ) > 0 ) {
-                       # Do a batch existence check
-                       $batch = new LinkBatch;
-                       foreach( $templates as $title ) {
-                               $batch->addObj( $title );
-                       }
-                       $batch->execute();
-
-                       # Construct the HTML
-                       $outText = '<br />'. wfMsgExt( 'templatesused', array( 'parseinline' ) ) . '<ul>';
-                       foreach ( $templates as $titleObj ) {
-                               $outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
-                       }
-                       $outText .= '</ul>';
-               }
-               wfProfileOut( $fname );
-               return $outText;
-       }
-
        /**
         * Live Preview lets us fetch rendered preview page content and
         * add it to the page without refreshing the whole page.
@@ -1210,9 +1327,9 @@ END
         * of the preview button
         */
        function doLivePreviewScript() {
-               global $wgStylePath, $wgJsMimeType, $wgOut, $wgTitle;
+               global $wgStylePath, $wgJsMimeType, $wgStyleVersion, $wgOut, $wgTitle;
                $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
-                       htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
+                       htmlspecialchars( "$wgStylePath/common/preview.js?$wgStyleVersion" ) .
                        '"></script>' . "\n" );
                $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
                return "return !livePreview(" .
@@ -1262,10 +1379,10 @@ END
                $fname = 'EditPage::getPreviewText';
                wfProfileIn( $fname );
 
-               if ( $this->mTokenOk ) {
-                       $msg = 'previewnote';
-               } else {
+               if ( $this->mTriedSave && !$this->mTokenOk ) {
                        $msg = 'session_fail_preview';
+               } else {
+                       $msg = 'previewnote';
                }
                $previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
                        "<div class='previewnote'>" . $wgOut->parse( wfMsg( $msg ) ) . "</div>\n";
@@ -1276,9 +1393,17 @@ END
                $parserOptions = ParserOptions::newFromUser( $wgUser );
                $parserOptions->setEditSection( false );
 
+               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.
+                       return $wgOut->parse( "<div class='previewnote'>" .
+                               wfMsg( 'session_fail_preview_html' ) . "</div>" );
+               }
+
                # don't parse user css/js, show message about preview
                # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
-
+               
                if ( $this->isCssJsSubpage ) {
                        if(preg_match("/\\.css$/", $wgTitle->getText() ) ) {
                                $previewtext = wfMsg('usercsspreview');
@@ -1291,11 +1416,6 @@ END
                        wfProfileOut( $fname );
                        return $previewhead;
                } else {
-                       # if user want to see preview when he edit an article
-                       if( $wgUser->getOption('previewonfirst') and ($this->textbox1 == '')) {
-                               $this->textbox1 = $this->mArticle->getContent();
-                       }
-
                        $toparse = $this->textbox1;
 
                        # If we're adding a comment, we need to show the
@@ -1312,20 +1432,40 @@ END
                        $previewHTML = $parserOutput->getText();
                        $wgOut->addParserOutputNoText( $parserOutput );
 
+                       foreach ( $parserOutput->getTemplates() as $ns => $template)
+                               foreach ( array_keys( $template ) as $dbk)
+                                       $this->mPreviewTemplates[] = Title::makeTitle($ns, $dbk);
+
                        wfProfileOut( $fname );
-                       return $previewhead . 
-                       '<div id="realContent"' . contentdir() . '>' .
-                       $previewHTML . 
-                       '</div><!-- realContent -->';
+                       return $previewhead . $previewHTML;
                }
        }
 
        /**
         * Call the stock "user is blocked" page
         */
-       function blockedIPpage() {
-               global $wgOut;
-               $wgOut->blockedPage();
+       function blockedPage() {
+               global $wgOut, $wgUser;
+               $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 ) {
+                       $rows = $wgUser->getOption( 'rows' );
+                       $cols = $wgUser->getOption( 'cols' );
+                       $attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' );
+                       $wgOut->addHtml( '<hr />' );
+                       $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ) );
+                       $wgOut->addHtml( wfOpenElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . wfCloseElement( 'textarea' ) );
+               }
        }
 
        /**
@@ -1335,7 +1475,7 @@ END
                global $wgUser, $wgOut;
                $skin = $wgUser->getSkin();
                
-               $loginTitle = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+               $loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
                $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $this->mTitle->getPrefixedUrl() );
        
                $wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
@@ -1409,6 +1549,7 @@ END
                }
                $currentText = $currentRevision->getText();
 
+               $result = '';
                if( wfMerge( $baseText, $editText, $currentText, $result ) ){
                        $editText = $result;
                        wfProfileOut( $fname );
@@ -1621,7 +1762,6 @@ END
         * @return string HTML
         */
        function getDiff() {
-               require_once( 'DifferenceEngine.php' );
                $oldtext = $this->mArticle->fetchContent();
                $newtext = $this->mArticle->replaceSection(
                        $this->section, $this->textbox1, $this->summary, $this->edittime );