*Add year/month selector to user contribs (bug 516)

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

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 011c3ca..5eff237 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -17,12 +17,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
- *
- * @addtogroup SpecialPage
  */
 
 /**
  * @todo document, briefly.
+ * @addtogroup SpecialPage
  */
 class ProtectionForm {
        var $mRestrictions = array();
@@ -100,7 +99,7 @@ class ProtectionForm {
                        return;
                }
 
-               list( $cascadeSources, $restrictions ) = $this->mTitle->getCascadeProtectionSources();
+               list( $cascadeSources, /* $restrictions */ ) = $this->mTitle->getCascadeProtectionSources();
 
                if ( "" != $err ) {
                        $wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
@@ -114,7 +113,7 @@ class ProtectionForm {
                                $titles .= '* [[:' . $title->getPrefixedText() . "]]\n";
                        }
 
-                       $notice = wfMsg( 'protect-cascadeon' ) . "\r\n$titles";
+                       $notice = wfMsgExt( 'protect-cascadeon', array('parsemag'), count($cascadeSources) ) . "\r\n$titles";
 
                        $wgOut->addWikiText( $notice );
                }
@@ -189,6 +188,13 @@ class ProtectionForm {
                if( !$ok ) {
                        throw new FatalError( "Unknown error at restriction save time." );
                }
+               
+               if( $wgRequest->getCheck( 'mwProtectWatch' ) ) {
+                       $this->mArticle->doWatch();
+               } elseif( $this->mTitle->userIsWatching() ) {
+                       $this->mArticle->doUnwatch();
+               }
+               
                return $ok;
        }
 
@@ -201,6 +207,7 @@ class ProtectionForm {
                        // The submission needs to reenable the move permission selector
                        // if it's in locked mode, or some browsers won't submit the data.
                        $out .= wfOpenElement( 'form', array(
+                               'id' => 'mw-Protect-Form',
                                'action' => $this->mTitle->getLocalUrl( 'action=protect' ),
                                'method' => 'post',
                                'onsubmit' => 'protectEnable(true)' ) );
@@ -232,18 +239,18 @@ class ProtectionForm {
                $out .= "</tbody>\n";
                $out .= "</table>\n";
 
-               global $wgEnableCascadingProtection;
-
-               if ($wgEnableCascadingProtection)
-                       $out .= $this->buildCascadeInput();
-
                $out .= "<table>\n";
                $out .= "<tbody>\n";
 
+               global $wgEnableCascadingProtection;
+               if( $wgEnableCascadingProtection )
+                       $out .= '<tr><td></td><td>' . $this->buildCascadeInput() . "</td></tr>\n";
+
                $out .= $this->buildExpiryInput();
 
                if( !$this->disabled ) {
                        $out .= "<tr><td>" . $this->buildReasonInput() . "</td></tr>\n";
+                       $out .= "<tr><td></td><td>" . $this->buildWatchInput() . "</td></tr>\n";
                        $out .= "<tr><td></td><td>" . $this->buildSubmit() . "</td></tr>\n";
                }
 
@@ -309,26 +316,26 @@ class ProtectionForm {
        }
 
        function buildExpiryInput() {
-               $id = 'mwProtect-expiry';
-
-               $ci = "<tr> <td align=\"right\">";
-               $ci .= wfElement( 'label', array (
-                               'id' => "$id-label",
-                               'for' => $id ),
-                               wfMsg( 'protectexpiry' ) );
-               $ci .= "</td> <td align=\"left\">";
-               $ci .= wfElement( 'input', array(
-                               'size' => 60,
-                               'name' => $id,
-                               'id' => $id,
-                               'value' => $this->mExpiry ) + $this->disabledAttrib );
-               $ci .= "</td></tr>";
-
-               return $ci;
+               $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib;
+               return '<tr>'
+                       . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>'
+                       . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>'
+                       . '</tr>';
+       }
+       
+       function buildWatchInput() {
+               global $wgUser;
+               return Xml::checkLabel(
+                       wfMsg( 'watchthis' ),
+                       'mwProtectWatch',
+                       'mwProtectWatch',
+                       $this->mTitle->userIsWatching() || $wgUser->getOption( 'watchdefault' )
+               );
        }
 
        function buildSubmit() {
                return wfElement( 'input', array(
+                       'id' => 'mw-Protect-submit',
                        'type' => 'submit',
                        'value' => wfMsg( 'confirm' ) ) );
        }
@@ -359,7 +366,7 @@ class ProtectionForm {
         * @access private
         */
        function showLogExtract( &$out ) {
-               # Show relevant lines from the deletion log:
+               # Show relevant lines from the protection log:
                $out->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'protect' ) ) . "</h2>\n" );
                $logViewer = new LogViewer(
                        new LogReader(