Fix retarded mistake in 57997, move break to within the if block or it defeats the...
[lhc/web/wiklou.git] / includes / ProtectionForm.php
index 17c1858..e6b7dbe 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 /**
- * @todo document, briefly.
+ * Handles the page protection UI and backend
  */
 class ProtectionForm {
        /** A map of action to restriction level, from request or default */
@@ -38,9 +38,9 @@ class ProtectionForm {
        /** Map of action to "other" expiry time. Used in preference to mExpirySelection. */
        var $mExpiry = array();
 
-       /** 
-        * Map of action to value selected in expiry drop-down list. 
-        * Will be set to 'othertime' whenever mExpiry is set. 
+       /**
+        * Map of action to value selected in expiry drop-down list.
+        * Will be set to 'othertime' whenever mExpiry is set.
         */
        var $mExpirySelection = array();
 
@@ -127,7 +127,7 @@ class ProtectionForm {
                }
        }
 
-       /** 
+       /**
         * Get the expiry time for a given action, by combining the relevant inputs.
         * Returns a 14-char timestamp or "infinity", or false if the input was invalid
         */
@@ -192,11 +192,11 @@ class ProtectionForm {
                                $titles .= '* [[:' . $title->getPrefixedText() . "]]\n";
                        }
 
-                       $wgOut->wrapWikiMsg( "$1\n$titles", array( 'protect-cascadeon', count($cascadeSources) ) );
+                       $wgOut->wrapWikiMsg( "<div id=\"mw-protect-cascadeon\">\n$1\n" . $titles . "</div>", array( 'protect-cascadeon', count($cascadeSources) ) );
                }
 
                $sk = $wgUser->getSkin();
-               $titleLink = $sk->makeLinkObj( $this->mTitle );
+               $titleLink = $sk->link( $this->mTitle );
                $wgOut->setPageTitle( wfMsg( 'protect-title', $this->mTitle->getPrefixedText() ) );
                $wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) );
 
@@ -218,7 +218,7 @@ class ProtectionForm {
        }
 
        function save() {
-               global $wgRequest, $wgUser, $wgOut;
+               global $wgRequest, $wgUser;
                # Permission check!
                if ( $this->disabled ) {
                        $this->show();
@@ -230,18 +230,20 @@ class ProtectionForm {
                        $this->show( wfMsg( 'sessionfailure' ) );
                        return false;
                }
-               
+
                # Create reason string. Use list and/or custom string.
                $reasonstr = $this->mReasonSelection;
                if ( $reasonstr != 'other' && $this->mReason != '' ) {
                        // Entry from drop down menu + additional comment
-                       $reasonstr .= ': ' . $this->mReason;
+                       $reasonstr .= wfMsgForContent( 'colon-separator' ) . $this->mReason;
                } elseif ( $reasonstr == 'other' ) {
                        $reasonstr = $this->mReason;
                }
                $expiry = array();
                foreach( $this->mApplicableTypes as $action ) {
                        $expiry[$action] = $this->getExpiry( $action );
+                       if( empty($this->mRestrictions[$action]) )
+                               continue; // unprotected
                        if ( !$expiry[$action] ) {
                                $this->show( wfMsg( 'protect_expiry_invalid' ) );
                                return false;
@@ -256,7 +258,7 @@ class ProtectionForm {
                #  to a semi-protected page.
                global $wgGroupPermissions;
 
-               $edit_restriction = $this->mRestrictions['edit'];
+               $edit_restriction = isset( $this->mRestrictions['edit'] ) ? $this->mRestrictions['edit'] : '';
                $this->mCascade = $wgRequest->getBool( 'mwProtect-cascade' );
                if ($this->mCascade && ($edit_restriction != 'protect') &&
                        !(isset($wgGroupPermissions[$edit_restriction]['protect']) && $wgGroupPermissions[$edit_restriction]['protect'] ) )
@@ -272,6 +274,16 @@ class ProtectionForm {
                        throw new FatalError( "Unknown error at restriction save time." );
                }
 
+               $errorMsg = '';
+               # Give extensions a change to handle added form items
+               if( !wfRunHooks( 'ProtectionForm::save', array($this->mArticle,&$errorMsg) ) ) {
+                       throw new FatalError( "Unknown hook error at restriction save time." );
+               }
+               if( $errorMsg != '' ) {
+                       $this->show( $errorMsg );
+                       return false;
+               }
+
                if( $wgRequest->getCheck( 'mwProtectWatch' ) ) {
                        $this->mArticle->doWatch();
                } elseif( $this->mTitle->userIsWatching() ) {
@@ -294,8 +306,8 @@ class ProtectionForm {
                $out = '';
                if( !$this->disabled ) {
                        $out .= $this->buildScript();
-                       $out .= Xml::openElement( 'form', array( 'method' => 'post', 
-                               'action' => $this->mTitle->getLocalUrl( 'action=protect' ), 
+                       $out .= Xml::openElement( 'form', array( 'method' => 'post',
+                               'action' => $this->mTitle->getLocalUrl( 'action=protect' ),
                                'id' => 'mw-Protect-Form', 'onsubmit' => 'ProtectionForm.enableUnchainedInputs(true)' ) );
                        $out .= Xml::hidden( 'wpEditToken',$wgUser->editToken() );
                }
@@ -311,17 +323,18 @@ class ProtectionForm {
                        if( wfEmptyMsg( 'restriction-' . $action, $msg ) ) {
                                $msg = $action;
                        }
-                       $label = Xml::element( 'label', array( 'for' => "mwProtect-level-$action" ), $msg );
-                       $out .= "<tr><td><table>" .
-                               "<tr><th>$label</th><th></th></tr>" .
-                               "<tr><td>" . $this->buildSelector( $action, $selected ) . "</td><td>";
+                       $out .= "<tr><td>".
+                       Xml::openElement( 'fieldset' ) .
+                       Xml::element( 'legend', null, $msg ) .
+                       Xml::openElement( 'table', array( 'id' => "mw-protect-table-$action" ) ) .
+                               "<tr><td>" . $this->buildSelector( $action, $selected ) . "</td></tr><tr><td>";
 
                        $reasonDropDown = Xml::listDropDown( 'wpProtectReasonSelection',
                                wfMsgForContent( 'protect-dropdown' ),
-                               wfMsgForContent( 'protect-otherreason-op' ), 
+                               wfMsgForContent( 'protect-otherreason-op' ),
                                $this->mReasonSelection,
                                'mwProtect-reason', 4 );
-                       $scExpiryOptions = wfMsgForContent( 'ipboptions' ); // FIXME: use its own message
+                       $scExpiryOptions = wfMsgForContent( 'protect-expiry-options' );
 
                        $showProtectOptions = ($scExpiryOptions !== '-' && !$this->disabled);
 
@@ -330,14 +343,17 @@ class ProtectionForm {
 
                        $expiryFormOptions = '';
                        if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
-                               $expiryFormOptions .= 
-                                       Xml::option( 
-                                               wfMsg( 'protect-existing-expiry', $wgLang->timeanddate( $this->mExistingExpiry[$action] ) ),
+                               $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] );
+                               $d = $wgLang->date( $this->mExistingExpiry[$action] );
+                               $t = $wgLang->time( $this->mExistingExpiry[$action] );
+                               $expiryFormOptions .=
+                                       Xml::option(
+                                               wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
                                                'existing',
                                                $this->mExpirySelection[$action] == 'existing'
                                        ) . "\n";
                        }
-                       
+
                        $expiryFormOptions .= Xml::option( wfMsg( 'protect-othertime-op' ), "othertime" ) . "\n";
                        foreach( explode(',', $scExpiryOptions) as $option ) {
                                if ( strpos($option, ":") === false ) {
@@ -368,17 +384,24 @@ class ProtectionForm {
                                        </tr></table>";
                        }
                        # Add custom expiry field
-                       $attribs = array( 'id' => "mwProtect-$action-expires", 'onkeyup' => 'ProtectionForm.updateExpiry(this)' ) + $this->disabledAttrib;
+                       $attribs = array( 'id' => "mwProtect-$action-expires",
+                               'onkeyup' => 'ProtectionForm.updateExpiry(this)',
+                               'onchange' => 'ProtectionForm.updateExpiry(this)' ) + $this->disabledAttrib;
                        $out .= "<table><tr>
                                        <td class='mw-label'>" .
                                                $mProtectother .
                                        '</td>
                                        <td class="mw-input">' .
-                                               Xml::input( "mwProtect-expiry-$action", 60, $this->mExpiry[$action], $attribs ) .
+                                               Xml::input( "mwProtect-expiry-$action", 50, $this->mExpiry[$action], $attribs ) .
                                        '</td>
                                </tr></table>';
-                       $out .= "</td></tr></table></td></tr>";
+                       $out .= "</td></tr>" .
+                       Xml::closeElement( 'table' ) .
+                       Xml::closeElement( 'fieldset' ) .
+                       "</td></tr>";
                }
+               # Give extensions a chance to add items to the form
+               wfRunHooks( 'ProtectionForm::buildForm', array($this->mArticle,&$out) );
 
                $out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
 
@@ -389,13 +412,13 @@ class ProtectionForm {
                        $out .= '<tr>
                                        <td></td>
                                        <td class="mw-input">' .
-                                               Xml::checkLabel( wfMsg( 'protect-cascade' ), 'mwProtect-cascade', 'mwProtect-cascade', 
+                                               Xml::checkLabel( wfMsg( 'protect-cascade' ), 'mwProtect-cascade', 'mwProtect-cascade',
                                                        $this->mCascade, $this->disabledAttrib ) .
                                        "</td>
                                </tr>\n";
                        $out .= Xml::closeElement( 'tbody' ) . Xml::closeElement( 'table' );
                }
-               
+
                # Add manual and custom reason field/selects as well as submit
                if( !$this->disabled ) {
                        $out .=  Xml::openElement( 'table', array( 'id' => 'mw-protect-table3' ) ) .
@@ -414,7 +437,7 @@ class ProtectionForm {
                                                {$mProtectreason}
                                        </td>
                                        <td class='mw-input'>" .
-                                               Xml::input( 'mwProtect-reason', 60, $this->mReason, array( 'type' => 'text', 
+                                               Xml::input( 'mwProtect-reason', 60, $this->mReason, array( 'type' => 'text',
                                                        'id' => 'mwProtect-reason', 'maxlength' => 255 ) ) .
                                        "</td>
                                </tr>
@@ -437,8 +460,13 @@ class ProtectionForm {
                $out .= Xml::closeElement( 'fieldset' );
 
                if ( $wgUser->isAllowed( 'editinterface' ) ) {
-                       $linkTitle = Title::makeTitleSafe( NS_MEDIAWIKI, 'protect-dropdown' );
-                       $link = $wgUser->getSkin()->Link ( $linkTitle, wfMsgHtml( 'protect-edit-reasonlist' ) );
+                       $title = Title::makeTitle( NS_MEDIAWIKI, 'Protect-dropdown' );
+                       $link = $wgUser->getSkin()->link(
+                               $title,
+                               wfMsgHtml( 'protect-edit-reasonlist' ),
+                               array(),
+                               array( 'action' => 'edit' )
+                       );
                        $out .= '<p class="mw-protect-editreasons">' . $link . '</p>';
                }
 
@@ -519,7 +547,7 @@ class ProtectionForm {
                }
                $script .= "[" . implode(',',$CascadeableLevels) . "];\n";
                $options = (object)array(
-                       'tableId' => 'mw-protect-table2',
+                       'tableId' => 'mw-protect-table-move',
                        'labelText' => wfMsg( 'protect-unchain' ),
                        'numTypes' => count($this->mApplicableTypes),
                        'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ),
@@ -538,5 +566,7 @@ class ProtectionForm {
                # Show relevant lines from the protection log:
                $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'protect' ) ) );
                LogEventsList::showLogExtract( $out, 'protect', $this->mTitle->getPrefixedText() );
+               # Let extensions add other relevant log extracts
+               wfRunHooks( 'ProtectionForm::showLogExtract', array($this->mArticle,$out) );
        }
 }