After a longer phone call Erik and me agreed on working on an equivalent feature...

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 97246fa..2c04c1f 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -33,7 +33,7 @@ class EditPage {
                $this->importFormData( $wgRequest );
 
                if ( ! $this->mTitle->userCanEdit() ) {
-                       $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
+                       $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
                        return;
                }
                if ( $wgUser->isBlocked() ) {
@@ -48,7 +48,7 @@ class EditPage {
                        if( $this->save || $this->preview ) {
                                $this->editForm( "preview" );
                        } else {
-                               $wgOut->readOnlyPage( $this->mArticle->getContent() );
+                               $wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
                        }
                        return;
                }
@@ -106,11 +106,14 @@ class EditPage {
        {
                global $wgOut, $wgUser;
                global $wgLang, $wgParser, $wgTitle;
-           global $wgAllowAnonymousMinor;
-           global $wgWhitelistEdit;
+               global $wgAllowAnonymousMinor;
+               global $wgWhitelistEdit;
+               global $wgSpamRegex;
 
                $sk = $wgUser->getSkin();
                $isConflict = false;
+               // css / js subpages of user pages get a special treatment
+               $isCssJsSubpage = Namespace::getUser() == $wgTitle->getNamespace() and preg_match("/\\.(css|js)$/", $wgTitle->getText() );
 
                if(!$this->mTitle->getArticleID()) { # new article
                        $wgOut->addWikiText(wfmsg("newarticletext"));
@@ -126,6 +129,12 @@ class EditPage {
                # in the back door with a hand-edited submission URL.
 
                if ( "save" == $formtype ) {
+                       # Check for spam
+                       if ( $wgSpamRegex && preg_match( $wgSpamRegex, $wpTextbox1 ) ) {
+                                       sleep(10);
+                                       $wgOut->redirect( $this->mTitle->getFullURL() );
+                                       return;
+                       }
                        if ( $wgUser->isBlocked() ) {
                                $this->blockedIPpage();
                                return;
@@ -171,7 +180,7 @@ class EditPage {
                        } else {
                                # switch from section editing to normal editing in edit conflict
                                if($isConflict) {
-                    # Attempt merge
+                                       # Attempt merge
                                        if( $this->mergeChangesInto( $text ) ){
                                                // Successful merge! Maybe we should tell the user the good news?
                                                $isConflict = false;
@@ -194,7 +203,7 @@ class EditPage {
 
                if ( "initial" == $formtype ) {
                        $this->edittime = $this->mArticle->getTimestamp();
-                       $this->textbox1 = $this->mArticle->getContent(true);
+                       $this->textbox1 = $this->mArticle->getContent( true );
                        $this->summary = "";
                        $this->proxyCheck();
                }
@@ -209,7 +218,7 @@ class EditPage {
                        $wgOut->addHTML( wfMsg( "explainconflict" ) );
 
                        $this->textbox2 = $this->textbox1;
-                       $this->textbox1 = $this->mArticle->getContent(true);
+                       $this->textbox1 = $this->mArticle->getContent( true );
                        $this->edittime = $this->mArticle->getTimestamp();
                } else {
                        $s = wfMsg( "editing", $this->mTitle->getPrefixedText() );
@@ -238,8 +247,10 @@ class EditPage {
 
                if( wfReadOnly() ) {
                        $wgOut->addHTML( "<strong>" .
-                               wfMsg( "readonlywarning" ) .
-                               "</strong>" );
+                       wfMsg( "readonlywarning" ) .
+                       "</strong>" );
+               } else if ( $isCssJsSubpage and "preview" != $formtype) {
+                       $wgOut->addHTML( wfMsg( "usercssjsyoucanpreview" ));
                }
                if( $this->mTitle->isProtected() ) {
                        $wgOut->addHTML( "<strong>" . wfMsg( "protectedpagewarning" ) .
@@ -273,12 +284,14 @@ class EditPage {
 
                $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedURL(),
                  wfMsg( "cancel" ) );
-               $edithelp = $sk->makeKnownLink( wfMsg( "edithelppage" ),
-                 wfMsg( "edithelp" ) );
+               $edithelpurl = $sk->makeUrl( wfMsg( "edithelppage" ));
+               $edithelp = '<a onclick="window.open('.
+               "'$edithelpurl', 'helpwindow', 'width=610,height=400,left=10,top=10'".'); return false;" href="'.$edithelpurl.'">'.
+               wfMsg( "edithelp" ).'</a>';
                $copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
                  wfMsg( "copyrightpage" ) ) );
 
-               if( $wgUser->getOption("showtoolbar") ) {
+               if( $wgUser->getOption("showtoolbar") and !$isCssJsSubpage ) {
                        # prepare toolbar for edit buttons
                        $toolbar = $sk->getEditToolbar();
                } else {
@@ -328,15 +341,27 @@ class EditPage {
                        $parserOptions->setUseCategoryMagic( false );
                        $parserOptions->setEditSection( false );
                        $parserOptions->setEditSectionOnRightClick( false );
-                       $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $previewtext ) ."\n\n",
+                       # don't parse user css/js, show message about preview
+                       # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
+                       if ( $isCssJsSubpage ) {
+                               if(preg_match("/\\.css$/", $wgTitle->getText() ) ) {
+                                       $previewtext = wfMsg('usercsspreview');
+                               } else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) {
+                                       $previewtext = wfMsg('userjspreview');
+                               }
+                               $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
+                               $wgOut->addHTML( $parserOutput->mText );
+                       } else {
+                               $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $previewtext ) ."\n\n",
                                $wgTitle, $parserOptions );
-                       $previewHTML = $parserOutput->mText;
+                               $previewHTML = $parserOutput->mText;
 
-                       if($wgUser->getOption("previewontop")) {
-                               $wgOut->addHTML($previewhead);
-                               $wgOut->addHTML($previewHTML);
+                               if($wgUser->getOption("previewontop")) {
+                                       $wgOut->addHTML($previewhead);
+                                       $wgOut->addHTML($previewHTML);
+                               }
+                               $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
                        }
-                       $wgOut->addHTML( "<br clear=\"all\" />\n" );
                }
 
                # if this is a comment, show a subject line at the top, which is also the edit summary.
@@ -410,7 +435,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                $link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
                  ":{$name}|{$name}]]";
 
-               $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip ) );
+               $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip, $name ) );
                $wgOut->returnToMain( false );
        }