*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 659ba1f..5eff237 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -17,10 +17,12 @@
  * 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();
        var $mReason = '';
@@ -86,7 +88,7 @@ class ProtectionForm {
        }
 
        function show( $err = null ) {
-               global $wgOut;
+               global $wgOut, $wgUser;
 
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
@@ -97,7 +99,7 @@ class ProtectionForm {
                        return;
                }
 
-               list( $cascadeSources, $restrictions ) = $this->mTitle->getCascadeProtectionSources();
+               list( $cascadeSources, /* $restrictions */ ) = $this->mTitle->getCascadeProtectionSources();
 
                if ( "" != $err ) {
                        $wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
@@ -111,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 );
                }
@@ -119,9 +121,25 @@ class ProtectionForm {
                $wgOut->setPageTitle( wfMsg( 'confirmprotect' ) );
                $wgOut->setSubtitle( wfMsg( 'protectsub', $this->mTitle->getPrefixedText() ) );
 
-               $wgOut->addWikiText(
-                       wfMsg( $this->disabled ? "protect-viewtext" : "protect-text",
-                               wfEscapeWikiText( $this->mTitle->getPrefixedText() ) ) );
+               # Show an appropriate message if the user isn't allowed or able to change
+               # the protection settings at this time
+               if( $this->disabled ) {
+                       if( $wgUser->isAllowed( 'protect' ) ) {
+                               if( $wgUser->isBlocked() ) {
+                                       # Blocked
+                                       $message = 'protect-locked-blocked';
+                               } else {
+                                       # Database lock
+                                       $message = 'protect-locked-dblock';
+                               }
+                       } else {
+                               # Permission error
+                               $message = 'protect-locked-access';
+                       }
+               } else {
+                       $message = 'protect-text';
+               }
+               $wgOut->addWikiText( wfMsg( $message, wfEscapeWikiText( $this->mTitle->getPrefixedText() ) ) );
 
                $wgOut->addHTML( $this->buildForm() );
 
@@ -170,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;
        }
 
@@ -182,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)' ) );
@@ -213,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";
                }
 
@@ -290,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' ) ) );
        }
@@ -340,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(