thumbnail tweaks

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a568419..5cc8f1e 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -52,7 +52,6 @@ class EditPage {
                        }
                        return;
                }
-               if( !$wgRequest->wasPosted() ) $this->save = false;
                if ( $this->save ) {
                        $this->editForm( "save" );
                } else if ( $this->preview ) {
@@ -73,8 +72,8 @@ class EditPage {
                $this->edittime = $request->getVal( 'wpEdittime' );
                if( !preg_match( '/^\d{14}$/', $this->edittime ) ) $this->edittime = "";
 
-               $this->save = $request->getCheck( 'wpSave' );
                $this->preview = $request->getCheck( 'wpPreview' );
+               $this->save = $request->wasPosted() && !$this->preview;
                $this->minoredit = $request->getCheck( 'wpMinoredit' );
                $this->watchthis = $request->getCheck( 'wpWatchthis' );
 
@@ -108,6 +107,7 @@ class EditPage {
                global $wgOut, $wgUser;
                global $wgLang, $wgParser, $wgTitle;
            global $wgAllowAnonymousMinor;
+           global $wgWhitelistEdit;
 
                $sk = $wgUser->getSkin();
                $isConflict = false;
@@ -138,8 +138,8 @@ class EditPage {
                                $wgOut->readOnlyPage();
                                return;
                        }
-                       # If article is new, insert it.
 
+                       # If article is new, insert it.
                        $aid = $this->mTitle->getArticleID();
                        if ( 0 == $aid ) {
                                # Don't save a new article if it's blank.
@@ -170,9 +170,8 @@ class EditPage {
                                $isConflict = false;
                        } else {
                                # switch from section editing to normal editing in edit conflict
-                               # FIXME: This is confusing. In theory we should attempt to merge, finding
-                               # the equivalent section if it's unchanged and avoid the conflict.
                                if($isConflict) {
+                    # Attempt merge
                                        if( $this->mergeChangesInto( $text ) ){
                                                // Successful merge! Maybe we should tell the user the good news?
                                                $isConflict = false;
@@ -225,7 +224,9 @@ class EditPage {
                                        $sectitle=preg_match("/^=+(.*?)=+/mi",
                                        $this->textbox1,
                                        $matches);
-                                       if($matches[1]) { $this->summary = "(".trim($matches[1]).")"; }
+                                       if( !empty( $matches[1] ) ) {
+                                               $this->summary = "/* ". trim($matches[1])." */ ";
+                                       }
                                }
                        }
                        $wgOut->setPageTitle( $s );
@@ -277,9 +278,11 @@ class EditPage {
                $copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
                  wfMsg( "copyrightpage" ) ) );
 
-               if($wgUser->getOption("showtoolbar")) {
-                       // prepare toolbar for edit buttons
-                       $toolbar=$sk->getEditToolbar();
+               if( $wgUser->getOption("showtoolbar") ) {
+                       # prepare toolbar for edit buttons
+                       $toolbar = $sk->getEditToolbar();
+               } else {
+                       $toolbar = "";
                }
 
                // activate checkboxes if user wants them to be always active
@@ -297,22 +300,24 @@ class EditPage {
 
                if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
                        $minoredithtml =
-                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit'>".
-                       "<label for='wpMinoredit'>{$minor}</label>";
+                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
+                       " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
+                       "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
                }
 
                $watchhtml = "";
 
                if ( 0 != $wgUser->getID() ) {
-                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked":"")." id='wpWatchthis'>".
-                       "<label for='wpWatchthis'>{$watchthis}</label>";
+                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
+                       " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis'  />".
+                       "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
                }
 
-               $checkboxhtml = $minoredithtml . $watchhtml . "<br>";
+               $checkboxhtml = $minoredithtml . $watchhtml . "<br />";
 
                if ( "preview" == $formtype) {
                        $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><large><center><font color=\"#cc0000\">" .
-                       wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large><p>\n";
+                       wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large></p>\n";
                        if ( $isConflict ) {
                                $previewhead.="<h2>" . wfMsg( "previewconflict" ) .
                                  "</h2>\n";
@@ -338,11 +343,11 @@ class EditPage {
                # Otherwise, show a summary field at the bottom
                $summarytext = htmlspecialchars( $wgLang->recodeForEdit( $this->summary ) ); # FIXME
                if( $this->section == "new" ) {
-                       $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60'><br>";
+                       $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                        $editsummary = "";
                } else {
                        $commentsubject = "";
-                       $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60'><br>";
+                       $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                }
 
                if( !$this->preview ) {
@@ -354,19 +359,21 @@ class EditPage {
 <form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
 enctype=\"application/x-www-form-urlencoded\">
 {$commentsubject}
-<textarea tabindex='2' name=\"wpTextbox1\" rows='{$rows}'
-cols='{$cols}'{$ew} wrap=\"virtual\">" .
+<div id=\"tawrapper\"><textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
+cols='{$cols}'{$ew}>" .
 htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 "
-</textarea>
-<br>{$editsummary}
+</textarea></div>
+<br />{$editsummary}
 {$checkboxhtml}
-<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\">
-<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\">
+<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
+" title=\"".wfMsg('tooltip-save')."\"/>
+<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
+" title=\"".wfMsg('tooltip-preview')."\"/>
 <em>{$cancel}</em> | <em>{$edithelp}</em>
-<br><br>{$copywarn}
-<input type=hidden value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\">
-<input type=hidden value=\"{$this->edittime}\" name=\"wpEdittime\">\n" );
+<br /><br />{$copywarn}
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
 
                if ( $isConflict ) {
                        $wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
@@ -445,14 +452,16 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                # Fork the processes
                if ( !$skip ) {
                        $title = Title::makeTitle( NS_SPECIAL, "Blockme" );
-                       $url = $title->getFullURL();
+                       $iphash = md5( $wgIP . $wgProxyKey );
+                       $url = $title->getFullURL( "ip=$iphash" );
+
                        foreach ( $wgProxyPorts as $port ) {
                                $params = implode( " ", array(
-                                 escapeshellarg( $wgProxyScriptPath ),
-                                 escapeshellarg( $wgIP ),
-                                 escapeshellarg( $port ),
-                                 escapeshellarg( $url )
-                               ));
+                                                       escapeshellarg( $wgProxyScriptPath ),
+                                                       escapeshellarg( $wgIP ),
+                                                       escapeshellarg( $port ),
+                                                       escapeshellarg( $url )
+                                                       ));
                                exec( "php $params &>/dev/null &" );
                        }
                        # Set MemCached key
@@ -464,7 +473,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 
        /* private */ function mergeChangesInto( &$text ){
                $oldDate = $this->edittime;
-               $res = wfQuery("SELECT cur_text FROM cur WHERE cur_id=" . 
+               $res = wfQuery("SELECT cur_text FROM cur WHERE cur_id=" .
                        $this->mTitle->getArticleID() . " FOR UPDATE", DB_WRITE);
                $obj = wfFetchObject($res);